Hooking up asm-wasm conversion.

src/builtins.h

Index: src/builtins.h
diff --git a/src/builtins.h b/src/builtins.h
index f99e05aa2a1bd2874ee9640e5da4ef740341e196..0db1a15c113ae7906b60cdd95a5d5a44e7dd03f9 100644
--- a/src/builtins.h
+++ b/src/builtins.h
@@ -177,8 +177,16 @@ class CodeStubAssembler;
   V(RestrictedFunctionPropertiesThrower)  \
   V(RestrictedStrictArgumentsPropertiesThrower)
 
+// TODO(bradnelson): Implement for all arches and drop.
+#if defined(V8_TARGET_ARCH_X64)

[Michael Starzinger, 2016/06/29 08:29:23]

We usually implement new features on all architectures in one go. Lets drop
these #ifdef guards.

[bradn, 2016/06/30 07:59:36]

Done.

+#define BUILTIN_LIST_A_PARTIAL(V) V(InstantiateAsmJs, BUILTIN, kNoExtraICState)
+#else
+#define BUILTIN_LIST_A_PARTIAL(V)
+#endif
+
 // Define list of builtins implemented in assembly.
 #define BUILTIN_LIST_A(V)                                                    \
+  BUILTIN_LIST_A_PARTIAL(V)                                                  \
   V(AllocateInNewSpace, BUILTIN, kNoExtraICState)                            \
   V(AllocateInOldSpace, BUILTIN, kNoExtraICState)                            \
                                                                              \
@@ -397,7 +405,7 @@ class Builtins {
 #define DEF_ENUM_C(name) c_##name,
     BUILTIN_LIST_C(DEF_ENUM_C)
 #undef DEF_ENUM_C
-    cfunction_count
+        cfunction_count
   };
 
 #define DECLARE_BUILTIN_ACCESSOR_C(name) Handle<Code> name();
@@ -470,6 +478,10 @@ class Builtins {
   static void Generate_AllocateInOldSpace(MacroAssembler* masm);
   static void Generate_ConstructedNonConstructable(MacroAssembler* masm);
   static void Generate_CompileLazy(MacroAssembler* masm);
+#if defined(V8_TARGET_ARCH_X64)

[Michael Starzinger, 2016/06/29 08:29:23]

Likewise.

[bradn, 2016/06/30 07:59:36]

Done.

+  // TODO(bradnelson): Implement on all arches.
+  static void Generate_InstantiateAsmJs(MacroAssembler* masm);

[Michael Starzinger, 2016/06/29 08:29:23]

nit: Can we move this declaration up one line? Then it is not hiding in the
middle of the compilation stub generators for the other three tiers

[bradn, 2016/06/30 07:59:36]

Done.

+#endif
   static void Generate_CompileBaseline(MacroAssembler* masm);
   static void Generate_InOptimizationQueue(MacroAssembler* masm);
   static void Generate_CompileOptimized(MacroAssembler* masm);