[GR-28209] [GR-26395] Update graal import, which fixes warmup regression

PullRequest: truffleruby/2291

Author: OracleLabsAutomation

mx.truffleruby/suite.py

@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "d7cc62ad964d16258dc5cd5db4daede81d661076",
+                "version": "21a3c29d9b142a6005b4fe9bd5c0935cbdb28105",
                 "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": "d7cc62ad964d16258dc5cd5db4daede81d661076",
+                "version": "21a3c29d9b142a6005b4fe9bd5c0935cbdb28105",
                 "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/node_library_top_scope_spec.rb

@@ -9,23 +9,29 @@
 # GNU Lesser General Public License version 2.1.
 #
 
-# rubocop:disable Lint/UselessAssignment
-
-a = "a"
-
 describe "NodeLibrary top scope" do
   it "returns the members" do
-    b = "b"
-    def get_top_scope
-      c = "c"
-      Primitive.top_scope
-    end
-    top_scope = get_top_scope()
+    top_scope = Primitive.top_scope
+    Truffle::Boot::INTERACTIVE_BINDING.eval('top_scope_spec_var = :top_scope_spec')
+
     scope_members = Truffle::Interop.members(top_scope)
-    ["$stdout", "is_a?"].all? { |m| scope_members.include?(m) }.should == true
+    scope_members.should.include?('top_scope_spec_var')
+    scope_members.should.include?('$stdout')
+    scope_members.should.include?('is_a?')
+
+    scope_members.index('top_scope_spec_var').should < scope_members.index('$stdout')
+    scope_members.index('$stdout').should < scope_members.index('is_a?')
+
+    top_scope["top_scope_spec_var"].should == :top_scope_spec
     top_scope["$stdout"].should == $stdout
     top_scope["is_a?"].should be_kind_of(Method)
   end
-end
 
-# rubocop:enable Lint/UselessAssignment
+  it "is separate from TOPLEVEL_BINDING" do
+    TOPLEVEL_BINDING.eval('top_scope_spec_top_binding_var = nil')
+
+    TOPLEVEL_BINDING.local_variables.should.include?(:top_scope_spec_top_binding_var)
+    Truffle::Boot::INTERACTIVE_BINDING.local_variables.should_not.include?(:top_scope_spec_top_binding_var)
+    Truffle::Interop.members(Primitive.top_scope).should_not.include?('top_scope_spec_top_binding_var')
+  end
+end

src/main/java/org/truffleruby/core/binding/BindingNodes.java

@@ -498,4 +498,18 @@ protected RubyBinding binding(VirtualFrame frame) {
             return BindingNodes.createBinding(getContext(), getLanguage(), callerFrame);
         }
     }
+
+    @Primitive(name = "create_empty_binding")
+    public abstract static class CreateEmptyBindingNode extends PrimitiveArrayArgumentsNode {
+        @Specialization
+        protected RubyBinding binding(VirtualFrame frame) {
+            // Use the current frame to initialize the arguments, etc, correctly
+            final RubyBinding binding = BindingNodes
+                    .createBinding(getContext(), getLanguage(), frame.materialize(), getEncapsulatingSourceSection());
+            final MaterializedFrame newFrame = newFrame(binding, newFrameDescriptor());
+            RubyArguments.setDeclarationFrame(newFrame, null); // detach from the current frame
+            return binding;
+        }
+    }
+
 }

src/main/ruby/truffleruby/core/truffle/boot.rb

@@ -10,10 +10,10 @@
 
 # There must be no local variables at the top scope in this file,
 # as the TOPLEVEL_BINDING should be empty until the main script is executed.
-TOPLEVEL_BINDING = binding
+TOPLEVEL_BINDING = Primitive.create_empty_binding
 
 # The Binding used for sharing top-level locals of interactive Sources
-Truffle::Boot::INTERACTIVE_BINDING = binding
+Truffle::Boot::INTERACTIVE_BINDING = Primitive.create_empty_binding
 
 module Truffle::Boot