handle closured code in separate_asm

kripken · kripken · commit fe97790fe44d · 2015-11-20T16:54:32.000-08:00
diff --git a/tests/test_browser.py b/tests/test_browser.py
@@ -2868,10 +2868,10 @@ def test_canvas_size_proxy(self):
     self.btest(path_from_root('tests', 'canvas_size_proxy.c'), expected='0', args=['--proxy-to-worker'])
 
   def test_separate_asm(self):
-    for opts in [0, 1, 2]:
+    for opts in [['-O0'], ['-O1'], ['-O2'], ['-O2', '--closure', '1']]:
       print opts
       open('src.cpp', 'w').write(self.with_report_result(open(path_from_root('tests', 'browser_test_hello_world.c')).read()))
-      Popen([PYTHON, EMCC, 'src.cpp', '-o', 'test.html', '-O' + str(opts)]).communicate()
+      Popen([PYTHON, EMCC, 'src.cpp', '-o', 'test.html'] + opts).communicate()
       self.run_browser('test.html', None, '/report_result?0')
 
       open('one.html', 'w').write('<script src="test.js"></script>')
@@ -2889,7 +2889,7 @@ def test_separate_asm(self):
 
       self.clear()
       assert not os.path.exists('tests.asm.js')
-      self.btest('browser_test_hello_world.c', expected='0', args=['-O' + str(opts), '--separate-asm'])
+      self.btest('browser_test_hello_world.c', expected='0', args=opts + ['--separate-asm'])
       assert os.path.exists('test.asm.js')
       os.unlink('test.asm.js')
       self.run_browser('test.html', None, '[no http server activity]', timeout=5) # fail without the asm
diff --git a/tools/separate_asm.py b/tools/separate_asm.py
@@ -15,7 +15,17 @@
 module = asm_module.AsmModule(infile).asm_js
 
 module = module[module.find('=')+1:] # strip the initial "var asm =" bit, leave just the raw module as a function
-everything = everything.replace(module, 'Module["asm"]')
+if 'var Module' in everything:
+  everything = everything.replace(module, 'Module["asm"]')
+else:
+  # closure compiler removes |var Module|, we need to find the closured name
+  evil = everything.find('eval(')
+  evil = everything.rfind('=', 0, evil)
+  start = evil
+  while everything[start] in [' ', '=']: start -= 1
+  while everything[start] not in [' ', ',', '(']: start -= 1
+  closured_name = everything[start+1:evil].strip()
+  everything = everything.replace(module, closured_name + '["asm"]')
 
 o = open(asmfile, 'w')
 o.write('Module["asm"] = ')
