[hotfix] Add int mul specialization, add PList specialization in NextNode.

PullRequest: graalpython/150

Author: lukasstadler

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java

@@ -567,6 +567,11 @@ int doII(int x, int y) throws ArithmeticException {
             return Math.multiplyExact(x, y);
         }
 
+        @Specialization(replaces = "doII")
+        long doIIL(int x, int y) {
+            return x * (long) y;
+        }
+
         @Specialization(rewriteOn = ArithmeticException.class)
         long doLL(long x, long y) {
             return Math.multiplyExact(x, y);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorBuiltins.java

@@ -36,13 +36,16 @@
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.iterator.PRangeIterator.PRangeReverseIterator;
+import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.sequence.PSequence;
+import com.oracle.graal.python.runtime.sequence.SequenceUtil.NormalizeIndexNode;
+import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
@@ -146,6 +149,20 @@ public Object next(PBaseSetIterator self) {
             throw raise(StopIteration);
         }
 
+        @Specialization(guards = "self.isPList()")
+        public Object nextList(PSequenceIterator self,
+                        @Cached("createClassProfile()") ValueProfile storageProfile,
+                        @Cached("create()") NormalizeIndexNode normalize) {
+            SequenceStorage storage = storageProfile.profile(((PList) self.getPSequence()).getSequenceStorage());
+            int length = storage.length();
+            if (!self.stopIterationReached && self.index < length) {
+                int index = normalize.execute(self.index++, length, "list index out of range");
+                return storage.getItemNormalized(index);
+            }
+            self.stopIterationReached = true;
+            throw raise(StopIteration);
+        }
+
         @Specialization(guards = "self.isPSequence()")
         public Object next(PSequenceIterator self,
                         @Cached("createClassProfile()") ValueProfile sequenceProfile) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/PSequenceIterator.java

@@ -25,6 +25,7 @@
  */
 package com.oracle.graal.python.builtins.objects.iterator;
 
+import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 
@@ -49,4 +50,8 @@ public PSequence getPSequence() {
     public boolean isPSequence() {
         return sequence instanceof PSequence;
     }
+
+    public boolean isPList() {
+        return sequence instanceof PList;
+    }
 }