Revision: 19240
Author:   [email protected]
Date:     Mon Feb 10 19:32:51 2014 UTC
Log:      A64: Set function type correctly in CallFunctionStub.

TEST=mjsunit/harmony/proxies-example-membrane
[email protected]

Review URL: https://codereview.chromium.org/153893009
http://code.google.com/p/v8/source/detail?r=19240

Modified:
 /branches/experimental/a64/src/a64/code-stubs-a64.cc
 /branches/experimental/a64/src/a64/macro-assembler-a64.cc

=======================================
--- /branches/experimental/a64/src/a64/code-stubs-a64.cc Mon Feb 10 17:52:31 2014 UTC +++ /branches/experimental/a64/src/a64/code-stubs-a64.cc Mon Feb 10 19:32:51 2014 UTC
@@ -3274,7 +3274,7 @@
     __ 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);
=======================================
--- /branches/experimental/a64/src/a64/macro-assembler-a64.cc Mon Feb 10 17:52:31 2014 UTC +++ /branches/experimental/a64/src/a64/macro-assembler-a64.cc Mon Feb 10 19:32:51 2014 UTC
@@ -1338,9 +1338,7 @@
       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