Skip to content

Commit 9198813

Browse files
liamappelbecommit-bot@chromium.org
authored andcommitted
Revert "Scaffolding for dart:wasm"
This reverts commit f39a3f1. Reason for revert: https://golem.corp.goog/BuildInfo?target=flutter-profile&machine-type=android-armv7&revision=84750 Original change's description: > Scaffolding for dart:wasm > > This CL doesn't have any tests because it's just boilerplate. I'll > add a test in the follow up CLs where I add actual functionality. > > Bug: #37882 > Change-Id: I47c81f5f1be724f8226e756ba5d01880a45f1ac7 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112841 > Reviewed-by: Siva Annamalai <[email protected]> > Reviewed-by: Liam Appelbe <[email protected]> > Commit-Queue: Liam Appelbe <[email protected]> [email protected],[email protected] Change-Id: I0fd0f29d66a07fc29e840ddaec2d4161c8d599cb No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: #37882 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/114044 Reviewed-by: Liam Appelbe <[email protected]> Commit-Queue: Liam Appelbe <[email protected]>
1 parent 4bf5a72 commit 9198813

17 files changed

+4
-110
lines changed

pkg/vm/lib/target/vm.dart

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ class VmTarget extends Target {
7676
'dart:nativewrappers',
7777
'dart:io',
7878
'dart:cli',
79-
'dart:wasm',
8079
];
8180

8281
@override

runtime/lib/wasm.cc

-28
This file was deleted.

runtime/lib/wasm_patch.dart

-8
This file was deleted.

runtime/lib/wasm_sources.gni

-7
This file was deleted.

