[wasm] Support validation of asm.js modules with != 3 args.

src/builtins/arm64/builtins-arm64.cc

Index: src/builtins/arm64/builtins-arm64.cc
diff --git a/src/builtins/arm64/builtins-arm64.cc b/src/builtins/arm64/builtins-arm64.cc
index b4a728a9da3196e70baa786a2745156ab98d7119..97434a866f9a6e31a64e4fb49cdd58b1a2e73281 100644
--- a/src/builtins/arm64/builtins-arm64.cc
+++ b/src/builtins/arm64/builtins-arm64.cc
@@ -1446,23 +1446,69 @@ void Builtins::Generate_InstantiateAsmJs(MacroAssembler* masm) {
   Label failed;
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
+    // Preserve argument count for later compare.
+    __ Move(x4, x0);
     // Push a copy of the target function and the new target.
     __ SmiTag(x0);
     // Push another copy as a parameter to the runtime call.
     __ Push(x0, x1, x3, x1);
 
     // Copy arguments from caller (stdlib, foreign, heap).
-    for (int i = 2; i >= 0; --i) {
-      __ ldr(x4, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
-                                    i * kPointerSize));
-      __ push(x4);
-    }
+    Label args_done;
+    __ cmp(x4, Operand(0));
+    __ B(eq, &args_done);
+
+    Label args2;
+    __ cmp(x4, Operand(1));
+    __ B(ne, &args2);
+    __ ldr(x5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                  0 * kPointerSize));
+    __ push(x5);
+    __ jmp(&args_done);
+
+    __ bind(&args2);
+    Label args3;
+    __ cmp(x4, Operand(2));
+    __ B(ne, &args3);
+    __ ldr(x5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                  1 * kPointerSize));
+    __ push(x5);
+    __ ldr(x5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                  0 * kPointerSize));
+    __ push(x5);
+    __ jmp(&args_done);
+
+    __ bind(&args3);
+    __ ldr(x5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                  2 * kPointerSize));
+    __ push(x5);
+    __ ldr(x5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                  1 * kPointerSize));
+    __ push(x5);
+    __ ldr(x5, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                  0 * kPointerSize));
+    __ push(x5);
+    __ bind(&args_done);
+
+    // Increment and restore argument count to call runtime method
+    // with function as extra argument.
+    __ add(x4, x4, Operand(1));
+    __ Move(x0, x4);
     // Call runtime, on success unwind frame, and parent frame.
-    __ CallRuntime(Runtime::kInstantiateAsmJs, 4);
+    __ CallRuntime(Runtime::kInstantiateAsmJs, -1);
     // A smi 0 is returned on failure, an object on success.
     __ JumpIfSmi(x0, &failed);
+
+    __ pop(x4);
+    __ pop(x4);
+    __ pop(x4);
+    __ SmiUntag(x4);
     scope.GenerateLeaveFrame();
-    __ Drop(4);
+
+    __ pop(x5);
+    __ add(x4, x4, Operand(1));
+    __ add(jssp, jssp, Operand(x4, LSL, kPointerSizeLog2));
+    __ push(x5);
     __ Ret();
 
     __ bind(&failed);
@@ -1471,7 +1517,7 @@ void Builtins::Generate_InstantiateAsmJs(MacroAssembler* masm) {
     __ SmiUntag(x0);
   }
   // On failure, tail call back to regular js.
-  GenerateTailCallToReturnedCode(masm, Runtime::kCompileLazy);
+  GenerateTailCallToReturnedCode(masm, Runtime::kCompileBaseline);
 }
 
 static void GenerateMakeCodeYoungAgainCommon(MacroAssembler* masm) {