Mercurial > hg > graal-compiler
changeset 7080:15055bdafbfc
disabled control-flow-based inlining
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Wed, 28 Nov 2012 09:01:15 +0100 |
parents | 57d96c2a5950 |
children | 3e61ffb9ce29 |
files | graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java |
diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java Tue Nov 27 13:14:30 2012 +0100 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningPhase.java Wed Nov 28 09:01:15 2012 +0100 @@ -311,6 +311,7 @@ InlineInfo info = InliningUtil.getInlineInfo(invoke, runtime, assumptions, this, optimisticOpts); if (info != null) { invokePredecessor = (FixedNode) info.invoke().predecessor(); + assert invokePredecessor.isAlive(); } return info; }
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java Tue Nov 27 13:14:30 2012 +0100 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/GraalOptions.java Wed Nov 28 09:01:15 2012 +0100 @@ -43,7 +43,7 @@ static boolean InlineMonomorphicCalls = true; static boolean InlinePolymorphicCalls = true; static boolean InlineMegamorphicCalls = ____; - public static int InliningPolicy = 0; + public static int InliningPolicy = 1; public static int InliningDecision = 4; public static int WeightComputationPolicy = 2; public static int MaximumTrivialSize = 10;