Reviewers: Paul Lind, kisg, kilvadyb, dusmil, danno, dcarney,
Message:
PTAL.
Description:
ARM: build fix for r19380
Port r19381 (5476e11b)
BUG=
Please review this at https://codereview.chromium.org/167523003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+6, -2 lines):
M src/arm/code-stubs-arm.cc
Index: src/arm/code-stubs-arm.cc
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
index
10818ce7026e3cb3fe19371cb10290d249932f5d..c9b479eaa19e71678dc4cab049d7772269323b77
100644
--- 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,
--
--
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.
