Rename to rootMethodScope

Author: blaumeise20

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphDecoder.java

@@ -2156,9 +2156,9 @@ protected Object readObject(MethodScope methodScope) {
     /**
      * Removes unnecessary nodes from the graph after decoding.
      *
-     * @param methodScope The current method.
+     * @param rootMethodScope The current method.
      */
-    protected void cleanupGraph(MethodScope methodScope) {
+    protected void cleanupGraph(MethodScope rootMethodScope) {
         for (MergeNode merge : graph.getNodes(MergeNode.TYPE)) {
             for (ProxyPlaceholder placeholder : merge.usages().filter(ProxyPlaceholder.class).snapshot()) {
                 placeholder.replaceAndDelete(placeholder.value);

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SimplifyingGraphDecoder.java

@@ -141,9 +141,9 @@ public SimplifyingGraphDecoder(Architecture architecture, StructuredGraph graph,
     }
 
     @Override
-    protected void cleanupGraph(MethodScope methodScope) {
+    protected void cleanupGraph(MethodScope rootMethodScope) {
         GraphUtil.normalizeLoops(graph);
-        super.cleanupGraph(methodScope);
+        super.cleanupGraph(rootMethodScope);
 
         /*
          * To avoid calling tryKillUnused for each individual floating node we remove during
@@ -152,7 +152,7 @@ protected void cleanupGraph(MethodScope methodScope) {
          */
         final NodeBitMap unusedNodes = new NodeBitMap(graph);
 
-        for (Node node : graph.getNewNodes(methodScope.methodStartMark)) {
+        for (Node node : graph.getNewNodes(rootMethodScope.methodStartMark)) {
             if (node instanceof MergeNode mergeNode) {
                 if (mergeNode.forwardEndCount() == 1) {
                     graph.reduceTrivialMerge(mergeNode, false, unusedNodes);

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/PEGraphDecoder.java

@@ -917,8 +917,8 @@ protected PEMethodScope createMethodScope(StructuredGraph targetGraph, PEMethodS
     }
 
     @Override
-    protected void cleanupGraph(MethodScope methodScope) {
-        super.cleanupGraph(methodScope);
+    protected void cleanupGraph(MethodScope rootMethodScope) {
+        super.cleanupGraph(rootMethodScope);
 
         for (FrameState frameState : graph.getNodes(FrameState.TYPE)) {
             if (frameState.bci == BytecodeFrame.UNWIND_BCI) {
@@ -928,7 +928,7 @@ protected void cleanupGraph(MethodScope methodScope) {
                  * anything because the usages of the frameState are not available yet. So we need
                  * to call it again.
                  */
-                PEMethodScope peMethodScope = (PEMethodScope) methodScope;
+                PEMethodScope peMethodScope = (PEMethodScope) rootMethodScope;
                 Invoke invoke = peMethodScope.invokeData != null ? peMethodScope.invokeData.invoke : null;
                 InliningUtil.handleMissingAfterExceptionFrameState(frameState, invoke, null, true);