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

src/builtins/s390/builtins-s390.cc

Index: src/builtins/s390/builtins-s390.cc
diff --git a/src/builtins/s390/builtins-s390.cc b/src/builtins/s390/builtins-s390.cc
index 8542cc4699291a1333c9205c8e5f1103bea72bcd..6653586773e4c698dafc98e8e5c9e631f26a6fab 100644
--- a/src/builtins/s390/builtins-s390.cc
+++ b/src/builtins/s390/builtins-s390.cc
@@ -1465,23 +1465,71 @@ void Builtins::Generate_InstantiateAsmJs(MacroAssembler* masm) {
   Label failed;
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
+    // Preserve argument count for later compare.
+    __ Move(r4, r2);
     // Push a copy of the target function and the new target.
     __ SmiTag(r2);
     // Push another copy as a parameter to the runtime call.
     __ Push(r2, r3, r5, r3);
 
     // Copy arguments from caller (stdlib, foreign, heap).
-    for (int i = 2; i >= 0; --i) {
-      __ LoadP(r4, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
-                                      i * kPointerSize));
-      __ push(r4);
-    }
+    Label args_done;
+    __ CmpP(r4, Operand(0));
+    __ b(eq, &args_done);
+
+    Label args2;
+    __ CmpP(r4, Operand(1));
+    __ b(ne, &args2);
+    __ LoadP(r9, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                    0 * kPointerSize));
+    __ push(r9);
+    __ jmp(&args_done);
+
+    __ bind(&args2);
+    Label args3;
+    __ CmpP(r4, Operand(2));
+    __ b(ne, &args3);
+    __ LoadP(r9, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                    1 * kPointerSize));
+    __ push(r9);
+    __ LoadP(r9, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                    0 * kPointerSize));
+    __ push(r9);
+    __ jmp(&args_done);
+
+    __ bind(&args3);
+    __ LoadP(r9, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                    2 * kPointerSize));
+    __ push(r9);
+    __ LoadP(r9, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                    1 * kPointerSize));
+    __ push(r9);
+    __ LoadP(r9, MemOperand(fp, StandardFrameConstants::kCallerSPOffset +
+                                    0 * kPointerSize));
+    __ push(r9);
+    __ bind(&args_done);
+
+    // Increment and restore argument count to call runtime method
+    // with function as extra argument.
+    __ AddP(r4, r4, Operand(1));
+    __ Move(r2, r4);
     // 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(r2, &failed);
+
+    __ pop(r4);
+    __ pop(r4);
+    __ pop(r4);
+    __ SmiUntag(r4);
     scope.GenerateLeaveFrame();
-    __ Drop(4);
+
+    __ pop(r6);
+    __ AddP(r4, r4, Operand(1));
+    __ ShiftLeftP(r4, r4, Operand(kPointerSizeLog2));
+    __ AddP(r7, sp, r4);
+    __ LoadRR(sp, r7);
+    __ push(r6);
     __ Ret();
 
     __ bind(&failed);
@@ -1490,7 +1538,7 @@ void Builtins::Generate_InstantiateAsmJs(MacroAssembler* masm) {
     __ SmiUntag(r2);
   }
   // On failure, tail call back to regular js.
-  GenerateTailCallToReturnedCode(masm, Runtime::kCompileLazy);
+  GenerateTailCallToReturnedCode(masm, Runtime::kCompileBaseline);
 }
 
 static void GenerateMakeCodeYoungAgainCommon(MacroAssembler* masm) {