[dart2wasm] Update interop specializers to live in library with specialized member.

Change-Id: I072240ff98bb9f571156a101b8cf18dcc8c6877c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/439480
Reviewed-by: Srujan Gaddam <[email protected]>
Reviewed-by: Ömer Ağacan <[email protected]>
Commit-Queue: Nate Biggs <[email protected]>

Author: natebiggs

pkg/dart2wasm/lib/deferred_loading.dart

@@ -145,12 +145,14 @@ class DeferredLoadingModuleStrategy extends DefaultModuleStrategy {
     final enqueuedDeferredRoots = <Library>{entryPoint};
     final libraryToRootSet = <Library, _RootSet>{};
     final importTargetMap = <Library, Map<String, Library>>{};
+    bool isMainRoot = true;
+
     while (deferredRootStack.isNotEmpty) {
       final currentRoot = deferredRootStack.removeLast();
       final eagerWorkStack = [currentRoot];
       final enqueuedEagerLibraries = <Library>{currentRoot};
       final newDeferredRoots = <Library>[];
-      if (identical(currentRoot, entryPoint)) {
+      if (isMainRoot) {
         // Add required libraries because the compiler has implicit
         // dependencies on these. Also add libraries containing 'wasm:export'
         // since embedders might need access to these from the main module.
@@ -192,6 +194,7 @@ class DeferredLoadingModuleStrategy extends DefaultModuleStrategy {
           deferredRootStack.add(newRoot);
         }
       }
+      isMainRoot = false;
     }
     return (libraryToRootSet, importTargetMap);
   }

pkg/dart2wasm/lib/js/interop_specializer.dart

@@ -101,16 +101,18 @@ abstract class _Specializer {
     // Create Dart procedure stub for JS method.
     String jsMethodName = _methodCollector.generateMethodName();
     final dartProcedure = _methodCollector.addInteropProcedure(
-        '|$jsMethodName',
-        'dart2wasm.$jsMethodName',
-        FunctionNode(null,
-            positionalParameters: dartPositionalParameters,
-            returnType: function.returnType is VoidType
-                ? VoidType()
-                : _util.nullableWasmExternRefType),
-        fileUri,
-        AnnotationType.import,
-        isExternal: true);
+      '|$jsMethodName',
+      'dart2wasm.$jsMethodName',
+      FunctionNode(null,
+          positionalParameters: dartPositionalParameters,
+          returnType: function.returnType is VoidType
+              ? VoidType()
+              : _util.nullableWasmExternRefType),
+      fileUri,
+      AnnotationType.import,
+      library: interopMethod.enclosingLibrary,
+      isExternal: true,
+    );
     _methodCollector.addMethod(
         dartProcedure, jsMethodName, generateJS(jsParameterStrings));
     return dartProcedure;

pkg/dart2wasm/lib/js/method_collector.dart

@@ -25,12 +25,13 @@ class MethodCollector {
 
   Procedure addInteropProcedure(String name, String pragmaOptionString,
       FunctionNode function, Uri fileUri, AnnotationType type,
-      {required bool isExternal}) {
+      {required bool isExternal, Library? library}) {
+    library ??= _library;
     final procedure = Procedure(
-        Name(name, _library), ProcedureKind.Method, function,
+        Name(name, library), ProcedureKind.Method, function,
         isStatic: true, isExternal: isExternal, fileUri: fileUri);
     _util.annotateProcedure(procedure, pragmaOptionString, type);
-    _library.addProcedure(procedure);
+    library.addProcedure(procedure);
     return procedure;
   }