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

src/runtime/runtime-test.cc

 // Copyright 2014 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/runtime/runtime-utils.h"
 
 #include <memory>
 
 #include "src/arguments.h"
 #include "src/compiler-dispatcher/optimizing-compile-dispatcher.h"
@@ skipping 646 matching lines @@
 }
 
 
 RUNTIME_FUNCTION(Runtime_InNewSpace) {
   SealHandleScope shs(isolate);
   DCHECK(args.length() == 1);
   CONVERT_ARG_CHECKED(Object, obj, 0);
   return isolate->heap()->ToBoolean(isolate->heap()->InNewSpace(obj));
 }
 
+static bool IsAsmWasmCode(Isolate* isolate, Handle<JSFunction> function) {
+  if (!function->shared()->HasAsmWasmData()) {
+    // Doesn't have wasm data.
+    return false;
+  }
+  if (function->shared()->code() !=
+      isolate->builtins()->builtin(Builtins::kInstantiateAsmJs)) {
+    // Hasn't been compiled yet.
+    return false;
+  }
+  return true;
+}
+
 RUNTIME_FUNCTION(Runtime_IsAsmWasmCode) {
   SealHandleScope shs(isolate);
   DCHECK(args.length() == 1);
   CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
+  // TODO(mstarzinger): --always-opt should still allow asm.js->wasm,
+  // but currently does not. For now, pretend asm.js->wasm is on for
+  // this case. Be more accurate once this is corrected.
+  return isolate->heap()->ToBoolean(
+      ((FLAG_always_opt || FLAG_prepare_always_opt) && FLAG_validate_asm) ||
+      IsAsmWasmCode(isolate, function));
+}
 
-  if (!function->shared()->HasAsmWasmData()) {
-    // Doesn't have wasm data.
-    return isolate->heap()->ToBoolean(false);
-  }
-  if (function->shared()->code() !=
-      isolate->builtins()->builtin(Builtins::kInstantiateAsmJs)) {
-    // Hasn't been compiled yet.
-    return isolate->heap()->ToBoolean(false);
-  }
-  return isolate->heap()->ToBoolean(true);
+RUNTIME_FUNCTION(Runtime_IsNotAsmWasmCode) {
+  SealHandleScope shs(isolate);
+  DCHECK(args.length() == 1);
+  CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
+  return isolate->heap()->ToBoolean(!IsAsmWasmCode(isolate, function));
 }
 
 #define ELEMENTS_KIND_CHECK_RUNTIME_FUNCTION(Name)       \
   RUNTIME_FUNCTION(Runtime_Has##Name) {                  \
     CONVERT_ARG_CHECKED(JSObject, obj, 0);               \
     return isolate->heap()->ToBoolean(obj->Has##Name()); \
   }
 
 ELEMENTS_KIND_CHECK_RUNTIME_FUNCTION(FastSmiElements)
 ELEMENTS_KIND_CHECK_RUNTIME_FUNCTION(FastObjectElements)
@@ skipping 59 matching lines @@
       WasmCompiledModuleSerializer::DeserializeWasmModule(isolate, &sc);
   Handle<FixedArray> compiled_module;
   if (!maybe_compiled_module.ToHandle(&compiled_module)) {
     return isolate->heap()->undefined_value();
   }
   return *wasm::CreateCompiledModuleObject(isolate, compiled_module);
 }
 
 }  // namespace internal
 }  // namespace v8