Rename field

Author: Christian Wimmer

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/DefaultAnalysisPolicy.java

@@ -300,8 +300,8 @@ public void onObservedSaturated(PointsToAnalysis bb, TypeFlow<?> observed) {
                     }
                 }
                 /* Remove the link between the formal and the actual return, if present. */
-                if (actualReturn != null && calleeFlows.getResult() != null) {
-                    calleeFlows.getResult().removeUse(actualReturn);
+                if (actualReturn != null && calleeFlows.getReturnFlow() != null) {
+                    calleeFlows.getReturnFlow().removeUse(actualReturn);
                 }
             }
 

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/InvokeTypeFlow.java

@@ -227,17 +227,17 @@ protected void linkCallee(PointsToAnalysis bb, boolean isStatic, MethodFlowsGrap
                      * might throw an exception instead of returning, hence the formal return is
                      * null.
                      */
-                    if (calleeFlows.getResult() != null) {
-                        calleeFlows.getResult().addUse(bb, actualReturn);
+                    if (calleeFlows.getReturnFlow() != null) {
+                        calleeFlows.getReturnFlow().addUse(bb, actualReturn);
                     }
                 }
             } else {
                 /*
                  * The callee may have a return type, hence the actualReturn is non-null, but it
                  * might throw an exception instead of returning, hence the formal return is null.
                  */
-                if (calleeFlows.getResult() != null) {
-                    calleeFlows.getResult().addUse(bb, actualReturn);
+                if (calleeFlows.getReturnFlow() != null) {
+                    calleeFlows.getReturnFlow().addUse(bb, actualReturn);
                 }
             }
         }

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodFlowsGraph.java

@@ -69,7 +69,7 @@ public class MethodFlowsGraph {
     private EconomicMap<Object, InstanceOfTypeFlow> instanceOfFlows;
     private EconomicMap<Object, InvokeTypeFlow> invokeFlows;
 
-    private FormalReturnTypeFlow result;
+    private FormalReturnTypeFlow returnFlow;
 
     private boolean isLinearized = false;
     private boolean sealed;
@@ -137,7 +137,7 @@ public void cloneOriginalFlows(PointsToAnalysis bb) {
         initialParameterFlows = new InitialParamTypeFlow[originalMethodFlowsGraph.initialParameterFlows.length];
 
         nodeFlows = lookupClonesOf(bb, originalMethodFlowsGraph.nodeFlows);
-        result = originalMethodFlowsGraph.getResult() != null ? lookupCloneOf(bb, originalMethodFlowsGraph.getResult()) : null;
+        returnFlow = originalMethodFlowsGraph.getReturnFlow() != null ? lookupCloneOf(bb, originalMethodFlowsGraph.getReturnFlow()) : null;
         instanceOfFlows = lookupClonesOf(bb, originalMethodFlowsGraph.instanceOfFlows);
         miscEntryFlows = lookupClonesOf(bb, originalMethodFlowsGraph.miscEntryFlows);
         invokeFlows = lookupClonesOf(bb, originalMethodFlowsGraph.invokeFlows);
@@ -321,8 +321,8 @@ private TypeFlow<?>[] doLinearizeGraph() {
                 worklist.add(value);
             }
         }
-        if (result != null) {
-            worklist.add(result);
+        if (returnFlow != null) {
+            worklist.add(returnFlow);
         }
 
         // temporary list in which the linearized graph is built
@@ -425,12 +425,12 @@ public void addMiscEntryFlow(TypeFlow<?> entryFlow) {
         miscEntryFlows.add(entryFlow);
     }
 
-    public void setResult(FormalReturnTypeFlow result) {
-        this.result = result;
+    public void setReturnFlow(FormalReturnTypeFlow returnFlow) {
+        this.returnFlow = returnFlow;
     }
 
-    public FormalReturnTypeFlow getResult() {
-        return this.result;
+    public FormalReturnTypeFlow getReturnFlow() {
+        return this.returnFlow;
     }
 
     public EconomicMap<Object, InvokeTypeFlow> getInvokes() {

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlow.java

@@ -151,7 +151,7 @@ public MethodFlowsGraph getFlows(AnalysisContext calleeContext) {
     }
 
     public void setResult(FormalReturnTypeFlow result) {
-        originalMethodFlows.setResult(result);
+        originalMethodFlows.setReturnFlow(result);
     }
 
     public void setParameter(int index, FormalParamTypeFlow parameter) {
@@ -243,7 +243,7 @@ public TypeState getParameterTypeState(PointsToAnalysis bb, int parameter) {
 
     // original result
     protected FormalReturnTypeFlow getResultFlow() {
-        return originalMethodFlows.getResult();
+        return originalMethodFlows.getReturnFlow();
     }
 
     public Iterable<InvokeTypeFlow> getInvokes() {

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java

@@ -91,7 +91,7 @@ public StaticAnalysisResults makeOrApplyResults(AnalysisMethod method) {
             parameterTypeProfiles = paramProfiles.toArray(new JavaTypeProfile[paramProfiles.size()]);
         }
 
-        JavaTypeProfile resultTypeProfile = makeTypeProfile(methodFlow.foldTypeFlow(bb, originalFlows.getResult()));
+        JavaTypeProfile resultTypeProfile = makeTypeProfile(methodFlow.foldTypeFlow(bb, originalFlows.getReturnFlow()));
 
         ArrayList<BytecodeEntry> entries = new ArrayList<>(method.getCodeSize());