runtime/vm/BUILD.gn

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import("../../sdk/lib/mirrors/mirrors_sources.gni")
1616
import("../../sdk/lib/profiler/profiler_sources.gni")
1717
import("../../sdk/lib/typed_data/typed_data_sources.gni")
1818
import("../../sdk/lib/vmservice/vmservice_sources.gni")
19-
import("../../sdk/lib/wasm/wasm_sources.gni")
2019
import("../../utils/compile_platform.gni")
2120
import("../bin/cli_sources.gni")
2221
import("../bin/io_sources.gni")
@@ -34,7 +33,6 @@ import("../lib/mirrors_sources.gni")
3433
import("../lib/profiler_sources.gni")
3534
import("../lib/typed_data_sources.gni")
3635
import("../lib/vmservice_sources.gni")
37-
import("../lib/wasm_sources.gni")
3836
import("../runtime_args.gni")
3937
import("compiler/compiler_sources.gni")
4038
import("heap/heap_sources.gni")
@@ -108,7 +106,7 @@ library_for_all_configs("libdart_lib") {
108106
internal_runtime_cc_files + isolate_runtime_cc_files +
109107
math_runtime_cc_files + mirrors_runtime_cc_files +
110108
typed_data_runtime_cc_files + vmservice_runtime_cc_files +
111-
ffi_runtime_cc_files + wasm_runtime_cc_files
109+
ffi_runtime_cc_files
112110
sources = [ "bootstrap.cc" ] + rebase_path(allsources, ".", "../lib")
113111
snapshot_sources = []
114112
nosnapshot_sources = []

runtime/vm/bootstrap_natives.cc

-5
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,6 @@ void Bootstrap::SetupNativeResolver() {
141141
ASSERT(!library.IsNull());
142142
library.set_native_entry_resolver(resolver);
143143
library.set_native_entry_symbol_resolver(symbol_resolver);
144-
145-
library = Library::WasmLibrary();
146-
ASSERT(!library.IsNull());
147-
library.set_native_entry_resolver(resolver);
148-
library.set_native_entry_symbol_resolver(symbol_resolver);
149144
}
150145

151146
bool Bootstrap::IsBootstrapResolver(Dart_NativeEntryResolver resolver) {

runtime/vm/bootstrap_natives.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace dart {
1313

1414
// List of bootstrap native entry points used in the core dart library.
15-
// V(function_name, argument_count)
1615
#define BOOTSTRAP_NATIVE_LIST(V) \
1716
V(AsyncStarMoveNext_debuggerStepCheck, 1) \
1817
V(DartAsync_fatal, 1) \
@@ -393,8 +392,7 @@ namespace dart {
393392
V(Ffi_dl_processLibrary, 0) \
394393
V(Ffi_dl_executableLibrary, 0) \
395394
V(TransferableTypedData_factory, 2) \
396-
V(TransferableTypedData_materialize, 1) \
397-
V(Wasm_callFunction, 2)
395+
V(TransferableTypedData_materialize, 1)
398396

399397
// List of bootstrap native entry points used in the dart:mirror library.
400398
#define MIRRORS_BOOTSTRAP_NATIVE_LIST(V) \

runtime/vm/object.cc

-12
Original file line numberDiff line numberDiff line change
@@ -1915,14 +1915,6 @@ RawError* Object::Init(Isolate* isolate,
19151915
pending_classes.Add(cls);
19161916
RegisterClass(cls, Symbols::FfiDynamicLibrary(), lib);
19171917

1918-
lib = Library::LookupLibrary(thread, Symbols::DartWasm());
1919-
if (lib.IsNull()) {
1920-
lib = Library::NewLibraryHelper(Symbols::DartWasm(), true);
1921-
lib.SetLoadRequested();
1922-
lib.Register(thread);
1923-
}
1924-
object_store->set_bootstrap_library(ObjectStore::kWasm, lib);
1925-
19261918
// Finish the initialization by compiling the bootstrap scripts containing
19271919
// the base interfaces and the implementation of the internal classes.
19281920
const Error& error = Error::Handle(
@@ -11706,10 +11698,6 @@ RawLibrary* Library::VMServiceLibrary() {
1170611698
return Isolate::Current()->object_store()->_vmservice_library();
1170711699
}
1170811700

11709-
RawLibrary* Library::WasmLibrary() {
11710-
return Isolate::Current()->object_store()->wasm_library();
11711-
}
11712-
1171311701
const char* Library::ToCString() const {
1171411702
const String& name = String::Handle(url());
1171511703
return OS::SCreate(Thread::Current()->zone(), "Library:'%s'",

runtime/vm/object.h

-1
Original file line numberDiff line numberDiff line change
@@ -4243,7 +4243,6 @@ class Library : public Object {
42434243
static RawLibrary* ProfilerLibrary();
42444244
static RawLibrary* TypedDataLibrary();
42454245
static RawLibrary* VMServiceLibrary();
4246-
static RawLibrary* WasmLibrary();
42474246

42484247
// Eagerly compile all classes and functions in the library.
42494248
static RawError* CompileAll(bool ignore_error = false);

runtime/vm/object_store.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ class ObjectPointerVisitor;
2929
M(Mirrors, mirrors) \
3030
M(Profiler, profiler) \
3131
M(TypedData, typed_data) \
32-
M(VMService, _vmservice) \
33-
M(Wasm, wasm)
32+
M(VMService, _vmservice)
3433

3534
#define OBJECT_STORE_FIELD_LIST(R_, RW) \
3635
RW(Class, object_class) \
@@ -102,7 +101,6 @@ class ObjectPointerVisitor;
102101
RW(Library, root_library) \
103102
RW(Library, typed_data_library) \
104103
RW(Library, _vmservice_library) \
105-
RW(Library, wasm_library) \
106104
RW(GrowableObjectArray, libraries) \
107105
RW(Array, libraries_map) \
108106
RW(GrowableObjectArray, closure_functions) \

runtime/vm/symbols.h

-3
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ class ObjectPointerVisitor;
7272
V(DartExtensionScheme, "dart-ext:") \
7373
V(DartFfi, "dart:ffi") \
7474
V(DartFfiLibName, "ffi") \
75-
V(DartWasm, "dart:wasm") \
76-
V(DartWasmLibName, "wasm") \
77-
V(DartLibraryWasm, "dart.library.wasm") \
7875
V(DartIOLibName, "dart.io") \
7976
V(DartInternal, "dart:_internal") \
8077
V(DartIsVM, "dart.isVM") \

sdk/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ declare_args() {
8484
# ......math/
8585
# ......mirrors/
8686
# ......typed_data/
87-
# ......wasm/
8887
# ......api_readme.md
8988
# ....model/
9089
# ......lexeme/
@@ -217,7 +216,6 @@ _full_sdk_libraries = [
217216
"profiler",
218217
"svg",
219218
"typed_data",
220-
"wasm",
221219
"web_audio",
222220
"web_gl",
223221
"web_sql",

sdk/lib/_internal/sdk_library_metadata/lib/libraries.dart

-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ const Map<String, LibraryInfo> libraries = const {
134134
categories: "Client",
135135
maturity: Maturity.WEB_STABLE,
136136
platforms: DART2JS_PLATFORM),
137-
"wasm": const LibraryInfo("wasm/wasm.dart",
138-
categories: "Server", maturity: Maturity.EXPERIMENTAL),
139137
"web_audio": const LibraryInfo("web_audio/dart2js/web_audio_dart2js.dart",
140138
categories: "Client",
141139
maturity: Maturity.WEB_STABLE,

sdk/lib/libraries.json

+1-7
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,6 @@
7171
],
7272
"uri": "ffi/ffi.dart"
7373
},
74-
"wasm": {
75-
"patches": [
76-
"../../runtime/lib/wasm_patch.dart"
77-
],
78-
"uri": "wasm/wasm.dart"
79-
},
8074
"typed_data": {
8175
"patches": "../../runtime/lib/typed_data_patch.dart",
8276
"uri": "typed_data/typed_data.dart"
@@ -487,4 +481,4 @@
487481
}
488482
}
489483
}
490-
}
484+
}

sdk/lib/libraries.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ vm:
9494
- "../../runtime/lib/ffi_dynamic_library_patch.dart"
9595
- "../../runtime/lib/ffi_native_type_patch.dart"
9696

97-
wasm:
98-
uri: "wasm/wasm.dart"
99-
patches:
100-
- "../../runtime/lib/wasm_patch.dart"
101-
10297
_http:
10398
uri: "_http/http.dart"
10499

sdk/lib/wasm/wasm.dart

-13
This file was deleted.

sdk/lib/wasm/wasm_sources.gni

-7
This file was deleted.

0 commit comments

Comments
 (0)