--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BranchProbabilityNode.java	2017-03-20 17:40:45.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/extended/BranchProbabilityNode.java	2017-03-20 17:40:45.000000000 -0700
@@ -132,7 +132,7 @@
     }
 
     private boolean isSubstitutionGraph() {
-        return getUsageCount() == 1 && usages().first() instanceof ReturnNode;
+        return hasExactlyOneUsage() && usages().first() instanceof ReturnNode;
     }
 
     /**