Mercurial > hg > truffle
changeset 19742:095ddb9421d0
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 10 Mar 2015 11:33:30 +0100 |
parents | cb4d01e1c084 (current diff) d526b6bffc7c (diff) |
children | 2a21ea0ec141 |
files | |
diffstat | 3 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Mon Mar 09 23:07:28 2015 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Tue Mar 10 11:33:30 2015 +0100 @@ -397,8 +397,6 @@ } Debug.dump(compilationResult, "After code generation"); - } catch (Throwable e) { - throw Debug.handle(e); } } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java Mon Mar 09 23:07:28 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java Tue Mar 10 11:33:30 2015 +0100 @@ -868,10 +868,8 @@ return "HotSpotType<" + getName() + ", resolved>"; } - private static final HotSpotResolvedObjectTypeImpl trustedInterfaceType = fromObjectClass(TrustedInterface.class); - @Override public boolean isTrustedInterfaceType() { - return trustedInterfaceType.isAssignableFrom(this); + return TrustedInterface.class.isAssignableFrom(mirror()); } }
--- a/graal/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java Mon Mar 09 23:07:28 2015 +0100 +++ b/graal/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java Tue Mar 10 11:33:30 2015 +0100 @@ -354,7 +354,8 @@ private ShapeImpl addPropertyInternal(Property prop) { CompilerAsserts.neverPartOfCompilation(); assert prop.isShadow() || !(this.hasProperty(prop.getKey())) : "duplicate property " + prop.getKey(); - assert !getPropertyListInternal(false).contains(prop); + // assertion caused performance issues on e.g. testv8 regress-619.js + // assert !getPropertyListInternal(false).contains(prop); AddPropertyTransition addTransition = new AddPropertyTransition(prop); ShapeImpl cachedShape = queryTransition(addTransition);