[GR-25085] Update Truffle to profile arguments of IndirectCallNode

PullRequest: truffleruby/2420

Author: eregon

mx.truffleruby/suite.py

@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "95a9dddea10b7a8704e66aa0050d49ce354e6ae6",
+                "version": "8c1abd10ad2992580462d7629db316177a256f82",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind" : "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
@@ -16,7 +16,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "95a9dddea10b7a8704e66aa0050d49ce354e6ae6",
+                "version": "8c1abd10ad2992580462d7629db316177a256f82",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

spec/truffle/interop/iterator_spec.rb

@@ -0,0 +1,26 @@
+# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 2.0, or
+# GNU General Public License version 2, or
+# GNU Lesser General Public License version 2.1.
+
+require_relative '../../ruby/spec_helper'
+require_relative 'fixtures/classes'
+
+describe "Truffle::Interop iterator messages" do
+  it "allow to iterate an array" do
+    obj = [1, 2]
+    Truffle::Interop.should.has_iterator?(obj)
+    iterator = Truffle::Interop.iterator(obj)
+    Truffle::Interop.should.iterator?(iterator)
+
+    Truffle::Interop.has_iterator_next_element?(iterator).should == true
+    Truffle::Interop.iterator_next_element(iterator).should == 1
+    Truffle::Interop.has_iterator_next_element?(iterator).should == true
+    Truffle::Interop.iterator_next_element(iterator).should == 2
+    Truffle::Interop.has_iterator_next_element?(iterator).should == false
+    -> { Truffle::Interop.iterator_next_element(iterator) }.should raise_error(StopIteration)
+  end
+end

src/main/java/org/truffleruby/core/CoreLibrary.java

