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
This commit is contained in:
parent
4c7ed144e1
commit
43a836f70a
@ -5655,8 +5655,12 @@ void CallApiFunctionStub::Generate(MacroAssembler* masm) {
|
|||||||
MemOperand context_restore_operand(
|
MemOperand context_restore_operand(
|
||||||
fp, (2 + FCA::kContextSaveIndex) * kPointerSize);
|
fp, (2 + FCA::kContextSaveIndex) * kPointerSize);
|
||||||
// Stores return the first js argument
|
// Stores return the first js argument
|
||||||
int return_value_offset =
|
int return_value_offset = 0;
|
||||||
2 + (is_store ? FCA::kArgsLength : FCA::kReturnValueOffset);
|
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);
|
MemOperand return_value_operand(fp, return_value_offset * kPointerSize);
|
||||||
|
|
||||||
const int spill_offset = 1 + kApiStackSpace;
|
const int spill_offset = 1 + kApiStackSpace;
|
||||||
|
@ -5527,8 +5527,12 @@ void CallApiFunctionStub::Generate(MacroAssembler* masm) {
|
|||||||
MemOperand context_restore_operand(
|
MemOperand context_restore_operand(
|
||||||
fp, (2 + FCA::kContextSaveIndex) * kPointerSize);
|
fp, (2 + FCA::kContextSaveIndex) * kPointerSize);
|
||||||
// Stores return the first js argument
|
// Stores return the first js argument
|
||||||
int return_value_offset =
|
int return_value_offset = 0;
|
||||||
2 + (is_store ? FCA::kArgsLength : FCA::kReturnValueOffset);
|
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);
|
MemOperand return_value_operand(fp, return_value_offset * kPointerSize);
|
||||||
|
|
||||||
__ CallApiFunctionAndReturn(api_function_address,
|
__ CallApiFunctionAndReturn(api_function_address,
|
||||||
|
Loading…
Reference in New Issue
Block a user