From e50b8d23d69a0d1f4eee51d34870968cd49a6f7d Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Fri, 13 Mar 2015 08:57:42 +0000
Subject: Disable inlining in Optimizing when --debuggable is set.

Change-Id: I6365269e606e0c176e518c06719ebdaf6a4c4b88
---
 compiler/optimizing/inliner.cc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'compiler')

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);
-- 
cgit v1.2.3-59-g8ed1b