Move STRUCT_INFO to settings_internal.js. NFC. (#12126)

emscripten.py

@@ -980,23 +980,22 @@ def normalize_line_endings(text):
 
 
 def generate_struct_info():
-  if not shared.Settings.STRUCT_INFO and not shared.Settings.BOOTSTRAPPING_STRUCT_INFO:
-    generated_struct_info_name = 'generated_struct_info.json'
+  generated_struct_info_name = 'generated_struct_info.json'
 
-    def generate_struct_info():
-      with ToolchainProfiler.profile_block('gen_struct_info'):
-        out = shared.Cache.get_path(generated_struct_info_name)
-        gen_struct_info.main(['-q', '-c', '-o', out])
-        return out
+  def generate_struct_info():
+    with ToolchainProfiler.profile_block('gen_struct_info'):
+      out = shared.Cache.get_path(generated_struct_info_name)
+      gen_struct_info.main(['-q', '-c', '-o', out])
+      return out
 
-    shared.Settings.STRUCT_INFO = shared.Cache.get(generated_struct_info_name, generate_struct_info)
-  # do we need an else, to define it for the bootstrap case?
+  shared.Settings.STRUCT_INFO = shared.Cache.get(generated_struct_info_name, generate_struct_info)
 
 
 def run(infile, outfile, memfile):
   temp_files = shared.configuration.get_temp_files()
   infile, outfile = substitute_response_files([infile, outfile])
-  generate_struct_info()
+  if not shared.Settings.BOOTSTRAPPING_STRUCT_INFO:
+    generate_struct_info()
 
   outfile_obj = open(outfile, 'w')
 

src/settings.js

@@ -1051,9 +1051,6 @@ var RUNNING_JS_OPTS = 0;
 // whether we are in the generate struct_info bootstrap phase
 var BOOTSTRAPPING_STRUCT_INFO = 0;
 
-// struct_info that is either generated or cached
-var STRUCT_INFO = '';
-
 // Add some calls to emscripten tracing APIs
 var EMSCRIPTEN_TRACING = 0;
 

src/settings_internal.js

@@ -200,3 +200,6 @@ var EXPECT_MAIN = 1;
 var EXPORT_READY_PROMISE = 1;
 
 var USE_LEGACY_DYNCALLS = 0;
+
+// struct_info that is either generated or cached
+var STRUCT_INFO = '';