Mercurial > hg > truffle
changeset 15770:f9780f141694
[inlining-4] one less alias in getExactInlineInfo()
author | Miguel Garcia <miguel.m.garcia@oracle.com> |
---|---|
date | Mon, 19 May 2014 16:32:02 +0200 |
parents | b4478dcb2a04 |
children | 2cbacdb145a8 |
files | graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java |
diffstat | 1 files changed, 5 insertions(+), 5 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:27:24 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java Mon May 19 16:32:02 2014 +0200 @@ -108,7 +108,7 @@ final OptimisticOptimizations optimisticOpts = context.getOptimisticOptimizations(); if (callTarget.invokeKind() == MethodCallTargetNode.InvokeKind.Special || targetMethod.canBeStaticallyBound()) { - return getExactInlineInfo(invoke, optimisticOpts, targetMethod); + return getExactInlineInfo(invoke, targetMethod); } assert callTarget.invokeKind() == MethodCallTargetNode.InvokeKind.Virtual || callTarget.invokeKind() == MethodCallTargetNode.InvokeKind.Interface; @@ -133,7 +133,7 @@ assert targetMethod.getDeclaringClass().isAssignableFrom(holder) : holder + " subtype of " + targetMethod.getDeclaringClass() + " for " + targetMethod; ResolvedJavaMethod resolvedMethod = holder.resolveMethod(targetMethod, contextType); if (resolvedMethod != null) { - return getExactInlineInfo(invoke, optimisticOpts, resolvedMethod); + return getExactInlineInfo(invoke, resolvedMethod); } } } @@ -143,7 +143,7 @@ // arrays can be treated as Objects ResolvedJavaMethod resolvedMethod = holder.resolveMethod(targetMethod, contextType); if (resolvedMethod != null) { - return getExactInlineInfo(invoke, optimisticOpts, resolvedMethod); + return getExactInlineInfo(invoke, resolvedMethod); } } @@ -298,9 +298,9 @@ return new AssumptionInlineInfo(invoke, concrete, takenAssumption); } - public InlineInfo getExactInlineInfo(Invoke invoke, OptimisticOptimizations optimisticOpts, ResolvedJavaMethod targetMethod) { + public InlineInfo getExactInlineInfo(Invoke invoke, ResolvedJavaMethod targetMethod) { assert !targetMethod.isAbstract(); - if (!InliningUtil.checkTargetConditions(this, context.getReplacements(), invoke, targetMethod, optimisticOpts)) { + if (!InliningUtil.checkTargetConditions(this, context.getReplacements(), invoke, targetMethod, context.getOptimisticOptimizations())) { return null; } return new ExactInlineInfo(invoke, targetMethod);