Split out C++ code in of gen_struct_info.py. NFC (emscripten-core#14704)

sbc100 · web-flow · commit ee93f5713cfc · 2021-07-20T16:25:48.000-07:00
This was split out from emscripten-core#13006 since the newer musl internal headers don't parse in C++ mode.
diff --git a/src/struct_info_cxx.json b/src/struct_info_cxx.json
@@ -0,0 +1,14 @@
+[
+    {
+        "file": "cxa_exception.h",
+        "structs": {
+            "__cxxabiv1::__cxa_exception": [
+              "exceptionDestructor",
+              "referenceCount",
+              "exceptionType",
+              "caught",
+              "rethrown"
+            ]
+        }
+    }
+]
diff --git a/src/struct_info_internal.json b/src/struct_info_internal.json
@@ -40,17 +40,5 @@
               "global_locale"
             ]
         }
-    },
-    {
-        "file": "cxa_exception.h",
-        "structs": {
-            "__cxxabiv1::__cxa_exception": [
-              "exceptionDestructor",
-              "referenceCount",
-              "exceptionType",
-              "caught",
-              "rethrown"
-            ]
-        }
     }
 ]
diff --git a/tools/gen_struct_info.py b/tools/gen_struct_info.py
@@ -253,19 +253,24 @@ def inspect_headers(headers, cflags):
   # Compile the program.
   show('Compiling generated code...')
 
+  if any('libcxxabi' in f for f in cflags):
+    compiler = shared.EMXX
+  else:
+    compiler = shared.EMCC
+
   # -Oz optimizes enough to avoid warnings on code size/num locals
-  cmd = [shared.EMXX] + cflags + ['-o', js_file[1], src_file[1],
-                                  '-O0',
-                                  '-Werror',
-                                  '-Wno-format',
-                                  '-nostdlib',
-                                  compiler_rt,
-                                  '-s', 'BOOTSTRAPPING_STRUCT_INFO=1',
-                                  '-s', 'LLD_REPORT_UNDEFINED=1',
-                                  '-s', 'STRICT',
-                                  # Use SINGLE_FILE=1 so there is only a single
-                                  # file to cleanup.
-                                  '-s', 'SINGLE_FILE']
+  cmd = [compiler] + cflags + ['-o', js_file[1], src_file[1],
+                               '-O0',
+                               '-Werror',
+                               '-Wno-format',
+                               '-nostdlib',
+                               compiler_rt,
+                               '-s', 'BOOTSTRAPPING_STRUCT_INFO=1',
+                               '-s', 'LLD_REPORT_UNDEFINED=1',
+                               '-s', 'STRICT',
+                               # Use SINGLE_FILE=1 so there is only a single
+                               # file to cleanup.
+                               '-s', 'SINGLE_FILE']
 
   # Default behavior for emcc is to warn for binaryen version check mismatches
   # so we should try to match that behavior.
@@ -375,7 +380,8 @@ def main(args):
 
   default_json_files = [
       shared.path_from_root('src', 'struct_info.json'),
-      shared.path_from_root('src', 'struct_info_internal.json')
+      shared.path_from_root('src', 'struct_info_internal.json'),
+      shared.path_from_root('src', 'struct_info_cxx.json'),
   ]
   parser = argparse.ArgumentParser(description='Generate JSON infos for structs.')
   parser.add_argument('json', nargs='*',
@@ -410,6 +416,9 @@ def main(args):
 
   internal_cflags = [
     '-I' + shared.path_from_root('system', 'lib', 'libc', 'musl', 'src', 'internal'),
+  ]
+
+  cxxflags = [
     '-I' + shared.path_from_root('system', 'lib', 'libcxxabi', 'src'),
     '-D__USING_EMSCRIPTEN_EXCEPTIONS__',
   ]
@@ -423,6 +432,8 @@ def main(args):
     # Inspect all collected structs.
     if 'internal' in f:
       use_cflags = cflags + internal_cflags
+    elif 'cxx' in f:
+      use_cflags = cflags + cxxflags
     else:
       use_cflags = cflags
     info_fragment = inspect_code(header_files, use_cflags)

Original file line number	Diff line number	Diff line change
`@@ -40,17 +40,5 @@`
`40`	`40`	`"global_locale"`
`41`	`41`	`]`
`42`	`42`	`}`
`43`		`- },`
`44`		`- {`
`45`		`- "file": "cxa_exception.h",`
`46`		`- "structs": {`
`47`		`- "__cxxabiv1::__cxa_exception": [`
`48`		`- "exceptionDestructor",`
`49`		`- "referenceCount",`
`50`		`- "exceptionType",`
`51`		`- "caught",`
`52`		`- "rethrown"`
`53`		`- ]`
`54`		`- }`
`55`	`43`	`}`
`56`	`44`	`]`