Mercurial > hg > graal-compiler

changeset 18257:4a41f32ed552

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MethodCallTargetNode: better variable names.
author Josef Eisl <josef.eisl@jku.at>
date Wed, 05 Nov 2014 13:09:49 +0100
parents 1daaa2c62142
children 6faee2dcebbf
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java	Wed Nov 05 13:01:20 2014 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java	Wed Nov 05 13:09:49 2014 +0100
@@ -149,22 +149,22 @@
                     }
                 }
             }
-            ResolvedJavaType receiverType = targetMethod().getDeclaringClass();
-            if (receiverType.isInterface()) {
-                ResolvedJavaType single = receiverType.getSingleImplementor();
-                if (single != null && !single.equals(receiverType)) {
-                    ResolvedJavaMethod newResolvedMethod = single.resolveMethod(targetMethod(), invoke().getContextType(), true);
+            ResolvedJavaType declaredReceiverType = targetMethod().getDeclaringClass();
+            if (declaredReceiverType.isInterface()) {
+                ResolvedJavaType singleImplementor = declaredReceiverType.getSingleImplementor();
+                if (singleImplementor != null && !singleImplementor.equals(declaredReceiverType)) {
+                    ResolvedJavaMethod singleImplementorMethod = singleImplementor.resolveMethod(targetMethod(), invoke().getContextType(), true);
                     // TODO (je): we can not yet deal with default methods
-                    if (newResolvedMethod != null && !newResolvedMethod.isDefault()) {
-                        LogicNode condition = graph().unique(InstanceOfNode.create(single, receiver, getProfile()));
+                    if (singleImplementorMethod != null && !singleImplementorMethod.isDefault()) {
+                        LogicNode condition = graph().unique(InstanceOfNode.create(singleImplementor, receiver, getProfile()));
                         assert graph().getGuardsStage().ordinal() < StructuredGraph.GuardsStage.FIXED_DEOPTS.ordinal() : "Graph already fixed!";
                         GuardNode guard = graph().unique(
                                         GuardNode.create(condition, BeginNode.prevBegin(invoke().asNode()), DeoptimizationReason.OptimizedTypeCheckViolated, DeoptimizationAction.InvalidateRecompile,
                                                         false, JavaConstant.NULL_OBJECT));
-                        PiNode piNode = graph().unique(PiNode.create(receiver, StampFactory.declared(single), guard));
+                        PiNode piNode = graph().unique(PiNode.create(receiver, StampFactory.declared(singleImplementor), guard));
                         arguments().set(0, piNode);
                         setInvokeKind(InvokeKind.Virtual);
-                        setTargetMethod(newResolvedMethod);
+                        setTargetMethod(singleImplementorMethod);
                     }
                 }
             }