Cleanup

Author: eregon

src/main/java/org/truffleruby/language/threadlocal/SpecialVariableStorage.java

@@ -51,9 +51,13 @@ public static Assumption getAssumption(FrameDescriptor descriptor) {
         return (Assumption) descriptor.getInfo();
     }
 
+    public static boolean isSpecialVariableAssumption(Assumption assumption) {
+        return assumption.getName() == ASSUMPTION_NAME;
+    }
+
     public static boolean hasSpecialVariableAssumption(FrameDescriptor descriptor) {
         var info = descriptor.getInfo();
-        return info instanceof Assumption assumption && assumption.getName() == ASSUMPTION_NAME;
+        return info instanceof Assumption assumption && isSpecialVariableAssumption(assumption);
     }
 
     public static boolean hasSpecialVariableStorageSlot(Frame frame) {
@@ -65,7 +69,7 @@ private static boolean hasSpecialVariableStorageSlot(FrameDescriptor descriptor)
         assert SLOT_INDEX < descriptor.getNumberOfSlots();
         assert descriptor.getSlotName(SLOT_INDEX) == SLOT_NAME;
         Assumption assumption = (Assumption) descriptor.getInfo();
-        return assumption.getName() == ASSUMPTION_NAME;
+        return isSpecialVariableAssumption(assumption);
     }
 
     /** $~ */

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

@@ -15,8 +15,6 @@
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import org.truffleruby.language.threadlocal.SpecialVariableStorage;
 
-import static org.truffleruby.language.threadlocal.SpecialVariableStorage.ASSUMPTION_NAME;
-
 public final class BlockFrameDescriptorInfo {
 
     @ExplodeLoop
@@ -33,12 +31,11 @@ public static FrameDescriptor getDeclarationFrameDescriptor(FrameDescriptor topD
     private final Assumption specialVariableAssumption;
 
     public BlockFrameDescriptorInfo(Assumption specialVariableAssumption) {
-        assert specialVariableAssumption != null && specialVariableAssumption.getName() == ASSUMPTION_NAME;
+        assert SpecialVariableStorage.isSpecialVariableAssumption(specialVariableAssumption);
         this.specialVariableAssumption = specialVariableAssumption;
     }
 
     public BlockFrameDescriptorInfo(FrameDescriptor descriptor) {
-        assert descriptor != null && descriptor.getInfo() != null;
         this.descriptor = descriptor;
         this.specialVariableAssumption = getSpecialVariableAssumptionFromDescriptor(descriptor);
     }

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

@@ -191,7 +191,6 @@ private static FrameDescriptor.Builder newFrameDescriptorBuilderForMethod(Assump
         return builder;
     }
 
-
     public static FrameDescriptor.Builder newFrameDescriptorBuilderForMethod() {
         var specialVariableAssumption = createSpecialVariableAssumption();
         return newFrameDescriptorBuilderForMethod(specialVariableAssumption);