Mercurial > hg > graal-compiler
changeset 21429:fdb6a466cc6f
tolerate ConstantNodes in unused FrameStates when checking nodes added by an invocation plugin
Contributed-by: Igor Veresov <igor.veresov@oracle.com>
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 20 May 2015 10:17:58 +0200 |
parents | e3438899928c |
children | cd35fec33774 |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotInvocationPlugins.java |
diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotInvocationPlugins.java Wed May 20 05:37:55 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotInvocationPlugins.java Wed May 20 10:17:58 2015 +0200 @@ -81,7 +81,10 @@ if (isClass(c)) { // This will be handled later by LoadJavaMirrorWithKlassPhase } else { - throw new AssertionError("illegal constant node in AOT: " + node); + // Tolerate uses in unused FrameStates + if (node.usages().filter((n) -> !(n instanceof FrameState) || n.hasUsages()).isNotEmpty()) { + throw new AssertionError("illegal constant node in AOT: " + node); + } } } }