[wasm] asm.js - Remove Wasm.instantiateModuleFromAsm, use asm.js directly.

src/asmjs/asm-typer.cc

 // Copyright 2016 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-typer.h"
 
 #include <algorithm>
 #include <limits>
 #include <memory>
 #include <string>
@@ skipping 308 matching lines @@
   if (obj_info->IsFFI()) {
     // For FFI we can't validate import->key, so assume this is OK.
     return obj_info;
   }
 
   std::unique_ptr<char[]> aname = key->AsPropertyName()->ToCString();
   ObjectTypeMap::iterator i = stdlib->find(std::string(aname.get()));
   if (i == stdlib->end()) {
     return nullptr;
   }
+  stdlib_uses_.insert(i->second->standard_member());
   return i->second;
 }
 
 AsmTyper::VariableInfo* AsmTyper::Lookup(Variable* variable) {
   ZoneHashMap* scope = in_function_ ? &local_scope_ : &global_scope_;
   ZoneHashMap::Entry* entry =
       scope->Lookup(variable, ComputePointerHash(variable));
   if (entry == nullptr && in_function_) {
     entry = global_scope_.Lookup(variable, ComputePointerHash(variable));
   }
@@ skipping 83 matching lines @@
 
   return AsmType::None();
 }
 
 AsmTyper::StandardMember AsmTyper::VariableAsStandardMember(Variable* var) {
   auto* var_info = Lookup(var);
   if (var_info == nullptr) {
     return kNone;
   }
   StandardMember member = var_info->standard_member();
-  stdlib_uses_.insert(member);
   return member;
 }
 
 bool AsmTyper::Validate() {
   if (!AsmType::None()->IsExactly(ValidateModule(root_))) {
     return true;
   }
   return false;
 }
 
@@ skipping 147 matching lines @@
         zone_, kModuleParamInfo[ii].standard_member);
 
     if (!AddGlobal(param, param_info)) {
       FAIL(fun, "Redeclared identifier in module parameter.");
     }
   }
 
   ZoneVector<Assignment*> function_pointer_tables(zone_);
   FlattenedStatements iter(zone_, fun->body());
   auto* use_asm_directive = iter.Next();
-  if (use_asm_directive == nullptr || !IsUseAsmDirective(use_asm_directive)) {
+  if (use_asm_directive == nullptr) {
+    FAIL(fun, "Missing \"use asm\".");
+  }
+  // Check for extra assignment inserted by the parser when in this form:
+  // (function Module(a, b, c) {... })
+  ExpressionStatement* estatement = use_asm_directive->AsExpressionStatement();
+  if (estatement != nullptr) {
+    Assignment* assignment = estatement->expression()->AsAssignment();
+    if (assignment != nullptr && assignment->target()->IsVariableProxy() &&
+        assignment->target()->AsVariableProxy()->var()->mode() ==
+            CONST_LEGACY) {
+      use_asm_directive = iter.Next();
+    }
+  }
+  if (!IsUseAsmDirective(use_asm_directive)) {
     FAIL(fun, "Missing \"use asm\".");
   }
   source_layout.AddUseAsm(*use_asm_directive);
   ReturnStatement* module_return = nullptr;
 
   // *VIOLATION* The spec states that globals should be followed by function
   // declarations, which should be followed by function pointer tables, followed
   // by the module export (return) statement. Our AST might be rearraged by the
   // parser, so we can't rely on it being in source code order.
   while (Statement* current = iter.Next()) {
@@ skipping 2135 matching lines @@
     return true;
   }
 
   *error_message = typer.error_message();
   return false;
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8