Mercurial > hg > graal-compiler
changeset 22607:93debde5e065
Disable getComponentType intrinsic for 1.9 and later
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Tue, 08 Sep 2015 18:22:02 -0700 |
parents | 0ba4359ea401 |
children | bb887a437e5b |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java |
diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java Tue Sep 08 18:21:11 2015 -0700 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java Tue Sep 08 18:22:02 2015 -0700 @@ -25,6 +25,7 @@ import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*; import static com.oracle.graal.hotspot.replacements.SystemSubstitutions.*; import static com.oracle.graal.java.BytecodeParser.Options.*; +import static sun.misc.Version.*; import java.lang.invoke.*; import java.util.zip.*; @@ -122,7 +123,10 @@ r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "isArray", Receiver.class); r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "isPrimitive", Receiver.class); r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "getSuperclass", Receiver.class); - r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "getComponentType", Receiver.class); + + if (jdkMajorVersion() >= 1 && jdkMinorVersion() <= 8) { + r.registerMethodSubstitution(HotSpotClassSubstitutions.class, "getComponentType", Receiver.class); + } r.register2("cast", Receiver.class, Object.class, new InvocationPlugin() { public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode object) {