[dart2wasm] Rename the dart:wasm library to dart:_wasm.

This is an internal library not meant to be used in application code.

CoreLibraryReviewExempt: Changes only Wasm specific libraries.
Change-Id: I2f5b463382d35a442e782067ef7d9063183fe5e3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/292021
Reviewed-by: Ömer Ağacan <[email protected]>
Reviewed-by: Joshua Litt <[email protected]>
Commit-Queue: Aske Simon Christensen <[email protected]>

Author: askeksa

pkg/analyzer/test/src/dart/sdk/sdk_utils_test.dart

@@ -78,7 +78,7 @@ List<String> sdkPaths = [
   "sky_engine/lib/math/math.dart",
   "sky_engine/lib/typed_data/typed_data.dart",
   "sky_engine/lib/ui/ui.dart",
-  "sky_engine/lib/wasm/wasm_types.dart",
+  "sky_engine/lib/_wasm/wasm_types.dart",
   "sky_engine/lib/_http/http.dart",
   "sky_engine/lib/_interceptors/interceptors.dart",
   "sky_engine/lib/internal/internal.dart",

pkg/dart2wasm/README.md

@@ -80,5 +80,5 @@ inst.exports.baz(2);
 In the signatures of imported and exported functions, use the following types:
 
 - For numbers, use `double`.
-- For JS objects, use the `WasmExternRef?` type from the `dart:wasm` package, which translates to the Wasm `externref` type. These can be passed around and stored as opaque values on the Dart side.
-- For Dart objects, use the corresponding Dart type. This will be emitted as `externref` and automatically converted to and from the Dart type at the boundary.
+- For JS objects, use a JS interop type, e.g. `JSAny`, which translates to the Wasm `externref` type. These can be passed around and stored as opaque values on the Dart side.
+- For Dart objects, use the corresponding Dart type. This will be emitted as `anyref` and automatically converted to and from the Dart type at the boundary.

pkg/dart2wasm/lib/dispatch_table.dart

@@ -324,7 +324,7 @@ class DispatchTable {
       final ClassInfo? superInfo = info.superInfo;
 
       // Add the class to its inherited members' selectors. Skip `_WasmBase`:
-      // it's defined as a Dart class (in `dart.wasm` library) but it's special
+      // it's defined as a Dart class (in `dart._wasm` library) but it's special
       // and does not inherit from `Object`.
       if (superInfo != null && info.cls != translator.wasmTypesBaseClass) {
         int superId = superInfo.classId;

pkg/dart2wasm/lib/ffi_native_transformer.dart

@@ -44,7 +44,7 @@ void transformLibraries(
     'dart:_internal',
     'dart:typed_data',
     'dart:nativewrappers',
-    'dart:wasm'
+    'dart:_wasm'
   ]);
   final transformer = WasmFfiNativeTransformer(
       index, coreTypes, hierarchy, diagnosticReporter, referenceFromIndex);
@@ -79,37 +79,37 @@ class WasmFfiNativeTransformer extends FfiNativeTransformer {
       ClassHierarchy hierarchy,
       DiagnosticReporter diagnosticReporter,
       ReferenceFromIndex? referenceFromIndex)
-      : wasmI32Class = index.getClass('dart:wasm', 'WasmI32'),
-        wasmI64Class = index.getClass('dart:wasm', 'WasmI64'),
-        wasmF32Class = index.getClass('dart:wasm', 'WasmF32'),
-        wasmF64Class = index.getClass('dart:wasm', 'WasmF64'),
-        wasmEqRefClass = index.getClass('dart:wasm', 'WasmEqRef'),
-        wasmI32FromInt = index.getProcedure('dart:wasm', 'WasmI32', 'fromInt'),
+      : wasmI32Class = index.getClass('dart:_wasm', 'WasmI32'),
+        wasmI64Class = index.getClass('dart:_wasm', 'WasmI64'),
+        wasmF32Class = index.getClass('dart:_wasm', 'WasmF32'),
+        wasmF64Class = index.getClass('dart:_wasm', 'WasmF64'),
+        wasmEqRefClass = index.getClass('dart:_wasm', 'WasmEqRef'),
+        wasmI32FromInt = index.getProcedure('dart:_wasm', 'WasmI32', 'fromInt'),
         wasmI32Int8FromInt =
-            index.getProcedure('dart:wasm', 'WasmI32', 'int8FromInt'),
+            index.getProcedure('dart:_wasm', 'WasmI32', 'int8FromInt'),
         wasmI32Uint8FromInt =
-            index.getProcedure('dart:wasm', 'WasmI32', 'uint8FromInt'),
+            index.getProcedure('dart:_wasm', 'WasmI32', 'uint8FromInt'),
         wasmI32Int16FromInt =
-            index.getProcedure('dart:wasm', 'WasmI32', 'int16FromInt'),
+            index.getProcedure('dart:_wasm', 'WasmI32', 'int16FromInt'),
         wasmI32Uint16FromInt =
-            index.getProcedure('dart:wasm', 'WasmI32', 'uint16FromInt'),
+            index.getProcedure('dart:_wasm', 'WasmI32', 'uint16FromInt'),
         wasmI32FromBool =
-            index.getProcedure('dart:wasm', 'WasmI32', 'fromBool'),
+            index.getProcedure('dart:_wasm', 'WasmI32', 'fromBool'),
         wasmI32ToIntSigned =
-            index.getProcedure('dart:wasm', 'WasmI32', 'toIntSigned'),
+            index.getProcedure('dart:_wasm', 'WasmI32', 'toIntSigned'),
         wasmI32ToIntUnsigned =
-            index.getProcedure('dart:wasm', 'WasmI32', 'toIntUnsigned'),
-        wasmI32ToBool = index.getProcedure('dart:wasm', 'WasmI32', 'toBool'),
-        wasmI64ToInt = index.getProcedure('dart:wasm', 'WasmI64', 'toInt'),
-        wasmI64FromInt = index.getProcedure('dart:wasm', 'WasmI64', 'fromInt'),
+            index.getProcedure('dart:_wasm', 'WasmI32', 'toIntUnsigned'),
+        wasmI32ToBool = index.getProcedure('dart:_wasm', 'WasmI32', 'toBool'),
+        wasmI64ToInt = index.getProcedure('dart:_wasm', 'WasmI64', 'toInt'),
+        wasmI64FromInt = index.getProcedure('dart:_wasm', 'WasmI64', 'fromInt'),
         wasmF32FromDouble =
-            index.getProcedure('dart:wasm', 'WasmF32', 'fromDouble'),
+            index.getProcedure('dart:_wasm', 'WasmF32', 'fromDouble'),
         wasmF32ToDouble =
-            index.getProcedure('dart:wasm', 'WasmF32', 'toDouble'),
+            index.getProcedure('dart:_wasm', 'WasmF32', 'toDouble'),
         wasmF64FromDouble =
-            index.getProcedure('dart:wasm', 'WasmF64', 'fromDouble'),
+            index.getProcedure('dart:_wasm', 'WasmF64', 'fromDouble'),
         wasmF64ToDouble =
-            index.getProcedure('dart:wasm', 'WasmF64', 'toDouble'),
+            index.getProcedure('dart:_wasm', 'WasmF64', 'toDouble'),
         super(index, coreTypes, hierarchy, diagnosticReporter,
             referenceFromIndex);
 

pkg/dart2wasm/lib/intrinsics.dart

@@ -1020,8 +1020,8 @@ class Intrinsifier {
       }
     }
 
-    // dart:wasm static functions
-    if (node.target.enclosingLibrary.name == "dart.wasm") {
+    // dart:_wasm static functions
+    if (node.target.enclosingLibrary.name == "dart._wasm") {
       Expression value = node.arguments.positional.single;
       switch (name) {
         case "_externalizeNonNullable":

pkg/dart2wasm/lib/js_runtime_generator.dart

@@ -94,7 +94,7 @@ class _JSLowerer extends Transformer {
         _inlineJSTarget =
             _coreTypes.index.getTopLevelProcedure('dart:_js_helper', 'JS'),
         _wasmExternRefClass =
-            _coreTypes.index.getClass('dart:wasm', 'WasmExternRef'),
+            _coreTypes.index.getClass('dart:_wasm', 'WasmExternRef'),
         _numToIntTarget = _coreTypes.index
             .getClass('dart:core', 'num')
             .procedures

pkg/dart2wasm/lib/kernel_nodes.dart

@@ -17,7 +17,7 @@ mixin KernelNodes {
     "dart:core",
     "dart:ffi",
     "dart:typed_data",
-    "dart:wasm"
+    "dart:_wasm"
   ]);
 
   // dart:_internal classes
@@ -103,29 +103,29 @@ mixin KernelNodes {
   late final Class unmodifiableByteDataViewClass =
       index.getClass("dart:typed_data", "_UnmodifiableByteDataView");
 
-  // dart:wasm classes
+  // dart:_wasm classes
   late final Class wasmTypesBaseClass =
-      index.getClass("dart:wasm", "_WasmBase");
-  late final wasmI8Class = index.getClass("dart:wasm", "WasmI8");
-  late final wasmI16Class = index.getClass("dart:wasm", "WasmI16");
-  late final wasmI32Class = index.getClass("dart:wasm", "WasmI32");
-  late final wasmI64Class = index.getClass("dart:wasm", "WasmI64");
-  late final wasmF32Class = index.getClass("dart:wasm", "WasmF32");
-  late final wasmF64Class = index.getClass("dart:wasm", "WasmF64");
-  late final Class wasmAnyRefClass = index.getClass("dart:wasm", "WasmAnyRef");
+      index.getClass("dart:_wasm", "_WasmBase");
+  late final wasmI8Class = index.getClass("dart:_wasm", "WasmI8");
+  late final wasmI16Class = index.getClass("dart:_wasm", "WasmI16");
+  late final wasmI32Class = index.getClass("dart:_wasm", "WasmI32");
+  late final wasmI64Class = index.getClass("dart:_wasm", "WasmI64");
+  late final wasmF32Class = index.getClass("dart:_wasm", "WasmF32");
+  late final wasmF64Class = index.getClass("dart:_wasm", "WasmF64");
+  late final Class wasmAnyRefClass = index.getClass("dart:_wasm", "WasmAnyRef");
   late final Class wasmExternRefClass =
-      index.getClass("dart:wasm", "WasmExternRef");
+      index.getClass("dart:_wasm", "WasmExternRef");
   late final Class wasmFuncRefClass =
-      index.getClass("dart:wasm", "WasmFuncRef");
-  late final Class wasmEqRefClass = index.getClass("dart:wasm", "WasmEqRef");
+      index.getClass("dart:_wasm", "WasmFuncRef");
+  late final Class wasmEqRefClass = index.getClass("dart:_wasm", "WasmEqRef");
   late final Class wasmStructRefClass =
-      index.getClass("dart:wasm", "WasmStructRef");
+      index.getClass("dart:_wasm", "WasmStructRef");
   late final Class wasmArrayRefClass =
-      index.getClass("dart:wasm", "WasmArrayRef");
+      index.getClass("dart:_wasm", "WasmArrayRef");
   late final Class wasmFunctionClass =
-      index.getClass("dart:wasm", "WasmFunction");
-  late final Class wasmVoidClass = index.getClass("dart:wasm", "WasmVoid");
-  late final Class wasmTableClass = index.getClass("dart:wasm", "WasmTable");
+      index.getClass("dart:_wasm", "WasmFunction");
+  late final Class wasmVoidClass = index.getClass("dart:_wasm", "WasmVoid");
+  late final Class wasmTableClass = index.getClass("dart:_wasm", "WasmTable");
 
   // dart:_internal procedures
   late final Procedure loadLibrary =
@@ -242,9 +242,9 @@ mixin KernelNodes {
       index.getTopLevelProcedure("dart:core", "_namedParameterMapToList");
   late final Procedure listOf = index.getProcedure("dart:core", "_List", "of");
 
-  // dart:wasm procedures
+  // dart:_wasm procedures
   late final Procedure wasmFunctionCall =
-      index.getProcedure("dart:wasm", "WasmFunction", "get:call");
+      index.getProcedure("dart:_wasm", "WasmFunction", "get:call");
   late final Procedure wasmTableCallIndirect =
-      index.getProcedure("dart:wasm", "WasmTable", "callIndirect");
+      index.getProcedure("dart:_wasm", "WasmTable", "callIndirect");
 }

pkg/dart2wasm/lib/target.dart

@@ -71,7 +71,7 @@ class WasmTarget extends Target {
         'dart:js_interop',
         'dart:js',
         'dart:js_util',
-        'dart:wasm',
+        'dart:_wasm',
         'dart:developer',
       ];
 
@@ -82,9 +82,13 @@ class WasmTarget extends Target {
         'dart:typed_data',
         'dart:js_interop',
         'dart:js_util',
-        'dart:wasm',
+        'dart:_wasm',
       ];
 
+  bool allowPlatformPrivateLibraryAccess(Uri importer, Uri imported) =>
+      super.allowPlatformPrivateLibraryAccess(importer, imported) ||
+      importer.path.contains('tests/web/wasm');
+
   void _patchHostEndian(CoreTypes coreTypes) {
     // Fix Endian.host to be a const field equal to Endian.little instead of
     // a final field. Wasm is a little-endian platform.

pkg/dart2wasm/lib/transformers.dart

@@ -53,7 +53,7 @@ class _WasmTransformer extends Transformer {
         _nonNullableTypeType = coreTypes.index
             .getClass('dart:core', '_Type')
             .getThisType(coreTypes, Nullability.nonNullable),
-        _wasmBaseClass = coreTypes.index.getClass('dart:wasm', '_WasmBase'),
+        _wasmBaseClass = coreTypes.index.getClass('dart:_wasm', '_WasmBase'),
         _coreLibrary = coreTypes.index.getLibrary('dart:core');
 
   @override

sdk/BUILD.gn

@@ -165,7 +165,7 @@ _full_sdk_libraries = [
   "mirrors",
   "svg",
   "typed_data",
-  "wasm",
+  "_wasm",
   "web_audio",
   "web_gl",
   "web_sql",

sdk/lib/_internal/wasm/lib/async_patch.dart

@@ -51,7 +51,7 @@
 import 'dart:_internal' show patch, scheduleCallback, unsafeCastOpaque;
 import 'dart:_js_helper' show JS;
 
-import 'dart:wasm';
+import 'dart:_wasm';
 
 part 'timer_patch.dart';
 

sdk/lib/_internal/wasm/lib/core_patch.dart

@@ -51,7 +51,7 @@ import 'dart:math' show Random;
 
 import "dart:typed_data" show Uint8List, Uint16List;
 
-import 'dart:wasm';
+import 'dart:_wasm';
 
 part "bool.dart";
 part "closure.dart";

sdk/lib/_internal/wasm/lib/js_helper.dart

@@ -7,10 +7,10 @@ library dart._js_helper;
 
 import 'dart:_internal';
 import 'dart:_js_annotations' as js;
+import 'dart:_wasm';
 import 'dart:collection';
 import 'dart:js_interop';
 import 'dart:typed_data';
-import 'dart:wasm';
 
 part 'regexp_helper.dart';
 

sdk/lib/_internal/wasm/lib/js_interop_patch.dart

@@ -4,11 +4,11 @@
 
 import 'dart:_internal' show patch;
 import 'dart:_js_helper';
+import 'dart:_wasm';
 import 'dart:async' show Completer;
 import 'dart:js_interop';
 import 'dart:js_util' show NullRejectionException;
 import 'dart:typed_data';
-import 'dart:wasm';
 
 /// Some helpers for working with JS types internally. If we implement the JS
 /// types as inline classes then these should go away.

sdk/lib/_internal/wasm/lib/js_patch.dart

@@ -8,8 +8,8 @@ library dart.js;
 
 import 'dart:_internal' show patch;
 import 'dart:_js_helper';
+import 'dart:_wasm';
 import 'dart:collection' show ListMixin;
-import 'dart:wasm';
 
 @patch
 JsObject get context => throw UnimplementedError();

sdk/lib/_internal/wasm/lib/js_util_patch.dart

@@ -7,10 +7,10 @@ library dart.js_util;
 import "dart:_internal";
 import "dart:_js_helper";
 import "dart:_js_types";
+import "dart:_wasm";
 import "dart:async" show Completer, FutureOr;
 import "dart:collection";
 import "dart:typed_data";
-import "dart:wasm";
 
 @patch
 dynamic jsify(Object? object) {

sdk/lib/_internal/wasm/lib/sync_star_patch.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:wasm';
+import 'dart:_wasm';
 
 // Signature of the inner function of a `sync*` function. It takes the state
 // object and a pending exception to be thrown (only for `yield*`).

sdk/lib/_internal/wasm/lib/weak_patch.dart

@@ -4,8 +4,8 @@
 
 import 'dart:_internal' show patch, unsafeCast;
 import 'dart:_js_helper' show isJSUndefined, JS;
+import 'dart:_wasm';
 import 'dart:ffi' show Pointer, Struct, Union;
-import 'dart:wasm';
 
 void _checkValidWeakTarget(Object object) {
   if ((object is bool) ||

sdk/lib/wasm/OWNERS renamed to sdk/lib/_wasm/OWNERS

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library dart.wasm;
+library dart._wasm;
 
 // A collection a special Dart types that are mapped directly to Wasm types
 // by the dart2wasm compiler. These types have a number of constraints:

sdk/lib/wasm/wasm_sources.gni renamed to sdk/lib/_wasm/wasm_sources.gni

@@ -139,6 +139,9 @@
       "_js_types": {
         "uri": "_internal/wasm/lib/js_types.dart"
       },
+      "_wasm": {
+        "uri": "_wasm/wasm_types.dart"
+      },
       "async": {
         "uri": "async/async.dart",
         "patches": [
@@ -231,9 +234,6 @@
           "_internal/wasm/lib/typed_data_patch.dart",
           "_internal/wasm/lib/simd_patch.dart"
         ]
-      },
-      "wasm": {
-        "uri": "wasm/wasm_types.dart"
       }
     }
   },

sdk/lib/wasm/wasm_types.dart renamed to sdk/lib/_wasm/wasm_types.dart

@@ -126,6 +126,8 @@ wasm:
       uri: _internal/wasm/lib/js_helper.dart
     _js_types:
       uri: _internal/wasm/lib/js_types.dart
+    _wasm:
+      uri: _wasm/wasm_types.dart
     async:
       uri: async/async.dart
       patches:
@@ -197,8 +199,6 @@ wasm:
         - _internal/vm/lib/typed_data_patch.dart
         - _internal/wasm/lib/typed_data_patch.dart
         - _internal/wasm/lib/simd_patch.dart
-    wasm:
-      uri: wasm/wasm_types.dart
 
 dart2js:
   include:

sdk/lib/libraries.json

@@ -2,7 +2,7 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 html/cross_frame_test: Skip # Issue 32039, test reloads itself (not by design - investigate)
-wasm/*: Skip # dart:wasm is currently behind a Dart SDK build flag.
+wasm/*: Skip # dart:_wasm is currently behind a Dart SDK build flag.
 
 [ $arch == simarm ]
 convert/utf85_test: Skip # Pass, Slow Issue 12644.

sdk/lib/libraries.yaml

@@ -22,7 +22,7 @@ isolate/*: SkipByDesign # No support for dart:isolate in dart4web (http://dartbu
 mirrors/*: SkipByDesign # Mirrors not supported on web in Dart 2.0.
 typed_data/int64_list_load_store_test: SkipByDesign # No support for Int64List
 typed_data/typed_data_hierarchy_int64_test: SkipByDesign # No support for Int64List
-wasm/*: SkipByDesign # dart:wasm not currently supported on web.
+wasm/*: SkipByDesign # dart:_wasm not currently supported on web.
 
 [ $compiler != dart2js ]
 async/dart2js_uncaught_error_test: Skip # JS-integration only test

tests/lib/lib.status

@@ -2,7 +2,7 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 html/cross_frame_test: Skip # Issue 32039, test reloads itself (not by design - investigate)
-wasm/*: Skip # dart:wasm is currently behind a Dart SDK build flag.
+wasm/*: Skip # dart:_wasm is currently behind a Dart SDK build flag.
 
 [ $arch == simarm ]
 convert/utf85_test: Skip # Pass, Slow Issue 12644.

tests/lib/lib_dart2js.status

@@ -20,7 +20,7 @@ html/wrapping_collections_test: SkipByDesign # Testing an issue that is only rel
 html/xhr_test: Slow, Pass
 isolate/*: SkipByDesign # No support for dart:isolate in dart4web (http://dartbug.com/30538)
 mirrors/*: SkipByDesign # Mirrors not supported on web in Dart 2.0.
-wasm/*: SkipByDesign # dart:wasm not currently supported on web.
+wasm/*: SkipByDesign # dart:_wasm not currently supported on web.
 
 [ $compiler != dart2js ]
 async/dart2js_uncaught_error_test: Skip # JS-integration only test