# HG changeset patch
# User Bernhard Urban <bernhard.urban@jku.at>
# Date 1403879130 -7200
# Node ID c04bdca850a950772f661174df04e7c0ab05fd6d
# Parent  a501d56c86565b7aad119c99d4895c305c391caa
truffle compiler: small cleanup

diff -r a501d56c8656 -r c04bdca850a9 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCacheImpl.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCacheImpl.java	Fri Jun 27 16:25:02 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCacheImpl.java	Fri Jun 27 16:25:30 2014 +0200
@@ -64,7 +64,12 @@
     private final HashMap<List<Object>, StructuredGraph> cache = new HashMap<>();
     private final HashMap<List<Object>, Long> lastUsed = new HashMap<>();
     private final StructuredGraph markerGraph = new StructuredGraph();
+
     private final ResolvedJavaType stringBuilderClass;
+    private final ResolvedJavaType runtimeExceptionClass;
+    private final ResolvedJavaType assertionErrorClass;
+    private final ResolvedJavaType controlFlowExceptionClass;
+
     private final ResolvedJavaMethod callBoundaryMethod;
     private long counter;
 
@@ -73,7 +78,12 @@
         this.config = config;
         this.configForRootGraph = configForRootGraph;
         this.optimisticOptimizations = optimisticOptimizations;
+
         this.stringBuilderClass = providers.getMetaAccess().lookupJavaType(StringBuilder.class);
+        this.runtimeExceptionClass = providers.getMetaAccess().lookupJavaType(RuntimeException.class);
+        this.assertionErrorClass = providers.getMetaAccess().lookupJavaType(AssertionError.class);
+        this.controlFlowExceptionClass = providers.getMetaAccess().lookupJavaType(ControlFlowException.class);
+
         try {
             callBoundaryMethod = providers.getMetaAccess().lookupJavaMethod(OptimizedCallTarget.class.getDeclaredMethod("callRoot", Object[].class));
         } catch (NoSuchMethodException ex) {
@@ -249,12 +259,12 @@
 
     private boolean tryCutOffRuntimeExceptions(MethodCallTargetNode methodCallTargetNode) {
         if (methodCallTargetNode.targetMethod().isConstructor()) {
-            ResolvedJavaType runtimeException = providers.getMetaAccess().lookupJavaType(RuntimeException.class);
-            ResolvedJavaType assertionError = providers.getMetaAccess().lookupJavaType(AssertionError.class);
-            ResolvedJavaType controlFlowException = providers.getMetaAccess().lookupJavaType(ControlFlowException.class);
+            ResolvedJavaType declaringClass = methodCallTargetNode.targetMethod().getDeclaringClass();
             ResolvedJavaType exceptionType = Objects.requireNonNull(StampTool.typeOrNull(methodCallTargetNode.receiver().stamp()));
-            ResolvedJavaType declaringClass = methodCallTargetNode.targetMethod().getDeclaringClass();
-            if ((assertionError.isAssignableFrom(declaringClass) || runtimeException.isAssignableFrom(declaringClass)) && !controlFlowException.isAssignableFrom(exceptionType)) {
+
+            boolean removeAllocation = runtimeExceptionClass.isAssignableFrom(declaringClass) || assertionErrorClass.isAssignableFrom(declaringClass);
+            boolean isCFGException = controlFlowExceptionClass.isAssignableFrom(exceptionType);
+            if (removeAllocation && !isCFGException) {
                 DeoptimizeNode deoptNode = methodCallTargetNode.graph().add(new DeoptimizeNode(DeoptimizationAction.InvalidateRecompile, DeoptimizationReason.UnreachedCode));
                 FixedNode invokeNode = methodCallTargetNode.invoke().asNode();
                 invokeNode.replaceAtPredecessor(deoptNode);