# HG changeset patch
# User Miguel Garcia <miguel.m.garcia@oracle.com>
# Date 1400593562 -7200
# Node ID b5a993ed67ea44ac4227bb1ab93ca5d771980061
# Parent  066ed90d15a7288596e4c1e860903f3d4ab30500
[inlining] another renaming to avoid misleading type suggestion (2 of 2)

diff -r 066ed90d15a7 -r b5a993ed67ea graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java	Tue May 20 15:45:07 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java	Tue May 20 15:46:02 2014 +0200
@@ -341,14 +341,14 @@
     private void doInline(CallsiteHolder callerCallsiteHolder, MethodInvocation calleeInvocation, Assumptions callerAssumptions) {
         StructuredGraph callerGraph = callerCallsiteHolder.graph();
         Graph.Mark markBeforeInlining = callerGraph.getMark();
-        InlineInfo callee = calleeInvocation.callee();
+        InlineInfo calleeInfo = calleeInvocation.callee();
         try {
             try (Debug.Scope scope = Debug.scope("doInline", callerGraph)) {
-                List<Node> invokeUsages = callee.invoke().asNode().usages().snapshot();
-                callee.inline(new Providers(context), callerAssumptions);
+                List<Node> invokeUsages = calleeInfo.invoke().asNode().usages().snapshot();
+                calleeInfo.inline(new Providers(context), callerAssumptions);
                 callerAssumptions.record(calleeInvocation.assumptions());
                 metricInliningRuns.increment();
-                Debug.dump(callerGraph, "after %s", callee);
+                Debug.dump(callerGraph, "after %s", calleeInfo);
 
                 if (OptCanonicalizer.getValue()) {
                     Graph.Mark markBeforeCanonicalization = callerGraph.getMark();
@@ -369,9 +369,9 @@
         } catch (BailoutException bailout) {
             throw bailout;
         } catch (AssertionError | RuntimeException e) {
-            throw new GraalInternalError(e).addContext(callee.toString());
+            throw new GraalInternalError(e).addContext(calleeInfo.toString());
         } catch (GraalInternalError e) {
-            throw e.addContext(callee.toString());
+            throw e.addContext(calleeInfo.toString());
         }
     }