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

Unified Diff: src/crankshaft/mips64/lithium-codegen-mips64.cc

Issue 1406113007: Merge GlobalObject with JSGlobalObject. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 1 month 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/crankshaft/mips/lithium-codegen-mips.cc ('k') | src/crankshaft/ppc/lithium-codegen-ppc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/crankshaft/mips64/lithium-codegen-mips64.cc
diff --git a/src/crankshaft/mips64/lithium-codegen-mips64.cc b/src/crankshaft/mips64/lithium-codegen-mips64.cc
index f0ead54a962725e615c08e3dfc622b41b6041054..89fb9247f05d93840b06fc666c6fc51b4908b9bc 100644
--- a/src/crankshaft/mips64/lithium-codegen-mips64.cc
+++ b/src/crankshaft/mips64/lithium-codegen-mips64.cc
@@ -125,7 +125,7 @@ bool LCodeGen::GeneratePrologue() {
__ Branch(&ok, ne, a2, Operand(at));
__ ld(a2, GlobalObjectOperand());
- __ ld(a2, FieldMemOperand(a2, GlobalObject::kGlobalProxyOffset));
+ __ ld(a2, FieldMemOperand(a2, JSGlobalObject::kGlobalProxyOffset));
__ sd(a2, MemOperand(sp, receiver_offset));
@@ -3430,8 +3430,7 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) {
__ ld(result, FieldMemOperand(function, JSFunction::kContextOffset));
__ ld(result,
ContextOperand(result, Context::GLOBAL_OBJECT_INDEX));
- __ ld(result,
- FieldMemOperand(result, GlobalObject::kGlobalProxyOffset));
+ __ ld(result, FieldMemOperand(result, JSGlobalObject::kGlobalProxyOffset));
if (result.is(receiver)) {
__ bind(&result_in_receiver);
« no previous file with comments | « src/crankshaft/mips/lithium-codegen-mips.cc ('k') | src/crankshaft/ppc/lithium-codegen-ppc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698