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

Unified Diff: runtime/vm/flow_graph_inliner.cc

Issue 70183010: Fixes a couple problems with GC of unoptimized code. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 1 month 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_x64.cc ('k') | runtime/vm/gc_marker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_inliner.cc
===================================================================
--- runtime/vm/flow_graph_inliner.cc (revision 30598)
+++ runtime/vm/flow_graph_inliner.cc (working copy)
@@ -59,10 +59,12 @@
// Test if a call is recursive by looking in the deoptimization environment.
-static bool IsCallRecursive(const Function& function, Definition* call) {
+static bool IsCallRecursive(const Code& code, Definition* call) {
Environment* env = call->env();
while (env != NULL) {
- if (function.raw() == env->function().raw()) return true;
+ if (code.raw() == env->code().raw()) {
+ return true;
+ }
env = env->outer();
}
return false;
@@ -434,6 +436,9 @@
return false;
}
+ // Make a handle for the unoptimized code so that it is not disconnected
+ // from the function while we are trying to inline it.
+ const Code& unoptimized_code = Code::Handle(function.unoptimized_code());
// Abort if the inlinable bit on the function is low.
if (!function.IsInlineable()) {
TRACE_INLINING(OS::Print(" Bailout: not inlinable\n"));
@@ -466,7 +471,7 @@
// Abort if this is a recursive occurrence.
Definition* call = call_data->call;
- if (!FLAG_inline_recursive && IsCallRecursive(function, call)) {
+ if (!FLAG_inline_recursive && IsCallRecursive(unoptimized_code, call)) {
function.set_is_inlinable(false);
TRACE_INLINING(OS::Print(" Bailout: recursive function\n"));
return false;
@@ -493,12 +498,12 @@
// Load IC data for the callee.
Array& ic_data_array = Array::Handle();
- if (function.HasCode()) {
- const Code& unoptimized_code =
- Code::Handle(function.unoptimized_code());
- ic_data_array = unoptimized_code.ExtractTypeFeedbackArray();
- }
+ // IsInlineable above checked HasCode. Creating a Handle for the code
+ // should have kept GC from detaching, but let's assert just to make sure.
+ ASSERT(function.HasCode());
+ ic_data_array = unoptimized_code.ExtractTypeFeedbackArray();
+
// Build the callee graph.
InlineExitCollector* exit_collector =
new InlineExitCollector(caller_graph_, call);
@@ -620,7 +625,9 @@
collected_call_sites_->FindCallSites(callee_graph, inlining_depth_);
// Add the function to the cache.
- if (!in_cache) function_cache_.Add(parsed_function);
+ if (!in_cache) {
+ function_cache_.Add(parsed_function);
+ }
// Build succeeded so we restore the bailout jump.
inlined_ = true;
@@ -639,6 +646,9 @@
(*callee_graph->guarded_fields())[i]);
}
+ // We allocate a ZoneHandle for the unoptimized code so that it cannot be
+ // disconnected from its function during the rest of compilation.
+ Code::ZoneHandle(unoptimized_code.raw());
TRACE_INLINING(OS::Print(" Success\n"));
return true;
} else {
« no previous file with comments | « runtime/vm/flow_graph_compiler_x64.cc ('k') | runtime/vm/gc_marker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698