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

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 38 matching lines @@
     compiled_module = result.val->CompileFunctions(isolate, thrower);
   }
 
   if (result.val) delete result.val;
   return compiled_module;
 }
 
 Handle<i::Object> StdlibMathMember(i::Isolate* isolate,
                                    Handle<JSReceiver> stdlib,
                                    Handle<Name> name) {
+  if (stdlib.is_null()) {
+    return Handle<i::Object>();
+  }
   Handle<i::Name> math_name(
       isolate->factory()->InternalizeOneByteString(STATIC_CHAR_VECTOR("Math")));
   MaybeHandle<i::Object> maybe_math = i::Object::GetProperty(stdlib, math_name);
   if (maybe_math.is_null()) {
     return Handle<i::Object>();
   }
   Handle<i::Object> math = maybe_math.ToHandleChecked();
   if (!math->IsJSReceiver()) {
     return Handle<i::Object>();
   }
@@ skipping 13 matching lines @@
   switch (member_kind) {
     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: {
+      if (stdlib.is_null()) {
+        return false;
+      }
       Handle<i::Name> name(isolate->factory()->InternalizeOneByteString(
           STATIC_CHAR_VECTOR("Infinity")));
       MaybeHandle<i::Object> maybe_value = i::Object::GetProperty(stdlib, name);
       if (maybe_value.is_null()) {
         return false;
       }
       Handle<i::Object> value = maybe_value.ToHandleChecked();
       return value->IsNumber() && std::isinf(value->Number());
     }
     case wasm::AsmTyper::StandardMember::kNaN: {
+      if (stdlib.is_null()) {
+        return false;
+      }
       Handle<i::Name> name(isolate->factory()->InternalizeOneByteString(
           STATIC_CHAR_VECTOR("NaN")));
       MaybeHandle<i::Object> maybe_value = i::Object::GetProperty(stdlib, name);
       if (maybe_value.is_null()) {
         return false;
       }
       Handle<i::Object> value = maybe_value.ToHandleChecked();
       return value->IsNaN();
     }
 #define STDLIB_MATH_FUNC(CamelName, fname)                             \
@@ skipping 138 matching lines @@
           continue;
         }
       }
     }
     foreign_args_array[j] = undefined;
   }
   i::MaybeHandle<i::Object> retval = i::Execution::Call(
       isolate, init, undefined, foreign_globals->length(), foreign_args_array);
   delete[] foreign_args_array;
 
-  if (retval.is_null()) {
-    thrower.Error(
-        "WASM.instantiateModuleFromAsm(): foreign init function failed");
-    return MaybeHandle<Object>();
-  }
+  DCHECK(!retval.is_null());
+
   return maybe_module_object;
 }
 
 }  // namespace internal
 }  // namespace v8