[asm.js] Remove AST-based asm.js validator implementation.

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

Change-Id: I6a098151fef14c0c76c1762d99316a3ae7d12a8e
Reviewed-on: https://chromium-review.googlesource.com/496266
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#45119}

BUILD.gn

@@ -1081,12 +1081,8 @@ v8_source_set("v8_base") {
     "src/asmjs/asm-parser.h",
     "src/asmjs/asm-scanner.cc",
     "src/asmjs/asm-scanner.h",
-    "src/asmjs/asm-typer.cc",
-    "src/asmjs/asm-typer.h",
     "src/asmjs/asm-types.cc",
     "src/asmjs/asm-types.h",
-    "src/asmjs/asm-wasm-builder.cc",
-    "src/asmjs/asm-wasm-builder.h",
     "src/asmjs/switch-logic.cc",
     "src/asmjs/switch-logic.h",
     "src/assembler-inl.h",

src/asmjs/OWNERS

-# Keep in sync with test/cctest/asmjs/OWNERS.
-
 set noparent
 
 ahaas@chromium.org

src/asmjs/asm-js.cc

@@ -8,9 +8,8 @@
 #include "src/api.h"
 #include "src/asmjs/asm-names.h"
 #include "src/asmjs/asm-parser.h"
-#include "src/asmjs/asm-typer.h"
-#include "src/asmjs/asm-wasm-builder.h"
 #include "src/assert-scope.h"
+#include "src/ast/ast.h"
 #include "src/base/platform/elapsed-timer.h"
 #include "src/compilation-info.h"
 #include "src/execution.h"
@@ -30,6 +29,8 @@
 namespace v8 {
 namespace internal {
 
+const char* const AsmJs::kSingleFunctionName = "__single_function__";
+
 namespace {
 enum WasmDataEntries {
   kWasmDataCompiledModule,
@@ -63,18 +64,10 @@ Handle<Object> StdlibMathMember(Isolate* isolate, Handle<JSReceiver> stdlib,
 }
 
 bool IsStdlibMemberValid(Isolate* isolate, Handle<JSReceiver> stdlib,
-                         wasm::AsmTyper::StandardMember member,
+                         wasm::AsmJsParser::StandardMember member,
                          bool* is_typed_array) {
   switch (member) {
-    case wasm::AsmTyper::StandardMember::kNone:
-    case wasm::AsmTyper::StandardMember::kModule:
-    case wasm::AsmTyper::StandardMember::kStdlib:
-    case wasm::AsmTyper::StandardMember::kHeap:
-    case wasm::AsmTyper::StandardMember::kFFI: {
-      // Nothing to check for these.
-      return true;
-    }
-    case wasm::AsmTyper::StandardMember::kInfinity: {
+    case wasm::AsmJsParser::StandardMember::kInfinity: {
       if (stdlib.is_null()) {
         return false;
       }
@@ -87,7 +80,7 @@ bool IsStdlibMemberValid(Isolate* isolate, Handle<JSReceiver> stdlib,
       Handle<Object> value = maybe_value.ToHandleChecked();
       return value->IsNumber() && std::isinf(value->Number());
     }
-    case wasm::AsmTyper::StandardMember::kNaN: {
+    case wasm::AsmJsParser::StandardMember::kNaN: {
       if (stdlib.is_null()) {
         return false;
       }
@@ -101,7 +94,7 @@ bool IsStdlibMemberValid(Isolate* isolate, Handle<JSReceiver> stdlib,
       return value->IsNaN();
     }
 #define STDLIB_MATH_FUNC(fname, FName, ignore1, ignore2)            \
-  case wasm::AsmTyper::StandardMember::kMath##FName: {              \
+  case wasm::AsmJsParser::StandardMember::kMath##FName: {           \
     Handle<Name> name(isolate->factory()->InternalizeOneByteString( \
         STATIC_CHAR_VECTOR(#fname)));                               \
     Handle<Object> value = StdlibMathMember(isolate, stdlib, name); \
@@ -115,7 +108,7 @@ bool IsStdlibMemberValid(Isolate* isolate, Handle<JSReceiver> stdlib,
       STDLIB_MATH_FUNCTION_LIST(STDLIB_MATH_FUNC)
 #undef STDLIB_MATH_FUNC
 #define STDLIB_MATH_CONST(cname, const_value)                       \
-  case wasm::AsmTyper::StandardMember::kMath##cname: {              \
+  case wasm::AsmJsParser::StandardMember::kMath##cname: {           \
     Handle<Name> name(isolate->factory()->InternalizeOneByteString( \
         STATIC_CHAR_VECTOR(#cname)));                               \
     Handle<Object> value = StdlibMathMember(isolate, stdlib, name); \
@@ -125,7 +118,7 @@ bool IsStdlibMemberValid(Isolate* isolate, Handle<JSReceiver> stdlib,
       STDLIB_MATH_VALUE_LIST(STDLIB_MATH_CONST)
 #undef STDLIB_MATH_CONST
 #define STDLIB_ARRAY_TYPE(fname, FName)                                  \
-  case wasm::AsmTyper::StandardMember::k##FName: {                       \
+  case wasm::AsmJsParser::StandardMember::k##FName: {                    \
     *is_typed_array = true;                                              \
     if (stdlib.is_null()) {                                              \
       return false;                                                      \
@@ -163,7 +156,6 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) {
   Handle<FixedArray> foreign_globals;
   base::ElapsedTimer asm_wasm_timer;
   asm_wasm_timer.Start();
-  wasm::AsmWasmBuilder builder(info);
   size_t asm_wasm_zone_start = info->zone()->allocation_size();
   {
     wasm::AsmJsParser parser(info->isolate(), info->zone(), info->script(),
@@ -282,8 +274,8 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(Isolate* isolate,
   bool stdlib_use_of_typed_array_present = false;
   for (int i = 0; i < stdlib_uses->length(); ++i) {
     int member_id = Smi::cast(stdlib_uses->get(i))->value();
-    wasm::AsmTyper::StandardMember member =
-        static_cast<wasm::AsmTyper::StandardMember>(member_id);
+    wasm::AsmJsParser::StandardMember member =
+        static_cast<wasm::AsmJsParser::StandardMember>(member_id);
     if (!IsStdlibMemberValid(isolate, stdlib, member,
                              &stdlib_use_of_typed_array_present)) {
       return MaybeHandle<Object>();
@@ -321,8 +313,8 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(Isolate* isolate,
   DCHECK(!thrower.error());
   Handle<Object> module_object = maybe_module_object.ToHandleChecked();
 
-  Handle<Name> single_function_name(isolate->factory()->InternalizeUtf8String(
-      wasm::AsmWasmBuilder::single_function_name));
+  Handle<Name> single_function_name(
+      isolate->factory()->InternalizeUtf8String(AsmJs::kSingleFunctionName));
   MaybeHandle<Object> single_function =
       Object::GetProperty(module_object, single_function_name);
   if (!single_function.is_null() &&

src/asmjs/asm-js.h

@@ -22,6 +22,10 @@ class AsmJs {
                                                 Handle<JSReceiver> stdlib,
                                                 Handle<JSReceiver> foreign,
                                                 Handle<JSArrayBuffer> memory);
+
+  // Special export name used to indicate that the module exports a single
+  // function instead of a JavaScript object holding multiple functions.
+  static const char* const kSingleFunctionName;
 };
 
 }  // namespace internal

src/asmjs/asm-parser.cc

@@ -9,10 +9,12 @@
 
 #include <algorithm>
 
+#include "src/asmjs/asm-js.h"
 #include "src/asmjs/asm-types.h"
 #include "src/objects-inl.h"
 #include "src/objects.h"
 #include "src/parsing/scanner-character-streams.h"
+#include "src/parsing/scanner.h"
 #include "src/wasm/wasm-opcodes.h"
 
 namespace v8 {
@@ -562,7 +564,7 @@ void AsmJsParser::ValidateModuleVarNewStdlib(VarInfo* info) {
 #define V(name, _junk1, _junk2, _junk3)                          \
   case TOK(name):                                                \
     DeclareStdlibFunc(info, VarKind::kSpecial, AsmType::name()); \
-    stdlib_uses_.insert(AsmTyper::k##name);                      \
+    stdlib_uses_.insert(StandardMember::k##name);                \
     break;
     STDLIB_ARRAY_TYPE_LIST(V)
 #undef V
@@ -585,14 +587,14 @@ void AsmJsParser::ValidateModuleVarStdlib(VarInfo* info) {
   case TOK(name):                                           \
     DeclareGlobal(info, false, AsmType::Double(), kWasmF64, \
                   WasmInitExpr(const_value));               \
-    stdlib_uses_.insert(AsmTyper::kMath##name);             \
+    stdlib_uses_.insert(StandardMember::kMath##name);       \
     break;
       STDLIB_MATH_VALUE_LIST(V)
 #undef V
 #define V(name, Name, op, sig)                                      \
   case TOK(name):                                                   \
     DeclareStdlibFunc(info, VarKind::kMath##Name, stdlib_##sig##_); \
-    stdlib_uses_.insert(AsmTyper::kMath##Name);                     \
+    stdlib_uses_.insert(StandardMember::kMath##Name);               \
     break;
       STDLIB_MATH_FUNCTION_LIST(V)
 #undef V
@@ -602,11 +604,11 @@ void AsmJsParser::ValidateModuleVarStdlib(VarInfo* info) {
   } else if (Check(TOK(Infinity))) {
     DeclareGlobal(info, false, AsmType::Double(), kWasmF64,
                   WasmInitExpr(std::numeric_limits<double>::infinity()));
-    stdlib_uses_.insert(AsmTyper::kInfinity);
+    stdlib_uses_.insert(StandardMember::kInfinity);
   } else if (Check(TOK(NaN))) {
     DeclareGlobal(info, false, AsmType::Double(), kWasmF64,
                   WasmInitExpr(std::numeric_limits<double>::quiet_NaN()));
-    stdlib_uses_.insert(AsmTyper::kNaN);
+    stdlib_uses_.insert(StandardMember::kNaN);
   } else {
     FAIL("Invalid member of stdlib");
   }
@@ -649,8 +651,7 @@ void AsmJsParser::ValidateExport() {
     if (info->kind != VarKind::kFunction) {
       FAIL("Single function export must be a function");
     }
-    const char* single_function_name = "__single_function__";
-    info->function_builder->ExportAs(CStrVector(single_function_name));
+    info->function_builder->ExportAs(CStrVector(AsmJs::kSingleFunctionName));
   }
 }
 

src/asmjs/asm-parser.h

@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "src/asmjs/asm-scanner.h"
-#include "src/asmjs/asm-typer.h"
 #include "src/asmjs/asm-types.h"
 #include "src/wasm/wasm-module-builder.h"
 #include "src/zone/zone-containers.h"
@@ -29,13 +28,31 @@ namespace wasm {
 //   scopes (local + module wide).
 class AsmJsParser {
  public:
+  // clang-format off
+  enum StandardMember {
+    kInfinity,
+    kNaN,
+#define V(_unused1, name, _unused2, _unused3) kMath##name,
+    STDLIB_MATH_FUNCTION_LIST(V)
+#undef V
+#define V(name, _unused1) kMath##name,
+    STDLIB_MATH_VALUE_LIST(V)
+#undef V
+#define V(name, _unused1, _unused2, _unused3) k##name,
+    STDLIB_ARRAY_TYPE_LIST(V)
+#undef V
+  };
+  // clang-format on
+
+  typedef std::unordered_set<StandardMember, std::hash<int>> StdlibSet;
+
   explicit AsmJsParser(Isolate* isolate, Zone* zone, Handle<Script> script,
                        int start, int end);
   bool Run();
   const char* failure_message() const { return failure_message_; }
   int failure_location() const { return failure_location_; }
   WasmModuleBuilder* module_builder() { return module_builder_; }
-  const AsmTyper::StdlibSet* stdlib_uses() const { return &stdlib_uses_; }
+  const StdlibSet* stdlib_uses() const { return &stdlib_uses_; }
 
  private:
   // clang-format off
@@ -96,7 +113,7 @@ class AsmJsParser {
   WasmFunctionBuilder* current_function_builder_;
   AsmType* return_type_;
   uintptr_t stack_limit_;
-  AsmTyper::StdlibSet stdlib_uses_;
+  StdlibSet stdlib_uses_;
   ZoneVector<VarInfo> global_var_info_;
   ZoneVector<VarInfo> local_var_info_;
 

src/asmjs/asm-wasm-builder.h

-// 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.
-
-#ifndef V8_ASMJS_ASM_WASM_BUILDER_H_
-#define V8_ASMJS_ASM_WASM_BUILDER_H_
-
-#include "src/allocation.h"
-#include "src/asmjs/asm-typer.h"
-#include "src/objects.h"
-#include "src/wasm/wasm-module-builder.h"
-#include "src/zone/zone.h"
-
-namespace v8 {
-namespace internal {
-
-class CompilationInfo;
-
-namespace wasm {
-
-class AsmWasmBuilder {
- public:
-  struct Result {
-    ZoneBuffer* module_bytes;
-    ZoneBuffer* asm_offset_table;
-    bool success;
-  };
-
-  explicit AsmWasmBuilder(CompilationInfo* info);
-  Result Run(Handle<FixedArray>* foreign_args);
-
-  static const char* foreign_init_name;
-  static const char* single_function_name;
-
-  const AsmTyper* typer() { return &typer_; }
-
- private:
-  CompilationInfo* info_;
-  AsmTyper typer_;
-};
-}  // namespace wasm
-}  // namespace internal
-}  // namespace v8
-
-#endif  // V8_WASM_ASM_WASM_BUILDER_H_

src/compiler.cc

@@ -8,7 +8,6 @@
 #include <memory>
 
 #include "src/asmjs/asm-js.h"
-#include "src/asmjs/asm-typer.h"
 #include "src/assembler-inl.h"
 #include "src/ast/ast-numbering.h"
 #include "src/ast/prettyprinter.h"

src/v8.gyp

@@ -418,12 +418,8 @@
         'asmjs/asm-parser.h',
         'asmjs/asm-scanner.cc',
         'asmjs/asm-scanner.h',
-        'asmjs/asm-typer.cc',
-        'asmjs/asm-typer.h',
         'asmjs/asm-types.cc',
         'asmjs/asm-types.h',
-        'asmjs/asm-wasm-builder.cc',
-        'asmjs/asm-wasm-builder.h',
         'asmjs/switch-logic.h',
         'asmjs/switch-logic.cc',
         'assembler.cc',

src/wasm/wasm-js.cc

@@ -4,9 +4,6 @@
 
 #include "src/api-natives.h"
 #include "src/api.h"
-#include "src/asmjs/asm-js.h"
-#include "src/asmjs/asm-typer.h"
-#include "src/asmjs/asm-wasm-builder.h"
 #include "src/assert-scope.h"
 #include "src/ast/ast.h"
 #include "src/execution.h"

src/wasm/wasm-module.cc

@@ -4,6 +4,7 @@
 
 #include <memory>
 
+#include "src/asmjs/asm-js.h"
 #include "src/assembler-inl.h"
 #include "src/base/atomic-utils.h"
 #include "src/code-stubs.h"
@@ -17,7 +18,6 @@
 #include "src/trap-handler/trap-handler.h"
 #include "src/v8.h"
 
-#include "src/asmjs/asm-wasm-builder.h"
 #include "src/wasm/function-body-decoder.h"
 #include "src/wasm/module-decoder.h"
 #include "src/wasm/wasm-code-specialization.h"
@@ -1858,12 +1858,8 @@ class InstantiationHelper {
         isolate_->factory()->InternalizeUtf8String("exports");
     JSObject::AddProperty(instance, exports_name, exports_object, NONE);
 
-    Handle<String> foreign_init_name =
-        isolate_->factory()->InternalizeUtf8String(
-            wasm::AsmWasmBuilder::foreign_init_name);
     Handle<String> single_function_name =
-        isolate_->factory()->InternalizeUtf8String(
-            wasm::AsmWasmBuilder::single_function_name);
+        isolate_->factory()->InternalizeUtf8String(AsmJs::kSingleFunctionName);
 
     PropertyDescriptor desc;
     desc.set_writable(module_->is_asm_js());
@@ -1893,8 +1889,7 @@ class InstantiationHelper {
               .ToHandleChecked();
       Handle<JSObject> export_to;
       if (module_->is_asm_js() && exp.kind == kExternalFunction &&
-          (String::Equals(name, foreign_init_name) ||
-           String::Equals(name, single_function_name))) {
+          String::Equals(name, single_function_name)) {
         export_to = instance;
       } else {
         export_to = exports_object;

test/cctest/BUILD.gn

@@ -13,7 +13,6 @@ v8_executable("cctest") {
     ### gcmole(all) ###
     "../common/wasm/test-signatures.h",
     "../common/wasm/wasm-macro-gen.h",
-    "asmjs/test-asm-typer.cc",
     "ast-types-fuzz.h",
     "cctest.cc",
     "cctest.h",

test/cctest/asmjs/OWNERS

-# Keep in sync with src/asmjs/OWNERS.
-
-set noparent
-
-ahaas@chromium.org
-bradnelson@chromium.org
-clemensh@chromium.org
-mtrofin@chromium.org
-rossberg@chromium.org
-titzer@chromium.org

test/cctest/cctest.gyp

@@ -32,7 +32,6 @@
     'v8_code': 1,
     'generated_file': '<(SHARED_INTERMEDIATE_DIR)/resources.cc',
     'cctest_sources': [  ### gcmole(all) ###
-      'asmjs/test-asm-typer.cc',
       'ast-types-fuzz.h',
       'compiler/c-signature.h',
       'compiler/call-tester.h',