Revision: 19398
Author: [email protected]
Date: Mon Feb 17 08:10:02 2014 UTC
Log: 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=
[email protected], [email protected]
Review URL: https://codereview.chromium.org/167523003
http://code.google.com/p/v8/source/detail?r=19398
Modified:
/branches/bleeding_edge/src/a64/code-stubs-a64.cc
/branches/bleeding_edge/src/arm/code-stubs-arm.cc
=======================================
--- /branches/bleeding_edge/src/a64/code-stubs-a64.cc Fri Feb 14 14:13:06
2014 UTC
+++ /branches/bleeding_edge/src/a64/code-stubs-a64.cc Mon Feb 17 08:10:02
2014 UTC
@@ -5655,8 +5655,12 @@
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;
=======================================
--- /branches/bleeding_edge/src/arm/code-stubs-arm.cc Fri Feb 14 14:13:06
2014 UTC
+++ /branches/bleeding_edge/src/arm/code-stubs-arm.cc Mon Feb 17 08:10:02
2014 UTC
@@ -5527,8 +5527,12 @@
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,
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
