commit b331febbab8e916680faba722cc84b66b84218a3
author Nicolas Geoffray <ngeoffray@google.com> Fri Feb 05 16:51:53 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Feb 05 17:11:54 2016 +0000
tree 35f985b021e476914bfe91492da23fee218014a7
parent 586996afc905518ed926e4680aab67bedabec9b7

Revert "Revert "Implement on-stack replacement for arm/arm64/x86/x86_64.""

This reverts commit bd89a5c556324062b7d841843b039392e84cfaf4.

Change-Id: I08d190431520baa7fcec8fbdb444519f25ac8d44

compiler/optimizing/nodes.cc

diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc
index 3dda850..f269885 100644
--- a/compiler/optimizing/nodes.cc
+++ b/compiler/optimizing/nodes.cc
@@ -647,6 +647,10 @@
       header_->GetGraph()->SetHasIrreducibleLoops(true);
       PopulateIrreducibleRecursive(back_edge);
     } else {
+      if (header_->GetGraph()->IsCompilingOsr()) {
+        irreducible_ = true;
+        header_->GetGraph()->SetHasIrreducibleLoops(true);
+      }
       PopulateRecursive(back_edge);
     }
   }