remove obsolete options

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/ListNodes.java

@@ -68,7 +68,6 @@
 import com.oracle.graal.python.nodes.control.GetNextNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.sequence.PSequence;
@@ -102,11 +101,7 @@ public final static class CreateListFromIteratorNode extends PBaseNode {
 
         private final ConditionProfile errorProfile = ConditionProfile.createBinaryProfile();
 
-        @CompilationFinal private ListStorageType type;
-
-        public CreateListFromIteratorNode() {
-            this.type = PythonOptions.getOption(getContext(), PythonOptions.UnboxSequenceStorage) ? ListStorageType.Uninitialized : ListStorageType.Generic;
-        }
+        @CompilationFinal private ListStorageType type = ListStorageType.Uninitialized;
 
         public static CreateListFromIteratorNode create() {
             return new CreateListFromIteratorNode();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/GetIteratorNode.java

@@ -46,7 +46,6 @@
 import com.oracle.graal.python.nodes.control.GetIteratorNodeGen.IsIteratorObjectNodeGen;
 import com.oracle.graal.python.nodes.expression.UnaryOpNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -94,38 +93,22 @@ public PythonObject doPRange(PRange value) {
 
     @Specialization(guards = "iterCannotBeOverridden(value)")
     public PythonObject doPIntArray(PIntArray value) {
-        if (PythonOptions.getOption(getContext(), PythonOptions.UnboxSequenceIteration)) {
-            return factory().createIntArrayIterator(value);
-        } else {
-            return factory().createSequenceIterator(value);
-        }
+        return factory().createIntArrayIterator(value);
     }
 
     @Specialization(guards = "iterCannotBeOverridden(value)")
     public PythonObject doPLongArray(PLongArray value) {
-        if (PythonOptions.getOption(getContext(), PythonOptions.UnboxSequenceIteration)) {
-            return factory().createLongArrayIterator(value);
-        } else {
-            return factory().createSequenceIterator(value);
-        }
+        return factory().createLongArrayIterator(value);
     }
 
     @Specialization(guards = "iterCannotBeOverridden(value)")
     public PythonObject doPDoubleArray(PDoubleArray value) {
-        if (PythonOptions.getOption(getContext(), PythonOptions.UnboxSequenceIteration)) {
-            return factory().createDoubleArrayIterator(value);
-        } else {
-            return factory().createSequenceIterator(value);
-        }
+        return factory().createDoubleArrayIterator(value);
     }
 
     @Specialization(guards = "iterCannotBeOverridden(value)")
     public PythonObject doCharArray(PCharArray value) {
-        if (PythonOptions.getOption(getContext(), PythonOptions.UnboxSequenceIteration)) {
-            return factory().createCharArrayIterator(value);
-        } else {
-            return factory().createSequenceIterator(value);
-        }
+        return factory().createCharArrayIterator(value);
     }
 
     @Specialization(guards = "iterCannotBeOverridden(value)")

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/ListLiteralNode.java

@@ -30,7 +30,6 @@
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.nodes.PNode;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.sequence.storage.DoubleSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.IntSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.ListSequenceStorage;
@@ -49,11 +48,10 @@ public final class ListLiteralNode extends LiteralNode {
 
     @Children protected final PNode[] values;
 
-    @CompilationFinal private ListStorageType type;
+    @CompilationFinal private ListStorageType type = ListStorageType.Uninitialized;
 
     public ListLiteralNode(PNode[] values) {
         this.values = values;
-        this.type = PythonOptions.getOption(getContext(), PythonOptions.UnboxSequenceStorage) ? ListStorageType.Uninitialized : ListStorageType.Generic;
     }
 
     public PNode[] getValues() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java

@@ -46,15 +46,6 @@ private PythonOptions() {
     @Option(category = OptionCategory.DEBUG, help = "Print the java stacktrace if enabled") //
     public static final OptionKey<Boolean> WithJavaStacktrace = new OptionKey<>(false);
 
-    @Option(category = OptionCategory.DEBUG, help = "") //
-    public static final OptionKey<Boolean> TraceSequenceStorageGeneralization = new OptionKey<>(false);
-
-    @Option(category = OptionCategory.DEBUG, help = "") //
-    public static final OptionKey<Boolean> UnboxSequenceStorage = new OptionKey<>(true);
-
-    @Option(category = OptionCategory.DEBUG, help = "") //
-    public static final OptionKey<Boolean> UnboxSequenceIteration = new OptionKey<>(true);
-
     @Option(category = OptionCategory.DEBUG, help = "") //
     public static final OptionKey<Boolean> IntrinsifyBuiltinCalls = new OptionKey<>(true);
 
@@ -76,9 +67,6 @@ private PythonOptions() {
     @Option(category = OptionCategory.DEBUG, help = "") //
     public static final OptionKey<Boolean> CatchGraalPythonExceptionForUnitTesting = new OptionKey<>(false);
 
-    @Option(category = OptionCategory.DEBUG, help = "") //
-    public static final OptionKey<Boolean> ForceLongType = new OptionKey<>(false);
-
     @Option(category = OptionCategory.DEBUG, help = "") //
     public static final OptionKey<Boolean> CatchAllExceptions = new OptionKey<>(false);