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

Unified Diff: runtime/vm/code_generator.cc

Issue 12260026: Add support for object pool (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 10 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/code_generator.cc
===================================================================
--- runtime/vm/code_generator.cc (revision 18597)
+++ runtime/vm/code_generator.cc (working copy)
@@ -762,8 +762,9 @@
// Before patching verify that we are not repeatedly patching to the same
// target.
ASSERT(target_code.EntryPoint() !=
- CodePatcher::GetStaticCallTargetAt(caller_frame->pc()));
- CodePatcher::PatchStaticCallAt(caller_frame->pc(), target_code.EntryPoint());
+ CodePatcher::GetStaticCallTargetAt(caller_frame->pc(), target_code));
+ CodePatcher::PatchStaticCallAt(caller_frame->pc(), target_code,
srdjan 2013/02/15 21:24:27 Should be caller_code, below as well
regis 2013/02/15 22:51:31 Good catch!
+ target_code.EntryPoint());
caller_code.SetStaticCallTargetCodeAt(caller_frame->pc(), target_code);
if (FLAG_trace_patching) {
OS::PrintErr("PatchStaticCall: patching from %#"Px" to '%s' %#"Px"\n",
@@ -1356,7 +1357,8 @@
const Function& target_function = Function::Handle(
caller_code.GetStaticCallTargetFunctionAt(frame->pc()));
const Code& target_code = Code::Handle(target_function.CurrentCode());
- CodePatcher::PatchStaticCallAt(frame->pc(), target_code.EntryPoint());
+ CodePatcher::PatchStaticCallAt(frame->pc(), target_code,
+ target_code.EntryPoint());
caller_code.SetStaticCallTargetCodeAt(frame->pc(), target_code);
if (FLAG_trace_patching) {
OS::PrintErr("FixCallersTarget: patching from %#"Px" to '%s' %#"Px"\n",

Powered by Google App Engine
This is Rietveld 408576698