remove usages of FrameUtil

Author: lukasstadler

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadLocalVariableNode.java

@@ -38,7 +38,6 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.FrameSlot;
-import com.oracle.truffle.api.frame.FrameUtil;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.StandardTags;
 import com.oracle.truffle.api.instrumentation.Tag;
@@ -65,26 +64,26 @@ public final FrameSlot getSlot() {
 
     @Specialization(guards = "frame.isBoolean(frameSlot)")
     boolean readLocalBoolean(VirtualFrame frame) {
-        return FrameUtil.getBooleanSafe(frame, frameSlot);
+        return frame.getBoolean(frameSlot);
     }
 
     @Specialization(guards = "frame.isInt(frameSlot)")
     int readLocalInt(VirtualFrame frame) {
-        return FrameUtil.getIntSafe(frame, frameSlot);
+        return frame.getInt(frameSlot);
     }
 
     @Specialization(guards = "frame.isLong(frameSlot)")
     long readLocalLong(VirtualFrame frame) {
-        return FrameUtil.getLongSafe(frame, frameSlot);
+        return frame.getLong(frameSlot);
     }
 
     @Specialization(guards = "frame.isDouble(frameSlot)")
     double readLocalDouble(VirtualFrame frame) {
-        return FrameUtil.getDoubleSafe(frame, frameSlot);
+        return frame.getDouble(frameSlot);
     }
 
     protected final Object getObjectResult(VirtualFrame frame) {
-        return FrameUtil.getObjectSafe(frame, frameSlot);
+        return frame.getObject(frameSlot);
     }
 
     @Specialization(guards = {"frame.isObject(frameSlot)", "result != null"})

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/ExpressionDefinitionNode.java

@@ -33,7 +33,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameSlot;
-import com.oracle.truffle.api.frame.FrameUtil;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.ValueProfile;
@@ -60,7 +59,7 @@ PCell[] getClosureFromLocals(Frame frame) {
 
         for (int i = 0; i < freeVarDefinitionSlots.length; i++) {
             FrameSlot defFrameSlot = freeVarDefinitionSlots[i];
-            Object cell = FrameUtil.getObjectSafe(frame, defFrameSlot);
+            Object cell = frame.getObject(defFrameSlot);
             assert cell instanceof PCell : "getting closure from locals: expected a cell";
             closure[i] = (PCell) cell;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/FunctionRootNode.java

@@ -39,7 +39,6 @@
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
-import com.oracle.truffle.api.frame.FrameUtil;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.NodeUtil;
@@ -146,7 +145,7 @@ private void initializeCellVars(Frame frame) {
             // get the cell
             PCell cell = null;
             if (isGenerator) {
-                cell = (PCell) FrameUtil.getObjectSafe(frame, frameSlot);
+                cell = (PCell) frame.getObject(frameSlot);
             }
             if (cell == null) {
                 cell = new PCell(cellEffectivelyFinalAssumptions[i]);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/ReadGeneratorFrameVariableNode.java

@@ -42,7 +42,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameSlot;
-import com.oracle.truffle.api.frame.FrameUtil;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.instrumentation.StandardTags;
 import com.oracle.truffle.api.instrumentation.Tag;
@@ -73,29 +72,29 @@ public final FrameSlot getSlot() {
     @Specialization(guards = "generatorFrame.isBoolean(frameSlot)")
     boolean readLocalBoolean(@SuppressWarnings("unused") VirtualFrame frame,
                     @Bind("getGeneratorFrame(frame)") Frame generatorFrame) {
-        return FrameUtil.getBooleanSafe(generatorFrame, frameSlot);
+        return generatorFrame.getBoolean(frameSlot);
     }
 
     @Specialization(guards = "generatorFrame.isInt(frameSlot)")
     int readLocalInt(@SuppressWarnings("unused") VirtualFrame frame,
                     @Bind("getGeneratorFrame(frame)") Frame generatorFrame) {
-        return FrameUtil.getIntSafe(generatorFrame, frameSlot);
+        return generatorFrame.getInt(frameSlot);
     }
 
     @Specialization(guards = "generatorFrame.isLong(frameSlot)")
     long readLocalLong(@SuppressWarnings("unused") VirtualFrame frame,
                     @Bind("getGeneratorFrame(frame)") Frame generatorFrame) {
-        return FrameUtil.getLongSafe(generatorFrame, frameSlot);
+        return generatorFrame.getLong(frameSlot);
     }
 
     @Specialization(guards = "generatorFrame.isDouble(frameSlot)")
     double readLocalDouble(@SuppressWarnings("unused") VirtualFrame frame,
                     @Bind("getGeneratorFrame(frame)") Frame generatorFrame) {
-        return FrameUtil.getDoubleSafe(generatorFrame, frameSlot);
+        return generatorFrame.getDouble(frameSlot);
     }
 
     protected final Object getObjectResult(Frame frame) {
-        return FrameUtil.getObjectSafe(frame, frameSlot);
+        return frame.getObject(frameSlot);
     }
 
     @Specialization(guards = {"generatorFrame.isObject(frameSlot)", "result != null"})

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/ScopeEnvironment.java

@@ -72,7 +72,6 @@
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.FrameSlot;
 import com.oracle.truffle.api.frame.FrameSlotKind;
-import com.oracle.truffle.api.frame.FrameUtil;
 
 public class ScopeEnvironment implements CellFrameSlotSupplier {
 
@@ -531,7 +530,7 @@ public void setFreeVarsInRootScope(Frame frame) {
             for (Object identifier : frame.getFrameDescriptor().getIdentifiers()) {
                 FrameSlot frameSlot = frame.getFrameDescriptor().findFrameSlot(identifier);
                 if (frameSlot != null && frame.isObject(frameSlot)) {
-                    Object value = FrameUtil.getObjectSafe(frame, frameSlot);
+                    Object value = frame.getObject(frameSlot);
                     if (value instanceof PCell) {
                         globalScope.addFreeVar((String) frameSlot.getIdentifier(), false);
                     }