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

Unified Diff: runtime/vm/compiler.cc

Issue 1192103004: VM: New calling convention for generated code. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: preserve CODE_REG in ARM Integer_shl intrinsic. Created 5 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/compiler.cc
diff --git a/runtime/vm/compiler.cc b/runtime/vm/compiler.cc
index 87ca181198a8e4569450492c795f6c5a8a804080..4c61233690d2ab0dec2668ac72e54fd0a1bd0ec9 100644
--- a/runtime/vm/compiler.cc
+++ b/runtime/vm/compiler.cc
@@ -758,7 +758,9 @@ static bool CompileParsedFunctionHelper(CompilationPipeline* pipeline,
if (optimized) {
// We may not have previous code if 'always_optimize' is set.
if ((osr_id == Isolate::kNoDeoptId) && function.HasCode()) {
- CodePatcher::PatchEntry(Code::Handle(function.CurrentCode()));
+ CodePatcher::PatchEntry(
+ Code::Handle(function.CurrentCode()),
+ Code::Handle(StubCode::FixCallersTarget_entry()->code()));
if (FLAG_trace_compiler || FLAG_trace_patching) {
if (FLAG_trace_compiler) {
THR_Print(" ");
@@ -790,7 +792,6 @@ static bool CompileParsedFunctionHelper(CompilationPipeline* pipeline,
}
function.set_unoptimized_code(code);
function.AttachCode(code);
- ASSERT(CodePatcher::CodeIsPatchable(code));
}
if (parsed_function->HasDeferredPrefixes()) {
ASSERT(!FLAG_load_deferred_eagerly);

Powered by Google App Engine
This is Rietveld 408576698