Revert "Fix exceptions mismatch."

tritao · tritao · commit eda3dab71fdd · 2024-10-29T11:49:10.000Z
This reverts commit 4926470.
diff --git a/src/CLI/Generator.cs b/src/CLI/Generator.cs
@@ -146,7 +146,6 @@ public void Setup(Driver driver)
 
             parserOptions.UnityBuild = options.UnityBuild;
             parserOptions.EnableRTTI = options.EnableRTTI;
-            parserOptions.EnableExceptions = options.EnableExceptions;
 
             parserOptions.Setup(options.Platform ?? Platform.Host);
 
diff --git a/src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std-symbols.cpp
@@ -1,5 +1,6 @@
 #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
 #define _LIBCPP_HIDE_FROM_ABI
+#define _LIBCPP_NO_ABI_TAG
 
 #include <string>
 #include <new>
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/i686-apple-darwin/Std-symbols.cpp
@@ -1,5 +1,6 @@
 #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
 #define _LIBCPP_HIDE_FROM_ABI
+#define _LIBCPP_NO_ABI_TAG
 
 #include <string>
 #include <new>
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std-symbols.cpp
@@ -1,5 +1,6 @@
 #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
 #define _LIBCPP_HIDE_FROM_ABI
+#define _LIBCPP_NO_ABI_TAG
 
 #include <string>
 #include <new>
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std-symbols.cpp
@@ -1,5 +1,6 @@
 #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
 #define _LIBCPP_HIDE_FROM_ABI
+#define _LIBCPP_NO_ABI_TAG
 
 #include <string>
 #include <new>
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std-symbols.cpp
@@ -1,5 +1,6 @@
 #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
 #define _LIBCPP_HIDE_FROM_ABI
+#define _LIBCPP_NO_ABI_TAG
 
 #include <string>
 #include <new>
diff --git a/src/CppParser/ParserGen/ParserGen.cs b/src/CppParser/ParserGen/ParserGen.cs
@@ -49,7 +49,6 @@ public void Setup(Driver driver)
         {
             var parserOptions = driver.ParserOptions;
             parserOptions.TargetTriple = Triple;
-            parserOptions.EnableExceptions = false;
 
             var options = driver.Options;
             options.GeneratorKind = Kind;
diff --git a/src/CppParser/premake5.lua b/src/CppParser/premake5.lua
@@ -51,8 +51,6 @@ project "Std-symbols"
   language "C++"
   SetupNativeProject()
   rtti "Off"
-  exceptionhandling "Off"
-
   defines { "DLL_EXPORT" }
 
   filter { "toolset:msc*" }
diff --git a/src/Generator/Passes/SymbolsCodeGenerator.cs b/src/Generator/Passes/SymbolsCodeGenerator.cs
@@ -33,8 +33,6 @@ public override void Process()
                 WriteLine("#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS");
                 WriteLine("#define _LIBCPP_HIDE_FROM_ABI");
                 WriteLine("#define _LIBCPP_NO_ABI_TAG");
-                if (!Context.ParserOptions.EnableExceptions)
-                    WriteLine("#define _LIBCPP_HAS_NO_EXCEPTIONS");
                 NewLine();
                 WriteLine("#include <string>");
             }
diff --git a/src/Parser/ParserOptions.cs b/src/Parser/ParserOptions.cs
@@ -84,7 +84,6 @@ public ParserOptions()
                 TargetTriple.Contains("windows") || TargetTriple.Contains("msvc");
 
         public bool EnableRTTI { get; set; }
-        public bool EnableExceptions { get; set; }
         public LanguageVersion? LanguageVersion { get; set; }
 
         public void BuildForSourceFile(
@@ -376,9 +375,6 @@ private void SetupArguments(TargetPlatform targetPlatform)
 
             if (!EnableRTTI)
                 AddArguments("-fno-rtti");
-
-            if (EnableExceptions)
-                AddArguments("-fexceptions");
         }
 
         internal string BuiltinsDirBasePath

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ public void Setup(Driver driver)`
`49`	`49`	`{`
`50`	`50`	`var parserOptions = driver.ParserOptions;`
`51`	`51`	`parserOptions.TargetTriple = Triple;`
`52`		`- parserOptions.EnableExceptions = false;`
`53`	`52`
`54`	`53`	`var options = driver.Options;`
`55`	`54`	`options.GeneratorKind = Kind;`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,6 @@ public override void Process()`
`33`	`33`	`WriteLine("#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS");`
`34`	`34`	`WriteLine("#define _LIBCPP_HIDE_FROM_ABI");`
`35`	`35`	`WriteLine("#define _LIBCPP_NO_ABI_TAG");`
`36`		`- if (!Context.ParserOptions.EnableExceptions)`
`37`		`- WriteLine("#define _LIBCPP_HAS_NO_EXCEPTIONS");`
`38`	`36`	`NewLine();`
`39`	`37`	`WriteLine("#include <string>");`
`40`	`38`	`}`