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

Unified Diff: runtime/vm/stub_code.cc

Issue 574843002: Fix x64 patching of asllocation stub: the pool pointer must be set-up before patching jump is execu… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 3 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 | « runtime/vm/stub_code.h ('k') | runtime/vm/stub_code_arm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stub_code.cc
===================================================================
--- runtime/vm/stub_code.cc (revision 40325)
+++ runtime/vm/stub_code.cc (working copy)
@@ -118,8 +118,10 @@
if (stub.IsNull()) {
Assembler assembler;
const char* name = cls.ToCString();
- uword patch_code_offset =
- StubCode::GenerateAllocationStubForClass(&assembler, cls);
+ uword patch_code_offset = 0;
+ uword entry_patch_offset = 0;
+ StubCode::GenerateAllocationStubForClass(
+ &assembler, cls, &entry_patch_offset, &patch_code_offset);
stub ^= Code::FinalizeCode(name, &assembler);
stub.set_owner(cls);
cls.set_allocation_stub(stub);
@@ -129,7 +131,7 @@
stub.Disassemble(&formatter);
OS::Print("}\n");
}
- stub.set_entry_patch_pc_offset(0);
+ stub.set_entry_patch_pc_offset(entry_patch_offset);
stub.set_patch_code_pc_offset(patch_code_offset);
}
return stub.raw();
« no previous file with comments | « runtime/vm/stub_code.h ('k') | runtime/vm/stub_code_arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698