Skip to content

Commit eda3dab

Browse files
committed
Revert "Fix exceptions mismatch."
This reverts commit 4926470.
1 parent 4926470 commit eda3dab

File tree

10 files changed

+5
-10
lines changed

10 files changed

+5
-10
lines changed

src/CLI/Generator.cs

-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ public void Setup(Driver driver)
146146

147147
parserOptions.UnityBuild = options.UnityBuild;
148148
parserOptions.EnableRTTI = options.EnableRTTI;
149-
parserOptions.EnableExceptions = options.EnableExceptions;
150149

151150
parserOptions.Setup(options.Platform ?? Platform.Host);
152151

src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std-symbols.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
22
#define _LIBCPP_HIDE_FROM_ABI
3+
#define _LIBCPP_NO_ABI_TAG
34

45
#include <string>
56
#include <new>

src/CppParser/Bindings/CSharp/i686-apple-darwin/Std-symbols.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
22
#define _LIBCPP_HIDE_FROM_ABI
3+
#define _LIBCPP_NO_ABI_TAG
34

45
#include <string>
56
#include <new>

src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std-symbols.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
22
#define _LIBCPP_HIDE_FROM_ABI
3+
#define _LIBCPP_NO_ABI_TAG
34

45
#include <string>
56
#include <new>

src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std-symbols.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
22
#define _LIBCPP_HIDE_FROM_ABI
3+
#define _LIBCPP_NO_ABI_TAG
34

45
#include <string>
56
#include <new>

src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std-symbols.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
22
#define _LIBCPP_HIDE_FROM_ABI
3+
#define _LIBCPP_NO_ABI_TAG
34

45
#include <string>
56
#include <new>

src/CppParser/ParserGen/ParserGen.cs

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public void Setup(Driver driver)
4949
{
5050
var parserOptions = driver.ParserOptions;
5151
parserOptions.TargetTriple = Triple;
52-
parserOptions.EnableExceptions = false;
5352

5453
var options = driver.Options;
5554
options.GeneratorKind = Kind;

src/CppParser/premake5.lua

-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ project "Std-symbols"
5151
language "C++"
5252
SetupNativeProject()
5353
rtti "Off"
54-
exceptionhandling "Off"
55-
5654
defines { "DLL_EXPORT" }
5755

5856
filter { "toolset:msc*" }

src/Generator/Passes/SymbolsCodeGenerator.cs

-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ public override void Process()
3333
WriteLine("#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS");
3434
WriteLine("#define _LIBCPP_HIDE_FROM_ABI");
3535
WriteLine("#define _LIBCPP_NO_ABI_TAG");
36-
if (!Context.ParserOptions.EnableExceptions)
37-
WriteLine("#define _LIBCPP_HAS_NO_EXCEPTIONS");
3836
NewLine();
3937
WriteLine("#include <string>");
4038
}

src/Parser/ParserOptions.cs

-4
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ public ParserOptions()
8484
TargetTriple.Contains("windows") || TargetTriple.Contains("msvc");
8585

8686
public bool EnableRTTI { get; set; }
87-
public bool EnableExceptions { get; set; }
8887
public LanguageVersion? LanguageVersion { get; set; }
8988

9089
public void BuildForSourceFile(
@@ -376,9 +375,6 @@ private void SetupArguments(TargetPlatform targetPlatform)
376375

377376
if (!EnableRTTI)
378377
AddArguments("-fno-rtti");
379-
380-
if (EnableExceptions)
381-
AddArguments("-fexceptions");
382378
}
383379

384380
internal string BuiltinsDirBasePath

0 commit comments

Comments
 (0)