Renames for clarity

Author: eregon

src/main/java/org/truffleruby/language/RubyRootNode.java

@@ -84,7 +84,7 @@ public Object execute(VirtualFrame frame) {
     public FrameDescriptor getParentFrameDescriptor() {
         var info = getFrameDescriptor().getInfo();
         if (info instanceof BlockFrameDescriptorInfo) {
-            return ((BlockFrameDescriptorInfo) info).getDescriptor();
+            return ((BlockFrameDescriptorInfo) info).getParentDescriptor();
         } else {
             return null;
         }

src/main/java/org/truffleruby/language/locals/FindDeclarationVariableNodes.java

@@ -25,7 +25,6 @@
 import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.FrameDescriptor;
-import org.truffleruby.parser.BlockFrameDescriptorInfo;
 
 public abstract class FindDeclarationVariableNodes {
     public static final class FrameSlotAndDepth {
@@ -50,13 +49,6 @@ public static MaterializedFrame getOuterDeclarationFrame(MaterializedFrame topFr
         return frame;
     }
 
-    public static FrameDescriptor getOuterFrameDescriptor(FrameDescriptor descriptor) {
-        while (descriptor.getInfo() instanceof BlockFrameDescriptorInfo nextDescriptor) {
-            descriptor = nextDescriptor.getDescriptor();
-        }
-        return descriptor;
-    }
-
     private static int findSlot(FrameDescriptor descriptor, String name) {
         assert descriptor.getNumberOfAuxiliarySlots() == 0;
         int slots = descriptor.getNumberOfSlots();

src/main/java/org/truffleruby/parser/BlockFrameDescriptorInfo.java

@@ -15,29 +15,31 @@
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import org.truffleruby.language.threadlocal.SpecialVariableStorage;
 
+/** This is the {@link FrameDescriptor#getInfo() descriptor info} for blocks. The descriptor info for methods is an
+ * {@link SpecialVariableStorage#getAssumption(FrameDescriptor) Assumption}. */
 public final class BlockFrameDescriptorInfo {
 
     @ExplodeLoop
     public static FrameDescriptor getDeclarationFrameDescriptor(FrameDescriptor topDescriptor, int depth) {
         assert depth > 0;
         FrameDescriptor descriptor = topDescriptor;
         for (int i = 0; i < depth; i++) {
-            descriptor = ((BlockFrameDescriptorInfo) descriptor.getInfo()).getDescriptor();
+            descriptor = ((BlockFrameDescriptorInfo) descriptor.getInfo()).getParentDescriptor();
         }
         return descriptor;
     }
 
-    @CompilationFinal private FrameDescriptor descriptor;
+    @CompilationFinal private FrameDescriptor parentDescriptor;
     private final Assumption specialVariableAssumption;
 
     public BlockFrameDescriptorInfo(Assumption specialVariableAssumption) {
         assert SpecialVariableStorage.isSpecialVariableAssumption(specialVariableAssumption);
         this.specialVariableAssumption = specialVariableAssumption;
     }
 
-    public BlockFrameDescriptorInfo(FrameDescriptor descriptor) {
-        this.descriptor = descriptor;
-        this.specialVariableAssumption = getSpecialVariableAssumptionFromDescriptor(descriptor);
+    public BlockFrameDescriptorInfo(FrameDescriptor parentDescriptor) {
+        this.parentDescriptor = parentDescriptor;
+        this.specialVariableAssumption = getSpecialVariableAssumptionFromDescriptor(parentDescriptor);
     }
 
     private Assumption getSpecialVariableAssumptionFromDescriptor(FrameDescriptor descriptor) {
@@ -48,14 +50,14 @@ private Assumption getSpecialVariableAssumptionFromDescriptor(FrameDescriptor de
         }
     }
 
-    public FrameDescriptor getDescriptor() {
-        assert descriptor != null;
-        return descriptor;
+    public FrameDescriptor getParentDescriptor() {
+        assert parentDescriptor != null;
+        return parentDescriptor;
     }
 
-    void set(FrameDescriptor descriptor) {
-        assert this.descriptor == null;
-        this.descriptor = descriptor;
+    void setParentDescriptor(FrameDescriptor parentDescriptor) {
+        assert this.parentDescriptor == null;
+        this.parentDescriptor = parentDescriptor;
     }
 
     public Assumption getSpecialVariableAssumption() {

src/main/java/org/truffleruby/parser/TranslatorEnvironment.java

@@ -46,7 +46,10 @@ public final class TranslatorEnvironment {
     private EconomicMap<Object, Integer> nameToIndex = EconomicMap.create();
     private FrameDescriptor.Builder frameDescriptorBuilder;
     private FrameDescriptor frameDescriptor;
-    private final BlockFrameDescriptorInfo blockFrameDescriptorInfo;
+    /** The descriptor info is shared for all blocks at the same level (i.e., for TranslatorEnvironment direct
+     * children), in order to save footprint. It is therefore created in the parent TranslatorEnvironment of those
+     * blocks using that descriptor info. */
+    private final BlockFrameDescriptorInfo descriptorInfoForChildren;
 
     private final List<Integer> flipFlopStates = new ArrayList<>();
 
@@ -82,19 +85,18 @@ public TranslatorEnvironment(
 
         if (descriptor == null) {
             if (blockDepth > 0) {
-                BlockFrameDescriptorInfo parentBlockDescriptor = Objects
-                        .requireNonNull(parent.blockFrameDescriptorInfo);
-                this.frameDescriptorBuilder = newFrameDescriptorBuilderForBlock(parentBlockDescriptor);
-                this.blockFrameDescriptorInfo = new BlockFrameDescriptorInfo(
-                        parentBlockDescriptor.getSpecialVariableAssumption());
+                BlockFrameDescriptorInfo descriptorInfo = Objects.requireNonNull(parent.descriptorInfoForChildren);
+                this.frameDescriptorBuilder = newFrameDescriptorBuilderForBlock(descriptorInfo);
+                this.descriptorInfoForChildren = new BlockFrameDescriptorInfo(
+                        descriptorInfo.getSpecialVariableAssumption());
             } else {
                 var specialVariableAssumption = createSpecialVariableAssumption();
                 this.frameDescriptorBuilder = newFrameDescriptorBuilderForMethod(specialVariableAssumption);
-                this.blockFrameDescriptorInfo = new BlockFrameDescriptorInfo(specialVariableAssumption);
+                this.descriptorInfoForChildren = new BlockFrameDescriptorInfo(specialVariableAssumption);
             }
         } else {
             this.frameDescriptor = descriptor;
-            this.blockFrameDescriptorInfo = new BlockFrameDescriptorInfo(descriptor);
+            this.descriptorInfoForChildren = new BlockFrameDescriptorInfo(descriptor);
 
             assert descriptor.getNumberOfAuxiliarySlots() == 0;
             int slots = descriptor.getNumberOfSlots();
@@ -149,14 +151,9 @@ public boolean isTopLevelObjectScope() {
     }
 
     // region frame descriptor
-    public static FrameDescriptor.Builder newFrameDescriptorBuilderForBlock(BlockFrameDescriptorInfo parentBlockInfo) {
-        if (parentBlockInfo == null) {
-            throw CompilerDirectives.shouldNotReachHere(
-                    "Frame descriptor for block has to have parent");
-        }
-
+    public static FrameDescriptor.Builder newFrameDescriptorBuilderForBlock(BlockFrameDescriptorInfo descriptorInfo) {
         var builder = FrameDescriptor.newBuilder().defaultValue(Nil.INSTANCE);
-        builder.info(parentBlockInfo);
+        builder.info(Objects.requireNonNull(descriptorInfo));
 
         int selfIndex = builder.addSlot(FrameSlotKind.Illegal, SelfNode.SELF_IDENTIFIER, null);
         if (selfIndex != SelfNode.SELF_INDEX) {
@@ -298,7 +295,7 @@ public FrameDescriptor computeFrameDescriptor() {
         }
 
         frameDescriptor = frameDescriptorBuilder.build();
-        blockFrameDescriptorInfo.set(frameDescriptor);
+        descriptorInfoForChildren.setParentDescriptor(frameDescriptor);
         frameDescriptorBuilder = null;
         nameToIndex = null;
         return frameDescriptor;