Mercurial > hg > graal-jvmci-8
changeset 15766:d4a78b357778
[inlining-4] no need to pass context.getReplacements() to getExactInlineInfo()
author | Miguel Garcia <miguel.m.garcia@oracle.com> |
---|---|
date | Mon, 19 May 2014 16:14:56 +0200 |
parents | 5456b4d73d99 |
children | 7bce8202e5d0 |
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:10:24 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java Mon May 19 16:14:56 2014 +0200 @@ -110,7 +110,7 @@ final OptimisticOptimizations optimisticOpts = context.getOptimisticOptimizations(); if (callTarget.invokeKind() == MethodCallTargetNode.InvokeKind.Special || targetMethod.canBeStaticallyBound()) { - return getExactInlineInfo(invoke, replacements, optimisticOpts, targetMethod); + return getExactInlineInfo(invoke, optimisticOpts, targetMethod); } assert callTarget.invokeKind() == MethodCallTargetNode.InvokeKind.Virtual || callTarget.invokeKind() == MethodCallTargetNode.InvokeKind.Interface; @@ -135,7 +135,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, replacements, optimisticOpts, resolvedMethod); + return getExactInlineInfo(invoke, optimisticOpts, resolvedMethod); } } } @@ -145,7 +145,7 @@ // arrays can be treated as Objects ResolvedJavaMethod resolvedMethod = holder.resolveMethod(targetMethod, contextType); if (resolvedMethod != null) { - return getExactInlineInfo(invoke, replacements, optimisticOpts, resolvedMethod); + return getExactInlineInfo(invoke, optimisticOpts, resolvedMethod); } } @@ -300,9 +300,9 @@ return new AssumptionInlineInfo(invoke, concrete, takenAssumption); } - public InlineInfo getExactInlineInfo(Invoke invoke, Replacements replacements, OptimisticOptimizations optimisticOpts, ResolvedJavaMethod targetMethod) { + public InlineInfo getExactInlineInfo(Invoke invoke, OptimisticOptimizations optimisticOpts, ResolvedJavaMethod targetMethod) { assert !targetMethod.isAbstract(); - if (!InliningUtil.checkTargetConditions(this, replacements, invoke, targetMethod, optimisticOpts)) { + if (!InliningUtil.checkTargetConditions(this, context.getReplacements(), invoke, targetMethod, optimisticOpts)) { return null; } return new ExactInlineInfo(invoke, targetMethod);