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

Unified Diff: runtime/vm/flow_graph_compiler_arm64.cc

Issue 1355953002: Fix lazy deoptimization from deferred code. (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: speed up ia32 disassembler 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
« no previous file with comments | « runtime/vm/flow_graph_compiler_arm.cc ('k') | runtime/vm/flow_graph_compiler_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_compiler_arm64.cc
diff --git a/runtime/vm/flow_graph_compiler_arm64.cc b/runtime/vm/flow_graph_compiler_arm64.cc
index 0880b34641974613bc0e5025b74e1b4493a9cf95..d1e5a717ec73ad3760f32ff4ac2acf49a4360243 100644
--- a/runtime/vm/flow_graph_compiler_arm64.cc
+++ b/runtime/vm/flow_graph_compiler_arm64.cc
@@ -13,6 +13,7 @@
#include "vm/dart_entry.h"
#include "vm/deopt_instructions.h"
#include "vm/il_printer.h"
+#include "vm/instructions.h"
#include "vm/locations.h"
#include "vm/object_store.h"
#include "vm/parser.h"
@@ -1110,6 +1111,13 @@ void FlowGraphCompiler::CompileGraph() {
GenerateDeferredCode();
if (is_optimizing()) {
+ // Leave enough space for patching in case of lazy deoptimization from
+ // deferred code.
+ for (intptr_t i = 0;
+ i < CallPattern::kDeoptCallLengthInInstructions;
+ ++i) {
+ __ orr(R0, ZR, Operand(R0)); // nop
+ }
lazy_deopt_pc_offset_ = assembler()->CodeSize();
__ BranchPatchable(*StubCode::DeoptimizeLazy_entry());
}
« no previous file with comments | « runtime/vm/flow_graph_compiler_arm.cc ('k') | runtime/vm/flow_graph_compiler_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698