Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Unified Diff: src/x64/stub-cache-x64.cc

Issue 111613003: Load the global proxy from the context of the target function. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Also fix bug on ARM. Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/x64/lithium-codegen-x64.cc ('k') | test/cctest/test-api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/x64/stub-cache-x64.cc
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
index 950ee28e1c4f1609e03378535b1fdcf26cbbc202..3bbe1fc46702f2b31b95b2009f0bbfa546b55e87 100644
--- a/src/x64/stub-cache-x64.cc
+++ b/src/x64/stub-cache-x64.cc
@@ -2378,10 +2378,21 @@ void StubCompiler::GenerateBooleanCheck(Register object, Label* miss) {
}
-void CallStubCompiler::PatchGlobalProxy(Handle<Object> object) {
+void CallStubCompiler::PatchGlobalProxy(Handle<Object> object,
+ Handle<JSFunction> function) {
if (object->IsGlobalObject()) {
StackArgumentsAccessor args(rsp, arguments());
- __ movq(rdx, FieldOperand(rdx, GlobalObject::kGlobalReceiverOffset));
+ __ MoveHeapObject(rdx, handle(function->context()->global_proxy()));
+ __ movq(args.GetReceiverOperand(), rdx);
+ }
+}
+
+
+void CallStubCompiler::PatchGlobalProxy(Handle<Object> object,
+ Register function) {
+ if (object->IsGlobalObject()) {
+ FetchGlobalProxy(masm(), rdx, function);
+ StackArgumentsAccessor args(rsp, arguments().immediate());
__ movq(args.GetReceiverOperand(), rdx);
}
}
@@ -2475,7 +2486,7 @@ void CallStubCompiler::GenerateJumpFunction(Handle<Object> object,
GenerateFunctionCheck(function, rbx, miss);
if (!function.is(rdi)) __ movq(rdi, function);
- PatchGlobalProxy(object);
+ PatchGlobalProxy(object, function);
// Invoke the function.
__ InvokeFunction(rdi, arguments(), JUMP_FUNCTION,
@@ -2588,6 +2599,15 @@ Handle<Code> StoreStubCompiler::CompileStoreCallback(
#define __ ACCESS_MASM(masm)
+void CallStubCompiler::FetchGlobalProxy(MacroAssembler* masm,
+ Register target,
+ Register function) {
+ __ movq(target, FieldOperand(function, JSFunction::kContextOffset));
+ __ movq(target, ContextOperand(target, Context::GLOBAL_OBJECT_INDEX));
+ __ movq(target, FieldOperand(target, GlobalObject::kGlobalReceiverOffset));
+}
+
+
void StoreStubCompiler::GenerateStoreViaSetter(
MacroAssembler* masm,
Handle<JSFunction> setter) {
« no previous file with comments | « src/x64/lithium-codegen-x64.cc ('k') | test/cctest/test-api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698