Commit a74ac8fa authored by Michael Starzinger's avatar Michael Starzinger Committed by Commit Bot

[asm.js] Remove deprecated foreign globals plumbing.

R=clemensh@chromium.org
BUG=v8:6127

Change-Id: I4f20eae61f47eaa300ba54269c68eefa910b68da
Reviewed-on: https://chromium-review.googlesource.com/500068Reviewed-by: 's avatarClemens Hammacher <clemensh@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#45191}
parent d40c6abd
...@@ -34,7 +34,6 @@ const char* const AsmJs::kSingleFunctionName = "__single_function__"; ...@@ -34,7 +34,6 @@ const char* const AsmJs::kSingleFunctionName = "__single_function__";
namespace { namespace {
enum WasmDataEntries { enum WasmDataEntries {
kWasmDataCompiledModule, kWasmDataCompiledModule,
kWasmDataForeignGlobals,
kWasmDataUsesArray, kWasmDataUsesArray,
kWasmDataScript, kWasmDataScript,
kWasmDataScriptPosition, kWasmDataScriptPosition,
...@@ -153,7 +152,6 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) { ...@@ -153,7 +152,6 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) {
wasm::ZoneBuffer* module = nullptr; wasm::ZoneBuffer* module = nullptr;
wasm::ZoneBuffer* asm_offsets = nullptr; wasm::ZoneBuffer* asm_offsets = nullptr;
Handle<FixedArray> uses_array; Handle<FixedArray> uses_array;
Handle<FixedArray> foreign_globals;
base::ElapsedTimer asm_wasm_timer; base::ElapsedTimer asm_wasm_timer;
asm_wasm_timer.Start(); asm_wasm_timer.Start();
size_t asm_wasm_zone_start = info->zone()->allocation_size(); size_t asm_wasm_zone_start = info->zone()->allocation_size();
...@@ -186,9 +184,6 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) { ...@@ -186,9 +184,6 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) {
parser.module_builder()->WriteTo(*module); parser.module_builder()->WriteTo(*module);
asm_offsets = new (zone) wasm::ZoneBuffer(zone); asm_offsets = new (zone) wasm::ZoneBuffer(zone);
parser.module_builder()->WriteAsmJsOffsetTable(*asm_offsets); parser.module_builder()->WriteAsmJsOffsetTable(*asm_offsets);
// TODO(bradnelson): Remove foreign_globals plumbing (as we don't need it
// for the new parser).
foreign_globals = info->isolate()->factory()->NewFixedArray(0);
uses_array = info->isolate()->factory()->NewFixedArray( uses_array = info->isolate()->factory()->NewFixedArray(
static_cast<int>(parser.stdlib_uses()->size())); static_cast<int>(parser.stdlib_uses()->size()));
int count = 0; int count = 0;
...@@ -224,7 +219,6 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) { ...@@ -224,7 +219,6 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) {
Handle<FixedArray> result = Handle<FixedArray> result =
info->isolate()->factory()->NewFixedArray(kWasmDataEntryCount); info->isolate()->factory()->NewFixedArray(kWasmDataEntryCount);
result->set(kWasmDataCompiledModule, *compiled.ToHandleChecked()); result->set(kWasmDataCompiledModule, *compiled.ToHandleChecked());
result->set(kWasmDataForeignGlobals, *foreign_globals);
result->set(kWasmDataUsesArray, *uses_array); result->set(kWasmDataUsesArray, *uses_array);
result->set(kWasmDataScript, *info->script()); result->set(kWasmDataScript, *info->script());
result->set(kWasmDataScriptPosition, result->set(kWasmDataScriptPosition,
...@@ -267,8 +261,6 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(Isolate* isolate, ...@@ -267,8 +261,6 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(Isolate* isolate,
FixedArray::cast(wasm_data->get(kWasmDataUsesArray))); FixedArray::cast(wasm_data->get(kWasmDataUsesArray)));
Handle<WasmModuleObject> module( Handle<WasmModuleObject> module(
WasmModuleObject::cast(wasm_data->get(kWasmDataCompiledModule))); WasmModuleObject::cast(wasm_data->get(kWasmDataCompiledModule)));
Handle<FixedArray> foreign_globals(
FixedArray::cast(wasm_data->get(kWasmDataForeignGlobals)));
// Check that all used stdlib members are valid. // Check that all used stdlib members are valid.
bool stdlib_use_of_typed_array_present = false; bool stdlib_use_of_typed_array_present = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment