Reviewers: jochen, m.m.capewell,

Message:
PTAL


https://codereview.chromium.org/153893009/diff/1/src/a64/code-stubs-a64.cc
File src/a64/code-stubs-a64.cc (right):

https://codereview.chromium.org/153893009/diff/1/src/a64/code-stubs-a64.cc#newcode3277
src/a64/code-stubs-a64.cc:3277: __ JumpIfNotObjectType(function, x10,
type, JS_FUNCTION_TYPE, &slow);
The "type" register is read below in the slow case.

https://codereview.chromium.org/153893009/diff/1/src/a64/macro-assembler-a64.cc
File src/a64/macro-assembler-a64.cc (right):

https://codereview.chromium.org/153893009/diff/1/src/a64/macro-assembler-a64.cc#newcode1341
src/a64/macro-assembler-a64.cc:1341: ASSERT(function_address.is(x1) ||
function_address.is(x2));
This is from https://codereview.chromium.org/159003003/ (which I closed
prematurely)

Description:
A64: Set function correctly type in CallFunctionStub.

TEST=mjsunit/harmony/proxies-example-membrane

Please review this at https://codereview.chromium.org/153893009/

SVN Base: https://v8.googlecode.com/svn/branches/experimental/a64

Affected files (+2, -4 lines):
  M src/a64/code-stubs-a64.cc
  M src/a64/macro-assembler-a64.cc


Index: src/a64/code-stubs-a64.cc
diff --git a/src/a64/code-stubs-a64.cc b/src/a64/code-stubs-a64.cc
index 1faa17e20878b740d589fae175098b1aa782aca0..cf9d9df563e62ffc5924e79f8ab5c39a9ee8f7e8 100644
--- a/src/a64/code-stubs-a64.cc
+++ b/src/a64/code-stubs-a64.cc
@@ -3274,7 +3274,7 @@ void CallFunctionStub::Generate(MacroAssembler* masm) {
     __ JumpIfSmi(function, &non_function);

     // Goto slow case if we do not have a function.
-    __ JumpIfNotObjectType(function, x10, x10, JS_FUNCTION_TYPE, &slow);
+    __ JumpIfNotObjectType(function, x10, type, JS_FUNCTION_TYPE, &slow);

     if (RecordCallTarget()) {
       GenerateRecordCallTarget(masm);
Index: src/a64/macro-assembler-a64.cc
diff --git a/src/a64/macro-assembler-a64.cc b/src/a64/macro-assembler-a64.cc
index 71be858279fd2e7a627f77553ba0f5d87a0a7055..c55a59fbb8d708ce3f3f7dfa70da5e9589e7c28a 100644
--- a/src/a64/macro-assembler-a64.cc
+++ b/src/a64/macro-assembler-a64.cc
@@ -1338,9 +1338,7 @@ void MacroAssembler::CallApiFunctionAndReturn(
       ExternalReference::handle_scope_level_address(isolate()),
       next_address);

-  ASSERT(!AreAliased(function_address, x1, x2));
- // TODO(all): Why do we care about aliasing x2? (This function uses x1 as a
-  // scratch regiser.)
+  ASSERT(function_address.is(x1) || function_address.is(x2));

   Label profiler_disabled;
   Label end_profiler_check;


--
--
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.

Reply via email to