Revision: 18293
Author:   [email protected]
Date:     Tue Dec 10 23:00:10 2013 UTC
Log: MIPS: Fix patching the receiver (global object -> global proxy) after the interceptor.

Port r18286 (f6277add)

Original commit message:
This is a temporary fix that will be replaced by loading the proxy from the target function.

BUG=
[email protected]

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

Modified:
 /branches/bleeding_edge/src/mips/stub-cache-mips.cc

=======================================
--- /branches/bleeding_edge/src/mips/stub-cache-mips.cc Fri Dec 6 14:14:32 2013 UTC +++ /branches/bleeding_edge/src/mips/stub-cache-mips.cc Tue Dec 10 23:00:10 2013 UTC
@@ -1007,7 +1007,7 @@
     // holder haven't changed and thus we can use cached constant function.
     if (*interceptor_holder != lookup->holder()) {
       stub_compiler_->CheckPrototypes(
-          IC::CurrentTypeOf(interceptor_holder, masm->isolate()), receiver,
+          IC::CurrentTypeOf(interceptor_holder, masm->isolate()), holder,
           handle(lookup->holder()), scratch1, scratch2, scratch3,
           name, depth2, miss);
     } else {
@@ -1024,7 +1024,7 @@
           masm, optimization, arguments_.immediate(), false);
     } else {
       Handle<JSFunction> function = optimization.constant_function();
-      stub_compiler_->GenerateJumpFunctionIgnoreReceiver(function);
+      stub_compiler_->GenerateJumpFunction(object, function);
     }

     // Deferred code for fast API call case---clean preallocated space.
@@ -1083,7 +1083,7 @@
           masm, receiver, holder, name_, holder_obj,
           IC::kLoadPropertyWithInterceptorOnly);
       __ pop(name_);  // Restore the name.
-      __ pop(receiver);  // Restore the holder.
+      __ pop(holder);  // Restore the holder.
     }
// If interceptor returns no-result sentinel, call the constant function.
     __ LoadRoot(scratch, Heap::kNoInterceptorResultSentinelRootIndex);

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