Mercurial > hg > graal-compiler
changeset 15765:5456b4d73d99
[inlining-4] parameter aliasing context.getOptimisticOptimizations() goes away
author | Miguel Garcia <miguel.m.garcia@oracle.com> |
---|---|
date | Mon, 19 May 2014 16:10:24 +0200 |
parents | 1d12d358aa6d |
children | d4a78b357778 |
files | graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java Mon May 19 16:08:06 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java Mon May 19 16:10:24 2014 +0200 @@ -98,7 +98,7 @@ * @param invoke the invoke that should be inlined * @return an instance of InlineInfo, or null if no inlining is possible at the given invoke */ - public InlineInfo getInlineInfo(Invoke invoke, Assumptions assumptions, OptimisticOptimizations optimisticOpts) { + public InlineInfo getInlineInfo(Invoke invoke, Assumptions assumptions) { final String failureMessage = InliningUtil.checkInvokeConditions(invoke); if (failureMessage != null) { InliningUtil.logNotInlinedMethod(invoke, failureMessage); @@ -107,6 +107,7 @@ MethodCallTargetNode callTarget = (MethodCallTargetNode) invoke.callTarget(); ResolvedJavaMethod targetMethod = callTarget.targetMethod(); final Replacements replacements = context.getReplacements(); + final OptimisticOptimizations optimisticOpts = context.getOptimisticOptimizations(); if (callTarget.invokeKind() == MethodCallTargetNode.InvokeKind.Special || targetMethod.canBeStaticallyBound()) { return getExactInlineInfo(invoke, replacements, optimisticOpts, targetMethod); @@ -372,7 +373,7 @@ Invoke invoke = callsiteHolder.popInvoke(); MethodInvocation callerInvocation = currentInvocation(); Assumptions parentAssumptions = callerInvocation.assumptions(); - InlineInfo info = getInlineInfo(invoke, parentAssumptions, context.getOptimisticOptimizations()); + InlineInfo info = getInlineInfo(invoke, parentAssumptions); if (info != null) { double invokeProbability = callsiteHolder.invokeProbability(invoke);