commit af3ec0a7d3428d02492dd41ecf19bc33e6807828
author David Brazdil <dbrazdil@google.com> Fri May 06 13:45:50 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 06 13:45:50 2016 +0000
tree 49704c702114598e6e78203a33a38d90dd7b4fb4
parent 9858f04577d2ca7400660dba9b3abe8b33bab96c
parent 3f4a522cc39f5c651e7c718196e989bc81d8c6ef

Merge "ART: Fix dominance for irreducible loops"

compiler/optimizing/nodes.cc

diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc
index cf67e1a..1db1ff4 100644
--- a/compiler/optimizing/nodes.cc
+++ b/compiler/optimizing/nodes.cc
@@ -648,6 +648,9 @@
                            graph->GetBlocks().size(),
                            /* expandable */ false,
                            kArenaAllocGraphBuilder);
+    // Stop marking blocks at the loop header.
+    visited.SetBit(header_->GetBlockId());
+
     for (HBasicBlock* back_edge : GetBackEdges()) {
       PopulateIrreducibleRecursive(back_edge, &visited);
     }

test/566-polymorphic-inlining/src/Main.java

diff --git a/test/566-polymorphic-inlining/src/Main.java b/test/566-polymorphic-inlining/src/Main.java
index 286f0d9..a59ce5b 100644
--- a/test/566-polymorphic-inlining/src/Main.java
+++ b/test/566-polymorphic-inlining/src/Main.java
@@ -98,6 +98,7 @@
   public static native void ensureJittedAndPolymorphicInline();
 
   public void increment() {
+    field.getClass(); // null check to ensure we get an inlined frame in the CodeInfo
     counter++;
   }
   public static int counter = 0;