[wasm] asm.js - Parse and convert asm.js to wasm a function at a time.

src/asmjs/asm-js.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/asmjs/asm-js.h"
 
 #include "src/api-natives.h"
 #include "src/api.h"
 #include "src/asmjs/asm-typer.h"
 #include "src/asmjs/asm-wasm-builder.h"
@@ skipping 135 matching lines @@
 #undef STDLIB_MATH_CONST
     default: { UNREACHABLE(); }
   }
   return false;
 }
 
 }  // namespace
 
 MaybeHandle<FixedArray> AsmJs::ConvertAsmToWasm(ParseInfo* info) {
   ErrorThrower thrower(info->isolate(), "Asm.js -> WebAssembly conversion");
-  wasm::AsmTyper typer(info->isolate(), info->zone(), *(info->script()),
-                       info->literal());
-  if (!typer.Validate()) {
+  v8::internal::wasm::AsmWasmBuilder builder(info->isolate(), info->zone(),

[titzer, 2016/11/29 14:57:37]

Can you drop the v8::internal:: qualifiers?

[bradn, 2016/11/29 22:09:06]

Done.

+                                             info->ast_value_factory(),
+                                             *info->script(), info->literal());
+  i::Handle<i::FixedArray> foreign_globals;

[titzer, 2016/11/29 14:57:37]

I think you can drop the i::FixedArray qualification here.

[bradn, 2016/11/29 22:09:06]

Done.

+  auto asm_wasm_result = builder.Run(&foreign_globals);
+  if (!asm_wasm_result.success) {
     DCHECK(!info->isolate()->has_pending_exception());
-    PrintF("Validation of asm.js module failed: %s\n", typer.error_message());
+    PrintF("Validation of asm.js module failed: %s\n",
+           builder.typer()->error_message());
     return MaybeHandle<FixedArray>();
   }
-  v8::internal::wasm::AsmWasmBuilder builder(info->isolate(), info->zone(),
-                                             info->literal(), &typer);
-  i::Handle<i::FixedArray> foreign_globals;
-  auto asm_wasm_result = builder.Run(&foreign_globals);
   wasm::ZoneBuffer* module = asm_wasm_result.module_bytes;
   wasm::ZoneBuffer* asm_offsets = asm_wasm_result.asm_offset_table;
 
   i::MaybeHandle<i::JSObject> compiled = wasm::CreateModuleObjectFromBytes(
       info->isolate(), module->begin(), module->end(), &thrower,
       internal::wasm::kAsmJsOrigin, info->script(), asm_offsets->begin(),
       asm_offsets->end());
   DCHECK(!compiled.is_null());
 
-  wasm::AsmTyper::StdlibSet uses = typer.StdlibUses();
+  wasm::AsmTyper::StdlibSet uses = builder.typer()->StdlibUses();
   Handle<FixedArray> uses_array =
       info->isolate()->factory()->NewFixedArray(static_cast<int>(uses.size()));
   int count = 0;
   for (auto i : uses) {
     uses_array->set(count++, Smi::FromInt(i));
   }
 
   Handle<FixedArray> result = info->isolate()->factory()->NewFixedArray(3);
   result->set(0, *compiled.ToHandleChecked());
   result->set(1, *foreign_globals);
@@ skipping 69 matching lines @@
       i::Object::GetProperty(module_object, single_function_name);
   if (!single_function.is_null() &&
       !single_function.ToHandleChecked()->IsUndefined(isolate)) {
     return single_function;
   }
   return module_object;
 }
 
 }  // namespace internal
 }  // namespace v8