Mercurial > hg > truffle
changeset 21577:8a01110bfbaf
Merge with fad97102875561c0cecb2da155cdf0a1bc3cdaa8
author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
---|---|
date | Thu, 28 May 2015 15:10:18 -0700 |
parents | 9c2c8e4b5333 (current diff) fad971028755 (diff) |
children | a880844225e4 |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu May 28 10:16:13 2015 -0700 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu May 28 15:10:18 2015 -0700 @@ -3067,7 +3067,7 @@ ResolvedJavaType resolvedType = (ResolvedJavaType) type; JavaTypeProfile profile = getProfileForTypeCheck(resolvedType); TypeCheckPlugin typeCheckPlugin = this.graphBuilderConfig.getPlugins().getTypeCheckPlugin(); - if (typeCheckPlugin == null || !typeCheckPlugin.checkCast(this, object, resolvedType, profile)) { + if (typeCheckPlugin == null || !this.parsingIntrinsic() || !typeCheckPlugin.checkCast(this, object, resolvedType, profile)) { ValueNode checkCastNode = null; if (profile != null) { if (profile.getNullSeen().isFalse()) {