Remove some closure compiler hacks (emscripten-core#8437)

The hacks for GL are not just ugly, but also bad for code size in some cases, it turns out (apparently closure will not optimize as much in their presence).

This is a step towards emscripten-core#8421, the changes for which end up causing closure to emit worse code if not for this PR.

src/closure-defined-fs-annotation.js

@@ -8,16 +8,6 @@ var Browser;
  */
 var SDL;
 
-/**
- * @suppress {duplicate, undefinedVars}
- */
-var GL;
-
-/**
- * @suppress {duplicate, undefinedVars}
- */
-var GLctx;
-
 /**
  * @suppress {duplicate, undefinedVars}
  */

src/library_glfw.js

@@ -753,6 +753,7 @@ var LibraryGLFW = {
 
       event.preventDefault();
 
+#if '$FS' in addedLibraryItems
       var filenames = allocate(new Array(event.dataTransfer.files.length*4), 'i8*', ALLOC_NORMAL);
       var filenamesArray = [];
       var count = event.dataTransfer.files.length;
@@ -794,6 +795,8 @@ var LibraryGLFW = {
         save(event.dataTransfer.files[i]);
       }
 
+#endif // '$FS' in addedLibraryItems
+
       return false;
     },
 

tools/shared.py

@@ -2378,12 +2378,10 @@ def closure_compiler(filename, pretty=True):
 
       if not Settings.ASMFS:
         # If we have filesystem disabled, tell Closure not to bark when there are syscalls emitted that still reference the nonexisting FS object.
-        if not Settings.FILESYSTEM:
-          CLOSURE_ANNOTATIONS += ['--js', path_from_root('src', 'closure-undefined-fs-annotation.js')]
-
-        # If we do have filesystem enabled, tell Closure not to bark when FS references different libraries that might not exist.
-        if Settings.FILESYSTEM and not Settings.ASMFS:
+        if Settings.FILESYSTEM:
           CLOSURE_ANNOTATIONS += ['--js', path_from_root('src', 'closure-defined-fs-annotation.js')]
+        else:
+          CLOSURE_ANNOTATIONS += ['--js', path_from_root('src', 'closure-undefined-fs-annotation.js')]
 
       # Closure externs file contains known symbols to be extern to the minification, Closure
       # should not minify these symbol names.