# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1425983610 -3600
# Node ID 095ddb9421d0a2b44dc75f34e356cff1799fd45f
# Parent  cb4d01e1c0842ee6dcc889c4f44e8f78431be9a0# Parent  d526b6bffc7c7d66b1de2da8c4f20d8f2667112e
Merge.

diff -r cb4d01e1c084 -r 095ddb9421d0 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java
--- 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);
         }
     }
 }
diff -r cb4d01e1c084 -r 095ddb9421d0 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedObjectTypeImpl.java
--- 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());
     }
 }
diff -r cb4d01e1c084 -r 095ddb9421d0 graal/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java
--- 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);