# HG changeset patch
# User Christian Haeubl <haeubl@ssw.jku.at>
# Date 1359985531 -3600
# Node ID 57b3e9faac4ab03e2e72a0650a7b778f24f89e8d
# Parent  826632227602ed4d7626f70582b28eed9a584751
code cleanup

diff -r 826632227602 -r 57b3e9faac4a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java	Mon Feb 04 14:35:52 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaField.java	Mon Feb 04 14:45:31 2013 +0100
@@ -98,8 +98,6 @@
                 Constant value = readValue(receiver);
                 if (assumeNonStaticFinalFieldsAsFinal(receiver.asObject().getClass()) || !value.isDefaultForKind()) {
                     return value;
-                } else {
-                    TTY.println("Non-static final field %s.%s=%s", holder, name, value.toString());
                 }
             }
         }
diff -r 826632227602 -r 57b3e9faac4a graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java	Mon Feb 04 14:35:52 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java	Mon Feb 04 14:45:31 2013 +0100
@@ -25,7 +25,6 @@
 import java.util.*;
 
 import com.oracle.graal.api.meta.*;
-import com.oracle.graal.debug.*;
 import com.oracle.graal.graph.*;
 import com.oracle.graal.graph.iterators.*;
 import com.oracle.graal.nodes.PhiNode.PhiType;
@@ -349,9 +348,6 @@
      * @param phiValues the values of the phi at the merge, keyed by the merge ends
      */
     private void connectEnds(List<EndNode> ends, Map<EndNode, ValueNode> phiValues, BeginNode successor, MergeNode oldMerge, SimplifierTool tool) {
-        // TEMP:
-        Debug.dump(this.graph(), "Before connectEnds");
-
         if (ends.isEmpty()) {
             GraphUtil.killCFG(successor);
         } else {
@@ -386,9 +382,6 @@
             }
             tool.addToWorkList(successor);
         }
-
-        // TEMP:
-        Debug.dump(this.graph(), "After connectEnds");
     }
 
     /**
diff -r 826632227602 -r 57b3e9faac4a graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java	Mon Feb 04 14:35:52 2013 +0100
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java	Mon Feb 04 14:45:31 2013 +0100
@@ -170,26 +170,6 @@
 
         @Override
         public boolean isWorthInlining(InlineInfo info) {
-// assert GraalOptions.ProbabilityAnalysis;
-// if (compiledCodeSize(info) > GraalOptions.SmallCompiledCodeSize) {
-// return false;
-// }
-//
-// double maxSize = GraalOptions.NormalComplexity;
-// Signature signature = info.invoke().methodCallTarget().targetMethod().getSignature();
-// int transferredValues =
-// signature.getParameterCount(!Modifier.isStatic(info.invoke().methodCallTarget().targetMethod().getModifiers()));
-// if (signature.getReturnKind() != Kind.Void) {
-// transferredValues++;
-// }
-// maxSize += transferredValues * 10;
-//
-// maxSize = Math.min(GraalOptions.RelevanceCapForInlining, info.invoke().inliningRelevance()) *
-// maxSize;
-// maxSize = Math.max(maxSize, GraalOptions.TrivialComplexity);
-//
-// return compilationComplexity(info) < maxSize;
-
             assert GraalOptions.ProbabilityAnalysis;
             /*
              * TODO (chaeubl): invoked methods that are on important paths but not yet compiled ->
@@ -233,19 +213,6 @@
             boolean preferredInvoke = hints != null && hints.contains(info.invoke());
 
             // TODO (chaeubl): compute metric that is used to check if this method should be inlined
-// anyways. also use the relevance somehow...
-// double metric = (moreSpecificArguments * 5 + transferredValues + invokeUsages) * (preferredInvoke
-// ? 1 : GraalOptions.BoostInliningForEscapeAnalysis);
-// if (metric > 50) {
-// // TEMP:
-// TTY.println("Inlined special method (relevance=%f, bytecodes=%d, complexity=%d, codeSize=%d, probability=%f, transferredValues=%d, invokeUsages=%d, moreSpecificArguments=%d, level=%d, preferred=%b)",
-// relevance, bytecodeSize, complexity, compiledCodeSize, probability, transferredValues,
-// invokeUsages, moreSpecificArguments, level, preferredInvoke);
-// return InliningUtil.logInlinedMethod(info,
-// "(relevance=%f, bytecodes=%d, complexity=%d, codeSize=%d, probability=%f, transferredValues=%d, invokeUsages=%d, moreSpecificArguments=%d, level=%d, preferred=%b)",
-// relevance, bytecodeSize, complexity, compiledCodeSize, probability, transferredValues,
-// invokeUsages, moreSpecificArguments, level, preferredInvoke);
-// }
 
             return InliningUtil.logNotInlinedMethod(info,
                             "(relevance=%f, bytecodes=%d, complexity=%d, codeSize=%d, probability=%f, transferredValues=%d, invokeUsages=%d, moreSpecificArguments=%d, level=%d, preferred=%b)",
diff -r 826632227602 -r 57b3e9faac4a graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java	Mon Feb 04 14:35:52 2013 +0100
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java	Mon Feb 04 14:45:31 2013 +0100
@@ -724,7 +724,7 @@
             replaceInvokeCallTarget(graph, kind, target);
         }
 
-        private BeginNode createUnknownTypeSuccessor(StructuredGraph graph) {
+        private static BeginNode createUnknownTypeSuccessor(StructuredGraph graph) {
             return BeginNode.begin(graph.add(new DeoptimizeNode(DeoptimizationAction.InvalidateReprofile, DeoptimizationReason.TypeCheckedInliningViolated)));
         }
 
diff -r 826632227602 -r 57b3e9faac4a graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java	Mon Feb 04 14:35:52 2013 +0100
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java	Mon Feb 04 14:45:31 2013 +0100
@@ -51,7 +51,7 @@
     public static float   BoostInliningForEscapeAnalysis     = 2f;
     public static float   RelevanceCapForInlining            = 1f;
 
-    public static int     TrivialBytecodeSize                = 0;   // TODO (chaeubl): change that to 10 when it survives bootstrapping
+    public static int     TrivialBytecodeSize                = 10;
     public static int     NormalBytecodeSize                 = 150;
     public static int     MaximumBytecodeSize                = 500;
     public static int     TrivialComplexity                  = 10;