@@ -161,6 +161,7 @@ public class CoreLibrary {
     public final RubyClass systemStackErrorClass;
     public final RubyClass securityErrorClass;
     public final RubyClass standardErrorClass;
+    public final RubyClass stopIterationClass;
     public final RubyModule polyglotModule;
     public final RubyClass unsupportedMessageErrorClass;
     public final RubyClass stringClass;
@@ -360,7 +361,7 @@ public CoreLibrary(RubyContext context, RubyLanguage language) {
         // StandardError > IndexError
         indexErrorClass = defineClass(standardErrorClass, "IndexError");
         keyErrorClass = defineClass(indexErrorClass, "KeyError");
-        RubyClass stopIterationClass = defineClass(indexErrorClass, "StopIteration");
+        stopIterationClass = defineClass(indexErrorClass, "StopIteration");
         closedQueueErrorClass = defineClass(stopIterationClass, "ClosedQueueError");
 
         // StandardError > IOError

src/main/java/org/truffleruby/core/exception/CoreExceptions.java

@@ -254,10 +254,6 @@ public RubyException argumentError(Rope message, Node currentNode, Throwable jav
                 javaThrowable);
     }
 
-    public RubyException argumentErrorInvalidBigDecimal(String string, Node currentNode) {
-        return argumentError(StringUtils.format("invalid value for BigDecimal(): \"%s\"", string), currentNode);
-    }
-
     @TruffleBoundary
     public RubyException argumentErrorCantUnfreeze(Object self, Node currentNode) {
         String className = LogicalClassNode.getUncached().execute(self).fields.getName();
@@ -451,6 +447,16 @@ public RubyException indexErrorInvalidBufferOffsetException(InvalidBufferOffsetE
         return indexError("invalid buffer offset " + exception.getByteOffset(), currentNode);
     }
 
+    // StopIteration
+
+    @TruffleBoundary
+    public RubyException stopIteration(String message, Node currentNode) {
+        RubyClass exceptionClass = context.getCoreLibrary().stopIterationClass;
+        RubyString errorMessage = StringOperations
+                .createString(context, language, StringOperations.encodeRope(message, UTF8Encoding.INSTANCE));
+        return ExceptionOperations.createRubyException(context, exceptionClass, errorMessage, currentNode, null);
+    }
+
     // LocalJumpError
 
     @TruffleBoundary

src/main/java/org/truffleruby/interop/InteropNodes.java

@@ -2097,10 +2097,9 @@ protected Object getTopScope(
             return context.getTopScopeObject();
         }
     }
-    // endregion scope
+    // endregion
 
     // region Buffer Messages
-
     @CoreMethod(names = "has_buffer_elements?", onSingleton = true, required = 1)
     public abstract static class HasBufferElementsNode extends InteropCoreMethodArrayArgumentsNode {
 
@@ -2438,7 +2437,68 @@ protected Object writeBufferDouble(Object receiver, ByteOrder order, long byteOf
         }
 
     }
+    // endregion
+
+    // region Iterator
+    @CoreMethod(names = "has_iterator?", onSingleton = true, required = 1)
+    public abstract static class HasIteratorNode extends InteropCoreMethodArrayArgumentsNode {
+        @Specialization(limit = "getCacheLimit()")
+        protected boolean hasIterator(Object receiver,
+                @CachedLibrary("receiver") InteropLibrary interop) {
+            return interop.hasIterator(receiver);
+        }
+    }
+
+    @CoreMethod(names = "iterator?", onSingleton = true, required = 1)
+    public abstract static class IsIteratorNode extends InteropCoreMethodArrayArgumentsNode {
+        @Specialization(limit = "getCacheLimit()")
+        protected boolean isIterator(Object receiver,
+                @CachedLibrary("receiver") InteropLibrary interop) {
+            return interop.isIterator(receiver);
+        }
+    }
 
-    // endregion Buffer Messages
+    @CoreMethod(names = "iterator", onSingleton = true, required = 1)
+    public abstract static class GetIteratorNode extends InteropCoreMethodArrayArgumentsNode {
+        @Specialization(limit = "getCacheLimit()")
+        protected Object getIterator(Object receiver,
+                @CachedLibrary("receiver") InteropLibrary interop,
+                @Cached TranslateInteropExceptionNode translateInteropException) {
+            try {
+                return interop.getIterator(receiver);
+            } catch (UnsupportedMessageException e) {
+                throw translateInteropException.execute(e);
+            }
+        }
+    }
+
+    @CoreMethod(names = "has_iterator_next_element?", onSingleton = true, required = 1)
+    public abstract static class HasIteratorNextElementNode extends InteropCoreMethodArrayArgumentsNode {
+        @Specialization(limit = "getCacheLimit()")
+        protected boolean hasIteratorNextElement(Object receiver,
+                @CachedLibrary("receiver") InteropLibrary interop,
+                @Cached TranslateInteropExceptionNode translateInteropException) {
+            try {
+                return interop.hasIteratorNextElement(receiver);
+            } catch (UnsupportedMessageException e) {
+                throw translateInteropException.execute(e);
+            }
+        }
+    }
+
+    @CoreMethod(names = "iterator_next_element", onSingleton = true, required = 1)
+    public abstract static class GetIteratorNextElementNode extends InteropCoreMethodArrayArgumentsNode {
+        @Specialization(limit = "getCacheLimit()")
+        protected Object getIteratorNextElement(Object receiver,
+                @CachedLibrary("receiver") InteropLibrary interop,
+                @Cached TranslateInteropExceptionNode translateInteropException) {
+            try {
+                return interop.getIteratorNextElement(receiver);
+            } catch (InteropException e) {
+                throw translateInteropException.execute(e);
+            }
+        }
+    }
+    // endregion
 
 }

src/main/java/org/truffleruby/interop/TranslateInteropExceptionNode.java

@@ -10,12 +10,12 @@
 package org.truffleruby.interop;
 
 import com.oracle.truffle.api.interop.InvalidBufferOffsetException;
+import com.oracle.truffle.api.interop.StopIterationException;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.control.RaiseException;
 
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.CachedContext;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -111,7 +111,6 @@ protected RuntimeException handle(
         }
     }
 
-    @TruffleBoundary // Throwable#initCause
     @Specialization
     protected RuntimeException handle(
             UnsupportedTypeException exception,
@@ -137,4 +136,17 @@ protected RuntimeException handle(ArityException exception, boolean inInvokeMemb
                 exception);
     }
 
+    @Specialization
+    protected RuntimeException handle(
+            StopIterationException exception,
+            boolean inInvokeMember,
+            Object receiver,
+            Object[] args,
+            @CachedContext(RubyLanguage.class) RubyContext context) {
+        return new RaiseException(
+                context,
+                context.getCoreExceptions().stopIteration(exception.getMessage(), this),
+                exception);
+    }
+
 }