Reviewers: Toon Verwaest,
Message:
Committed patchset #1 manually as r18850 (tree was closed).
Description:
fix windows after r18847
[email protected]
BUG=
Committed: https://code.google.com/p/v8/source/detail?r=18850
Please review this at https://codereview.chromium.org/145353005/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+8, -3 lines):
M src/x64/code-stubs-x64.cc
M src/x64/macro-assembler-x64.cc
M src/x64/stub-cache-x64.cc
Index: src/x64/code-stubs-x64.cc
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
index
74a265d922bc1d881189fd38bc1cd3ec78a28a0b..a64cab86cf809d34f51a6b755c0e56d59aed36f3
100644
--- a/src/x64/code-stubs-x64.cc
+++ b/src/x64/code-stubs-x64.cc
@@ -5312,7 +5312,7 @@ void CallApiFunctionStub::Generate(MacroAssembler*
masm) {
Register callback_arg = rsi;
#endif
- // It's okay if callback_arg == api_function_address
+ // It's okay if api_function_address == callback_arg
// but not arguments_arg
ASSERT(!api_function_address.is(arguments_arg));
Index: src/x64/macro-assembler-x64.cc
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
index
94b3f403067a9e4cf3861e48c2a94586b5145f08..c2e6ba0fd2e705af50479f7c5f7f1c26e2393db6
100644
--- a/src/x64/macro-assembler-x64.cc
+++ b/src/x64/macro-assembler-x64.cc
@@ -697,7 +697,7 @@ void MacroAssembler::CallApiFunctionAndReturn(
ExternalReference scheduled_exception_address =
ExternalReference::scheduled_exception_address(isolate());
- ASSERT(rdx.is(function_address));
+ ASSERT(rdx.is(function_address) || r8.is(function_address));
// Allocate HandleScope in callee-save registers.
Register prev_next_address_reg = r14;
Register prev_limit_reg = rbx;
Index: src/x64/stub-cache-x64.cc
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
index
fce9b92c94ad66ac74736ebef279e0d0f32e7183..a84eb1f63ba12f5cef3f2ee10c1a4cebab28a363
100644
--- a/src/x64/stub-cache-x64.cc
+++ b/src/x64/stub-cache-x64.cc
@@ -1252,7 +1252,12 @@ void LoadStubCompiler::GenerateLoadCallback(
Address thunk_address = FUNCTION_ADDR(&InvokeAccessorGetterCallback);
- Register api_function_address = rdx;
+ Register api_function_address = r8;
+ // It's okay if api_function_address == getter_arg
+ // but not accessor_info_arg or name_arg
+ ASSERT(!api_function_address.is(accessor_info_arg) &&
+ !api_function_address.is(name_arg));
+
__ Move(api_function_address, getter_address,
RelocInfo::EXTERNAL_REFERENCE);
// The name handler is counted as an argument.
--
--
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.
