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

Unified Diff: runtime/vm/stub_code_ia32.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
Index: runtime/vm/stub_code_ia32.cc
===================================================================
--- runtime/vm/stub_code_ia32.cc (revision 40325)
+++ runtime/vm/stub_code_ia32.cc (working copy)
@@ -1095,8 +1095,10 @@
// Uses EAX, EBX, ECX, EDX, EDI as temporary registers.
// Returns patch_code_pc offset where patching code for disabling the stub
// has been generated (similar to regularly generated Dart code).
-uword StubCode::GenerateAllocationStubForClass(Assembler* assembler,
- const Class& cls) {
+void StubCode::GenerateAllocationStubForClass(
+ Assembler* assembler, const Class& cls,
+ uword* entry_patch_offset, uword* patch_code_pc_offset) {
+ *entry_patch_offset = assembler->CodeSize();
const intptr_t kObjectTypeArgumentsOffset = 1 * kWordSize;
const Immediate& raw_null =
Immediate(reinterpret_cast<intptr_t>(Object::null()));
@@ -1211,10 +1213,9 @@
__ ret();
// Emit function patching code. This will be swapped with the first 5 bytes
// at entry point.
- uword patch_code_pc_offset = assembler->CodeSize();
+ *patch_code_pc_offset = assembler->CodeSize();
StubCode* stub_code = Isolate::Current()->stub_code();
__ jmp(&stub_code->FixAllocationStubTargetLabel());
- return patch_code_pc_offset;
}

Powered by Google App Engine
This is Rietveld 408576698