Fix a crash with circular import * statements.

Closes #3322 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=246237043
google · May 2, 2019 · 92541e5 · 92541e5
1 parent 43b142c
commit 92541e5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/com/google/javascript/jscomp/modules/Binding.java b/src/com/google/javascript/jscomp/modules/Binding.java
@@ -123,13 +123,14 @@ static Binding from(
   }
 
   /** Binding for an entire module namespace created by an <code>import *</code>. */
-  static Binding from(Module namespaceBoundModule, Node sourceNode) {
+  static Binding from(
+      ModuleMetadata metadataOfBoundModule, @Nullable String closureNamespace, Node sourceNode) {
     return new AutoValue_Binding(
-        namespaceBoundModule.metadata(),
+        metadataOfBoundModule,
         sourceNode,
         /* originatingExport= */ null,
         /* isModuleNamespace= */ true,
-        namespaceBoundModule.closureNamespace(),
+        closureNamespace,
         CreatedBy.IMPORT);
   }
 

diff --git a/src/com/google/javascript/jscomp/modules/EsModuleProcessor.java b/src/com/google/javascript/jscomp/modules/EsModuleProcessor.java
@@ -410,9 +410,12 @@ private ResolveExportResult resolveImportImpl(
                     i.moduleRequest()));
             return ResolveExportResult.ERROR;
           }
+          String closureNamespace =
+              GoogEsImports.isGoogImportSpecifier(i.moduleRequest())
+                  ? GoogEsImports.getClosureIdFromGoogImportSpecifier(i.moduleRequest())
+                  : null;
           return ResolveExportResult.of(
-              Binding.from(
-                  requested.resolve(moduleRequestResolver, i.moduleRequest()), i.nameNode()));
+              Binding.from(requested.metadata(), closureNamespace, i.nameNode()));
         } else {
           ResolveExportResult result =
               requested.resolveExport(