Mercurial > hg > truffle

comparison graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java @ 8617:6d884611d4c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Wed, 03 Apr 2013 14:41:22 +0200
parents 056966f39a36 480c564d90ef
children 75db7afee829
comparison
equal deleted inserted replaced
8616:d343737786fe 8617:6d884611d4c1
1092 } 1092 }
1093 } 1093 }
1094 1094
1095 FrameState outerFrameState = null; 1095 FrameState outerFrameState = null;
1096 double invokeProbability = invoke.node().probability(); 1096 double invokeProbability = invoke.node().probability();
1097 int callerLockDepth = stateAfter.nestedLockDepth();
1097 for (Node node : duplicates.values()) { 1098 for (Node node : duplicates.values()) {
1098 if (GraalOptions.ProbabilityAnalysis) { 1099 if (GraalOptions.ProbabilityAnalysis) {
1099 if (node instanceof FixedNode) { 1100 if (node instanceof FixedNode) {
1100 FixedNode fixed = (FixedNode) node; 1101 FixedNode fixed = (FixedNode) node;
1101 double newProbability = fixed.probability() * invokeProbability; 1102 double newProbability = fixed.probability() * invokeProbability;
1135 } 1136 }
1136 frameState.setOuterFrameState(outerFrameState); 1137 frameState.setOuterFrameState(outerFrameState);
1137 } 1138 }
1138 } 1139 }
1139 } 1140 }
1141 if (callerLockDepth != 0 && node instanceof MonitorReference) {
1142 MonitorReference monitor = (MonitorReference) node;
1143 monitor.setLockDepth(monitor.getLockDepth() + callerLockDepth);
1144 }
1140 } 1145 }
1141 1146
1142 Node returnValue = null; 1147 Node returnValue = null;
1143 if (returnNode != null) { 1148 if (returnNode != null) {
1144 if (returnNode.result() instanceof LocalNode) { 1149 if (returnNode.result() instanceof LocalNode) {