Fix missing SmiTag in failure path of r27614

BUG=chromium:469768
LOG=n

Review URL: https://codereview.chromium.org/1061263003

Cr-Commit-Position: refs/heads/master@{#27627}

diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc
index e14570c..f97b99f 100644 (file)
--- a/src/arm/builtins-arm.cc
+++ b/src/arm/builtins-arm.cc
@@ -856,6 +856,9 @@ static void Generate_CheckStackOverflow(MacroAssembler* masm,
 
   // Out of stack space.
   __ ldr(r1, MemOperand(fp, calleeOffset));
+  if (argc_is_tagged == kArgcIsUntaggedInt) {
+    __ SmiTag(argc);
+  }
   __ Push(r1, argc);
   __ InvokeBuiltin(Builtins::STACK_OVERFLOW, CALL_FUNCTION);
 

diff --git a/src/arm64/builtins-arm64.cc b/src/arm64/builtins-arm64.cc
index 97ccf19..9a0c4a7 100644 (file)
--- a/src/arm64/builtins-arm64.cc
+++ b/src/arm64/builtins-arm64.cc
@@ -828,6 +828,9 @@ static void Generate_CheckStackOverflow(MacroAssembler* masm,
   __ B(gt, &enough_stack_space);
   // There is not enough stack space, so use a builtin to throw an appropriate
   // error.
+  if (argc_is_tagged == kArgcIsUntaggedInt) {
+    __ SmiTag(argc);
+  }
   __ Push(function, argc);
   __ InvokeBuiltin(Builtins::STACK_OVERFLOW, CALL_FUNCTION);
   // We should never return from the APPLY_OVERFLOW builtin.

diff --git a/src/ia32/builtins-ia32.cc b/src/ia32/builtins-ia32.cc
index b4966ba..c778d5a 100644 (file)
--- a/src/ia32/builtins-ia32.cc
+++ b/src/ia32/builtins-ia32.cc
@@ -605,6 +605,9 @@ static void Generate_CheckStackOverflow(MacroAssembler* masm,
 
   // Out of stack space.
   __ push(Operand(ebp, calleeOffset));  // push this
+  if (eax_is_tagged == kEaxIsUntaggedInt) {
+    __ SmiTag(eax);
+  }
   __ push(eax);
   __ InvokeBuiltin(Builtins::STACK_OVERFLOW, CALL_FUNCTION);
 

diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc
index dbf2dc4..7c670d4 100644 (file)
--- a/src/x64/builtins-x64.cc
+++ b/src/x64/builtins-x64.cc
@@ -606,6 +606,9 @@ static void Generate_CheckStackOverflow(MacroAssembler* masm,
 
   // Out of stack space.
   __ Push(Operand(rbp, calleeOffset));
+  if (rax_is_tagged == kRaxIsUntaggedInt) {
+    __ Integer32ToSmi(rax, rax);
+  }
   __ Push(rax);
   __ InvokeBuiltin(Builtins::STACK_OVERFLOW, CALL_FUNCTION);