Renamed field to avoid obvious confusion

Author: MattAlp

src/main/java/org/truffleruby/RubyContext.java

@@ -319,7 +319,7 @@ protected boolean patch(Env newEnv) {
                 .getConstant("TO_RUN_AT_INIT")
                 .getValue();
         for (Object proc : ArrayOperations.toIterable((RubyArray) toRunAtInit)) {
-            final Source source = ((RubyProc) proc).method
+            final Source source = ((RubyProc) proc).declaringMethod
                     .getSharedMethodInfo()
                     .getSourceSection()
                     .getSource();

src/main/java/org/truffleruby/core/proc/ProcNodes.java

@@ -123,7 +123,7 @@ protected RubyProc procSpecial(VirtualFrame frame, RubyClass procClass, Object[]
                     block.callTarget,
                     block.declarationFrame,
                     block.declarationVariables,
-                    block.method,
+                    block.declaringMethod,
                     block.frameOnStackMarker,
                     block.declarationContext);
 
@@ -161,7 +161,7 @@ protected RubyProc dup(RubyProc proc) {
                     proc.callTarget,
                     proc.declarationFrame,
                     proc.declarationVariables,
-                    proc.method,
+                    proc.declaringMethod,
                     proc.frameOnStackMarker,
                     proc.declarationContext);
 

src/main/java/org/truffleruby/core/proc/ProcOperations.java

@@ -33,7 +33,7 @@ private static Object[] packArguments(RubyProc proc, ArgumentsDescriptor descrip
         return RubyArguments.pack(
                 proc.declarationFrame,
                 null,
-                proc.method,
+                proc.declaringMethod,
                 proc.frameOnStackMarker,
                 getSelf(proc),
                 nil,
@@ -106,7 +106,7 @@ public static RubyProc convertBlock(RubyContext context, RubyLanguage language,
                         block.callTargets,
                         block.declarationFrame,
                         block.declarationVariables,
-                        block.method,
+                        block.declaringMethod,
                         type == ProcType.PROC ? block.frameOnStackMarker : null,
                         block.declarationContext);
     }

src/main/java/org/truffleruby/core/proc/RubyProc.java

@@ -41,7 +41,7 @@ public class RubyProc extends RubyDynamicObject implements ObjectGraphNode {
     // Accessed for calling a RubyProc
     public final RootCallTarget callTarget;
     public final MaterializedFrame declarationFrame;
-    public final InternalMethod method;
+    public final InternalMethod declaringMethod;
     public final FrameOnStackMarker frameOnStackMarker;
     public final DeclarationContext declarationContext;
     // Not accessed for calling a RubyProc
@@ -63,7 +63,7 @@ public RubyProc(
             RootCallTarget callTarget,
             MaterializedFrame declarationFrame,
             SpecialVariableStorage declarationVariables,
-            InternalMethod method,
+            InternalMethod declaringMethod,
             FrameOnStackMarker frameOnStackMarker,
             DeclarationContext declarationContext) {
         super(rubyClass, shape);
@@ -74,7 +74,7 @@ public RubyProc(
         this.callTarget = callTarget;
         this.declarationFrame = declarationFrame;
         this.declarationVariables = declarationVariables;
-        this.method = method;
+        this.declaringMethod = declaringMethod;
         this.frameOnStackMarker = frameOnStackMarker;
         this.declarationContext = declarationContext;
     }
@@ -91,15 +91,15 @@ public RubyProc withArity(Arity newArity, ArgumentDescriptor[] newArgumentDescri
                 callTarget,
                 declarationFrame,
                 declarationVariables,
-                method,
+                declaringMethod,
                 frameOnStackMarker,
                 declarationContext);
     }
 
     @Override
     public void getAdjacentObjects(Set<Object> reachable) {
         ObjectGraph.getObjectsInFrame(declarationFrame, reachable);
-        ObjectGraph.addProperty(reachable, method);
+        ObjectGraph.addProperty(reachable, declaringMethod);
     }
 
     public boolean isLambda() {

src/main/java/org/truffleruby/extra/TruffleGraalNodes.java

@@ -131,7 +131,7 @@ protected RubyProc copyCapturedLocals(RubyProc proc) {
                     newCallTarget,
                     newDeclarationFrame,
                     variables,
-                    proc.method,
+                    proc.declaringMethod,
                     proc.frameOnStackMarker,
                     proc.declarationContext);
 

src/main/java/org/truffleruby/language/methods/InternalMethod.java

@@ -67,7 +67,7 @@ public static InternalMethod fromProc(
         return new InternalMethod(
                 context,
                 sharedMethodInfo,
-                proc.method.getLexicalScope(),
+                proc.declaringMethod.getLexicalScope(),
                 declarationContext,
                 name,
                 declaringModule,

src/main/java/org/truffleruby/language/yield/CallBlockNode.java

@@ -99,7 +99,7 @@ private Object[] packArguments(DeclarationContext declarationContext, RubyProc b
         return RubyArguments.pack(
                 block.declarationFrame,
                 null,
-                block.method,
+                block.declaringMethod,
                 declarationContext,
                 block.frameOnStackMarker,
                 self,