diff options
author | 2015-03-13 10:37:33 +0000 | |
---|---|---|
committer | 2015-03-13 10:37:33 +0000 | |
commit | faa375ca1409707efaaeeb710b2e933e7668dbe9 (patch) | |
tree | 32ce9cd8faec1e102dd2f0c8b601ac3f2e8cc1a9 /compiler/optimizing | |
parent | f11995b033f70900098ecf56bab32256ce536ada (diff) | |
parent | e50b8d23d69a0d1f4eee51d34870968cd49a6f7d (diff) |
Merge "Disable inlining in Optimizing when --debuggable is set."
Diffstat (limited to 'compiler/optimizing')
-rw-r--r-- | compiler/optimizing/inliner.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index e22f7ccbf1..bd9267c4db 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -38,6 +38,11 @@ static constexpr int kMaxInlineCodeUnits = 100; static constexpr int kDepthLimit = 5; void HInliner::Run() { + if (graph_->IsDebuggable()) { + // For simplicity, we currently never inline when the graph is debuggable. This avoids + // doing some logic in the runtime to discover if a method could have been inlined. + return; + } const GrowableArray<HBasicBlock*>& blocks = graph_->GetReversePostOrder(); for (size_t i = 0; i < blocks.Size(); ++i) { HBasicBlock* block = blocks.Get(i); |