ARM: build fix for r19380.

This commit fixes the debug build on Linux with gcc 4.6.3 and 4.7.2.

Port r19381 (5476e11b)

BUG=
R=dcarney@chromium.org, plind44@gmail.com

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@19398 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/a64/code-stubs-a64.cc b/src/a64/code-stubs-a64.cc
index 40aa0b6..50b8bb2 100644 (file)
--- a/src/a64/code-stubs-a64.cc
+++ b/src/a64/code-stubs-a64.cc
@@ -5655,8 +5655,12 @@ void CallApiFunctionStub::Generate(MacroAssembler* masm) {
   MemOperand context_restore_operand(
       fp, (2 + FCA::kContextSaveIndex) * kPointerSize);
   // Stores return the first js argument
-  int return_value_offset =
-      2 + (is_store ? FCA::kArgsLength : FCA::kReturnValueOffset);
+  int return_value_offset = 0;
+  if (is_store) {
+    return_value_offset = 2 + FCA::kArgsLength;
+  } else {
+    return_value_offset = 2 + FCA::kReturnValueOffset;
+  }
   MemOperand return_value_operand(fp, return_value_offset * kPointerSize);
 
   const int spill_offset = 1 + kApiStackSpace;

diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
index 10818ce..c9b479e 100644 (file)
--- a/src/arm/code-stubs-arm.cc
+++ b/src/arm/code-stubs-arm.cc
@@ -5527,8 +5527,12 @@ void CallApiFunctionStub::Generate(MacroAssembler* masm) {
   MemOperand context_restore_operand(
       fp, (2 + FCA::kContextSaveIndex) * kPointerSize);
   // Stores return the first js argument
-  int return_value_offset =
-      2 + (is_store ? FCA::kArgsLength : FCA::kReturnValueOffset);
+  int return_value_offset = 0;
+  if (is_store) {
+    return_value_offset = 2 + FCA::kArgsLength;
+  } else {
+    return_value_offset = 2 + FCA::kReturnValueOffset;
+  }
   MemOperand return_value_operand(fp, return_value_offset * kPointerSize);
 
   __ CallApiFunctionAndReturn(api_function_address,