jruby · Apr 12, 2016 · Apr 14, 2016 · Apr 14, 2016 · Apr 14, 2016 · Apr 14, 2016
diff --git a/bin/jruby-cext-c b/bin/jruby-cext-c
@@ -51,7 +51,7 @@ LL = []
 
 SRC.each do |src|
   ll = File.join(File.dirname(src), File.basename(src, '.*') + '.ll')
-  mx 'su-clang', '-Ilib/ruby/truffle/cext', '-S', '-emit-llvm', src, '-o', ll
+  mx 'su-clang', "-I#{SULONG_DIR}/include", '-Ilib/ruby/truffle/cext', '-S', '-emit-llvm', src, '-o', ll
   LL.push ll
 end
 

diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -1866,6 +1866,7 @@ public boolean isTruffle() {
     public static String IR_COMPILER_PASSES = Options.IR_COMPILER_PASSES.load();
     public static String IR_JIT_PASSES = Options.IR_JIT_PASSES.load();
     public static String IR_INLINE_COMPILER_PASSES = Options.IR_INLINE_COMPILER_PASSES.load();
+    public static boolean RECORD_LEXICAL_HIERARCHY = Options.RECORD_LEXICAL_HIERARCHY.load();
 
     public static final boolean COROUTINE_FIBERS = Options.FIBER_COROUTINES.load();
 

diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -190,7 +190,7 @@ public IRScope(IRManager manager, IRScope lexicalParent, String name,
     }
 
     private void setupLexicalContainment() {
-        if (manager.isDryRun() || RubyInstanceConfig.IR_WRITING) {
+        if (manager.isDryRun() || RubyInstanceConfig.IR_WRITING || RubyInstanceConfig.RECORD_LEXICAL_HIERARCHY) {
             lexicalChildren = new ArrayList<>(1);
             if (lexicalParent != null) lexicalParent.addChildScope(this);
         }

diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -165,6 +165,7 @@ public class Options {
     public static final Option<Boolean> PREFER_IPV4 = bool(MISCELLANEOUS, "net.preferIPv4", true, "Prefer IPv4 network stack");
     public static final Option<Boolean> FCNTL_LOCKING = bool(MISCELLANEOUS, "file.flock.fcntl", true, "Use fcntl rather than flock for File#flock");
     public static final Option<Boolean> VOLATILE_VARIABLES = bool(MISCELLANEOUS, "volatile.variables", true, "Always ensure volatile semantics for instance variables.");
+    public static final Option<Boolean> RECORD_LEXICAL_HIERARCHY = bool(MISCELLANEOUS, "record.lexical.hierarchy", false, "Maintain children static scopes to support scope dumping.");
 
     public static final Option<Boolean> DEBUG_LOADSERVICE = bool(DEBUG, "debug.loadService", false, "Log require/load file searches.");
     public static final Option<Boolean> DEBUG_LOADSERVICE_TIMING = bool(DEBUG, "debug.loadService.timing", false, "Log require/load parse+evaluate times.");

diff --git a/lib/ruby/truffle/cext/ruby.h b/lib/ruby/truffle/cext/ruby.h
@@ -26,15 +26,25 @@ extern "C" {
 typedef void *ID;
 typedef void *VALUE;
 
-extern VALUE Qfalse;
-extern VALUE Qtrue;
-extern VALUE Qnil;
+VALUE get_Qfalse();
+VALUE get_Qtrue();
+VALUE get_Qnil();
 
-extern VALUE rb_cObject;
-extern VALUE rb_cArray;
-extern VALUE rb_cHash;
+#define Qfalse get_Qfalse()
+#define Qtrue get_Qtrue()
+#define Qnil get_Qnil()
 
-extern VALUE rb_eRuntimeError;
+VALUE get_rb_cObject();
+VALUE get_rb_cArray();
+VALUE get_rb_cHash();
+
+#define rb_cObject get_rb_cObject()
+#define rb_cArray get_rb_cArray()
+#define rb_cHash get_rb_cHash()
+
+VALUE get_rb_eRuntimeError();
+
+#define rb_eRuntimeError get_rb_eRuntimeError();
 
 int NUM2INT(VALUE value);
 unsigned int NUM2UINT(VALUE value);
@@ -53,14 +63,14 @@ VALUE LONG2FIX(long value);
 
 int FIXNUM_P(VALUE value);
 
-char* RSTRING_PTR(VALUE string);
+char *RSTRING_PTR(VALUE string);
 int RSTRING_LEN(VALUE string);
 ID rb_intern(const char *string);
 VALUE rb_intern_str(VALUE string);
 void rb_str_cat(VALUE string, char *to_concat, long length);
 
 int RARRAY_LEN(VALUE array);
-VALUE* RARRAY_PTR(VALUE array);
+VALUE *RARRAY_PTR(VALUE array);
 VALUE rb_ary_new_capa(long capacity);
 VALUE rb_ary_new2();
 VALUE rb_ary_new();
@@ -71,9 +81,9 @@ VALUE rb_ary_entry(VALUE array, long index);
 VALUE rb_hash_aref(VALUE hash, VALUE key);
 void rb_hash_aset(VALUE hash, VALUE key, VALUE value);
 
-void rb_scan_args(int, VALUE*, char *, ...);
+void rb_scan_args(int argc, VALUE *argv, char *format, ...);
 
-VALUE rb_funcall(VALUE object, ID, int, ...);
+VALUE rb_funcall(VALUE object, ID name, int argc, ...);
 
 VALUE rb_iv_get(VALUE object, const char *name);
 VALUE rb_iv_set(VALUE object, const char *name, VALUE value);

diff --git a/spec/truffle/specs/truffle/array/append_spec.rb b/spec/truffle/specs/truffle/array/append_spec.rb
@@ -1,24 +1,10 @@
-# Copyright (c) 2008 Engine Yard, Inc. All rights reserved.
-
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use,
-# copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following
-# conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# Copyright (c) 2016 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 1.0
+# GNU General Public License version 2
+# GNU Lesser General Public License version 2.1
 # OTHER DEALINGS IN THE SOFTWARE.
 
 require_relative '../../../../ruby/spec_helper'

diff --git a/spec/truffle/specs/truffle/array/element_set_spec.rb b/spec/truffle/specs/truffle/array/element_set_spec.rb
@@ -0,0 +1,114 @@
+# Copyright (c) 2016 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 1.0
+# GNU General Public License version 2
+# GNU Lesser General Public License version 2.1
+
+require_relative '../../../../ruby/spec_helper'
+
+describe "Array#[]=" do
+  def storage(ary)
+    Truffle::Primitive.array_storage(ary)
+  end
+
+  before :each do
+    @long = 1 << 52
+  end
+
+  it "migrates to the most specific storage if initially empty" do
+    ary = []
+    ary[0] = Object.new
+    storage(ary).should == "Object[]"
+
+    ary = []
+    ary[0] = 3.14
+    storage(ary).should == "double[]"
+
+    ary = []
+    ary[0] = @long
+    storage(ary).should == "long[]"
+
+    ary = []
+    ary[0] = 1
+    storage(ary).should == "int[]"
+  end
+
+  it "keeps the same storage if compatible and in bounds" do
+    ary = [Object.new, Object.new]
+    ary[1] = Object.new
+    storage(ary).should == "Object[]"
+
+    ary = [3.11, 3.12]
+    ary[1] = 3.14
+    storage(ary).should == "double[]"
+
+    ary = [@long-2, @long-1]
+    ary[1] = @long
+    storage(ary).should == "long[]"
+
+    ary = [@long-2, @long-1]
+    ary[1] = 3
+    storage(ary).should == "long[]"
+
+    ary = [0, 1]
+    ary[1] = 2
+    storage(ary).should == "int[]"
+  end
+
+  it "generalizes if not compatible and in bounds" do
+    ary = [3.11, 3.12]
+    ary[1] = Object.new
+    storage(ary).should == "Object[]"
+
+    ary = [@long-2, @long-1]
+    ary[1] = 3.14
+    storage(ary).should == "Object[]"
+
+    ary = [0, 1]
+    ary[1] = @long
+    storage(ary).should == "long[]"
+
+    ary = [0, 1]
+    ary[1] = Object.new
+    storage(ary).should == "Object[]"
+  end
+
+  it "keeps the same storage if compatible and appending" do
+    ary = [Object.new, Object.new]
+    ary[2] = Object.new
+    storage(ary).should == "Object[]"
+
+    ary = [3.11, 3.12]
+    ary[2] = 3.14
+    storage(ary).should == "double[]"
+
+    ary = [@long-2, @long-1]
+    ary[2] = @long
+    storage(ary).should == "long[]"
+
+    ary = [0, 1]
+    ary[2] = 2
+    storage(ary).should == "int[]"
+  end
+
+  it "migrates to Object[] if writing out of bounds" do
+    ary = [Object.new, Object.new]
+    ary[3] = Object.new
+    storage(ary).should == "Object[]"
+
+    ary = [3.11, 3.12]
+    ary[3] = 3.14
+    storage(ary).should == "Object[]"
+
+    ary = [@long-2, @long-1]
+    ary[3] = @long
+    storage(ary).should == "Object[]"
+
+    ary = [0, 1]
+    ary[3] = 2
+    storage(ary).should == "Object[]"
+  end
+end
+
diff --git a/spec/truffle/tags/core/io/reopen_tags.txt b/spec/truffle/tags/core/io/reopen_tags.txt
@@ -1,3 +1,4 @@
 fails:IO#reopen with a String effects exec/system/fork performed after it
 fails:IO#reopen with a String opens a path after writing to the original file descriptor
+fails:IO#reopen with a String positions an instance that has been read from at the beginning of the new stream
 slow:IO#reopen with a String effects exec/system/fork performed after it
diff --git a/spec/truffle/tags/truffle/array/element_set_tags.txt b/spec/truffle/tags/truffle/array/element_set_tags.txt
@@ -0,0 +1 @@
+fails:Array#[]= keeps the same storage if compatible and in bounds
diff --git a/test/truffle/integration/irb.sh b/test/truffle/integration/irb.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+
+ruby -X+T -S irb < test/truffle/integration/irb/input.txt > temp.txt
+
+if ! cmp --silent temp.txt test/truffle/integration/irb/output.txt
+then
+  echo IRB output was not as expected
+  rm -f temp.txt
+  exit 1
+else
+  rm -f temp.txt
+fi
diff --git a/test/truffle/integration/irb/input.txt b/test/truffle/integration/irb/input.txt
@@ -0,0 +1,3 @@
+14
+14 + 2
+exit
diff --git a/test/truffle/integration/irb/output.txt b/test/truffle/integration/irb/output.txt
@@ -0,0 +1,6 @@
+Switch to inspect mode.
+14
+14
+14 + 2
+16
+exit
diff --git a/test/truffle/integration/long-tests.txt b/test/truffle/integration/long-tests.txt
@@ -1,2 +1,2 @@
-rails.sh
+rails-app.sh
 gem-testing.sh
diff --git a/test/truffle/integration/rails.sh → test/truffle/integration/rails-app.sh b/test/truffle/integration/rails.sh → test/truffle/integration/rails-app.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-cd test/truffle/integration/rails
+cd test/truffle/integration/rails-app
 
 JRUBY_BIN=../../../../bin
 JRUBY=$JRUBY_BIN/jruby

diff --git a/test/truffle/integration/rails/.gitignore → .../truffle/integration/rails-app/.gitignore b/test/truffle/integration/rails/.gitignore → .../truffle/integration/rails-app/.gitignore
diff --git a/...fle/integration/rails/.jruby+truffle.yaml → ...integration/rails-app/.jruby+truffle.yaml b/...fle/integration/rails/.jruby+truffle.yaml → ...integration/rails-app/.jruby+truffle.yaml
diff --git a/test/truffle/integration/rails/Gemfile → test/truffle/integration/rails-app/Gemfile b/test/truffle/integration/rails/Gemfile → test/truffle/integration/rails-app/Gemfile
diff --git a/test/truffle/integration/rails/Gemfile.lock → ...ruffle/integration/rails-app/Gemfile.lock b/test/truffle/integration/rails/Gemfile.lock → ...ruffle/integration/rails-app/Gemfile.lock
diff --git a/test/truffle/integration/rails/Rakefile → test/truffle/integration/rails-app/Rakefile b/test/truffle/integration/rails/Rakefile → test/truffle/integration/rails-app/Rakefile
diff --git a/...integration/rails/app/assets/images/.keep → ...gration/rails-app/app/assets/images/.keep b/...integration/rails/app/assets/images/.keep → ...gration/rails-app/app/assets/images/.keep
diff --git a/...ls/app/assets/stylesheets/application.css → ...pp/app/assets/stylesheets/application.css b/...ls/app/assets/stylesheets/application.css → ...pp/app/assets/stylesheets/application.css
diff --git a/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb b/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb
diff --git a/...tion/rails/app/controllers/concerns/.keep → .../rails-app/app/controllers/concerns/.keep b/...tion/rails/app/controllers/concerns/.keep → .../rails-app/app/controllers/concerns/.keep
diff --git a/...ails/app/controllers/people_controller.rb → ...-app/app/controllers/people_controller.rb b/...ails/app/controllers/people_controller.rb → ...-app/app/controllers/people_controller.rb
diff --git a/...n/rails/app/helpers/application_helper.rb → ...ils-app/app/helpers/application_helper.rb b/...n/rails/app/helpers/application_helper.rb → ...ils-app/app/helpers/application_helper.rb
diff --git a/...tegration/rails/app/models/concerns/.keep → ...ation/rails-app/app/models/concerns/.keep b/...tegration/rails/app/models/concerns/.keep → ...ation/rails-app/app/models/concerns/.keep
diff --git a/...le/integration/rails/app/models/person.rb → ...ntegration/rails-app/app/models/person.rb b/...le/integration/rails/app/models/person.rb → ...ntegration/rails-app/app/models/person.rb
diff --git a/...ls/app/views/layouts/application.html.erb → ...pp/app/views/layouts/application.html.erb b/...ls/app/views/layouts/application.html.erb → ...pp/app/views/layouts/application.html.erb
diff --git a/...egration/rails/app/views/people/index.erb → ...tion/rails-app/app/views/people/index.erb b/...egration/rails/app/views/people/index.erb → ...tion/rails-app/app/views/people/index.erb
diff --git a/test/truffle/integration/rails/bin/bundle → .../truffle/integration/rails-app/bin/bundle b/test/truffle/integration/rails/bin/bundle → .../truffle/integration/rails-app/bin/bundle
diff --git a/test/truffle/integration/rails/bin/rails → test/truffle/integration/rails-app/bin/rails b/test/truffle/integration/rails/bin/rails → test/truffle/integration/rails-app/bin/rails
diff --git a/test/truffle/integration/rails/bin/rake → test/truffle/integration/rails-app/bin/rake b/test/truffle/integration/rails/bin/rake → test/truffle/integration/rails-app/bin/rake
diff --git a/test/truffle/integration/rails/bin/setup → test/truffle/integration/rails-app/bin/setup b/test/truffle/integration/rails/bin/setup → test/truffle/integration/rails-app/bin/setup
diff --git a/test/truffle/integration/rails/config.ru → test/truffle/integration/rails-app/config.ru b/test/truffle/integration/rails/config.ru → test/truffle/integration/rails-app/config.ru
diff --git a/...e/integration/rails/config/application.rb → ...tegration/rails-app/config/application.rb b/...e/integration/rails/config/application.rb → ...tegration/rails-app/config/application.rb
diff --git a/.../truffle/integration/rails/config/boot.rb → ...ffle/integration/rails-app/config/boot.rb b/.../truffle/integration/rails/config/boot.rb → ...ffle/integration/rails-app/config/boot.rb
diff --git a/...fle/integration/rails/config/database.yml → ...integration/rails-app/config/database.yml b/...fle/integration/rails/config/database.yml → ...integration/rails-app/config/database.yml
diff --git a/...e/integration/rails/config/environment.rb → ...tegration/rails-app/config/environment.rb b/...e/integration/rails/config/environment.rb → ...tegration/rails-app/config/environment.rb
diff --git a/.../rails/config/environments/development.rb → ...ls-app/config/environments/development.rb b/.../rails/config/environments/development.rb → ...ls-app/config/environments/development.rb
diff --git a/...n/rails/config/environments/production.rb → ...ils-app/config/environments/production.rb b/...n/rails/config/environments/production.rb → ...ils-app/config/environments/production.rb
diff --git a/...gration/rails/config/environments/test.rb → ...ion/rails-app/config/environments/test.rb b/...gration/rails/config/environments/test.rb → ...ion/rails-app/config/environments/test.rb
diff --git a/...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb b/...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb
diff --git a/...config/initializers/cookies_serializer.rb → ...config/initializers/cookies_serializer.rb b/...config/initializers/cookies_serializer.rb → ...config/initializers/cookies_serializer.rb
diff --git a/.../initializers/filter_parameter_logging.rb → .../initializers/filter_parameter_logging.rb b/.../initializers/filter_parameter_logging.rb → .../initializers/filter_parameter_logging.rb
diff --git a/.../rails/config/initializers/inflections.rb → ...ls-app/config/initializers/inflections.rb b/.../rails/config/initializers/inflections.rb → ...ls-app/config/initializers/inflections.rb
diff --git a/...n/rails/config/initializers/mime_types.rb → ...ils-app/config/initializers/mime_types.rb b/...n/rails/config/initializers/mime_types.rb → ...ils-app/config/initializers/mime_types.rb
diff --git a/...ails/config/initializers/session_store.rb → ...-app/config/initializers/session_store.rb b/...ails/config/initializers/session_store.rb → ...-app/config/initializers/session_store.rb
diff --git a/...ls/config/initializers/wrap_parameters.rb → ...pp/config/initializers/wrap_parameters.rb b/...ls/config/initializers/wrap_parameters.rb → ...pp/config/initializers/wrap_parameters.rb
diff --git a/...e/integration/rails/config/locales/en.yml → ...tegration/rails-app/config/locales/en.yml b/...e/integration/rails/config/locales/en.yml → ...tegration/rails-app/config/locales/en.yml
diff --git a/...ruffle/integration/rails/config/routes.rb → ...le/integration/rails-app/config/routes.rb b/...ruffle/integration/rails/config/routes.rb → ...le/integration/rails-app/config/routes.rb
diff --git a/...ffle/integration/rails/config/secrets.yml → .../integration/rails-app/config/secrets.yml b/...ffle/integration/rails/config/secrets.yml → .../integration/rails-app/config/secrets.yml
diff --git a/...ruffle/integration/rails/lib/assets/.keep → ...le/integration/rails-app/lib/assets/.keep b/...ruffle/integration/rails/lib/assets/.keep → ...le/integration/rails-app/lib/assets/.keep
diff --git a/...truffle/integration/rails/lib/tasks/.keep → ...fle/integration/rails-app/lib/tasks/.keep b/...truffle/integration/rails/lib/tasks/.keep → ...fle/integration/rails-app/lib/tasks/.keep
diff --git a/test/truffle/integration/rails/log/.keep → test/truffle/integration/rails-app/log/.keep b/test/truffle/integration/rails/log/.keep → test/truffle/integration/rails-app/log/.keep
diff --git a/...truffle/integration/rails/public/404.html → ...fle/integration/rails-app/public/404.html b/...truffle/integration/rails/public/404.html → ...fle/integration/rails-app/public/404.html
diff --git a/...truffle/integration/rails/public/422.html → ...fle/integration/rails-app/public/422.html b/...truffle/integration/rails/public/422.html → ...fle/integration/rails-app/public/422.html
diff --git a/...truffle/integration/rails/public/500.html → ...fle/integration/rails-app/public/500.html b/...truffle/integration/rails/public/500.html → ...fle/integration/rails-app/public/500.html
diff --git a/...ffle/integration/rails/public/favicon.ico → .../integration/rails-app/public/favicon.ico b/...ffle/integration/rails/public/favicon.ico → .../integration/rails-app/public/favicon.ico
diff --git a/...uffle/integration/rails/public/robots.txt → ...e/integration/rails-app/public/robots.txt b/...uffle/integration/rails/public/robots.txt → ...e/integration/rails-app/public/robots.txt
diff --git a/.../rails/public/stylesheets/application.css → ...ls-app/public/stylesheets/application.css b/.../rails/public/stylesheets/application.css → ...ls-app/public/stylesheets/application.css
diff --git a/...gration/rails/public/stylesheets/kube.css → ...ion/rails-app/public/stylesheets/kube.css b/...gration/rails/public/stylesheets/kube.css → ...ion/rails-app/public/stylesheets/kube.css
diff --git a/.../integration/rails/test/controllers/.keep → ...egration/rails-app/test/controllers/.keep b/.../integration/rails/test/controllers/.keep → ...egration/rails-app/test/controllers/.keep
diff --git a/...fle/integration/rails/test/fixtures/.keep → ...integration/rails-app/test/fixtures/.keep b/...fle/integration/rails/test/fixtures/.keep → ...integration/rails-app/test/fixtures/.keep
diff --git a/...ffle/integration/rails/test/helpers/.keep → .../integration/rails-app/test/helpers/.keep b/...ffle/integration/rails/test/helpers/.keep → .../integration/rails-app/test/helpers/.keep
diff --git a/.../integration/rails/test/integration/.keep → ...egration/rails-app/test/integration/.keep b/.../integration/rails/test/integration/.keep → ...egration/rails-app/test/integration/.keep
diff --git a/...ffle/integration/rails/test/mailers/.keep → .../integration/rails-app/test/mailers/.keep b/...ffle/integration/rails/test/mailers/.keep → .../integration/rails-app/test/mailers/.keep
diff --git a/...uffle/integration/rails/test/models/.keep → ...e/integration/rails-app/test/models/.keep b/...uffle/integration/rails/test/models/.keep → ...e/integration/rails-app/test/models/.keep
diff --git a/...fle/integration/rails/test/test_helper.rb → ...integration/rails-app/test/test_helper.rb b/...fle/integration/rails/test/test_helper.rb → ...integration/rails-app/test/test_helper.rb
diff --git a/...ion/rails/vendor/assets/javascripts/.keep → ...rails-app/vendor/assets/javascripts/.keep b/...ion/rails/vendor/assets/javascripts/.keep → ...rails-app/vendor/assets/javascripts/.keep
diff --git a/...ion/rails/vendor/assets/stylesheets/.keep → ...rails-app/vendor/assets/stylesheets/.keep b/...ion/rails/vendor/assets/stylesheets/.keep → ...rails-app/vendor/assets/stylesheets/.keep
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -269,6 +269,7 @@ def help
     puts '    --server        run an instrumentation server on port 8080'
     puts '    --igv           make sure IGV is running and dump Graal graphs after partial escape (implies --graal)'
     puts '        --full      show all phases, not just up to the Truffle partial escape'
+    puts '    --bips          run with benchmark-ips on the load path (implies --graal)'
     puts '    --jdebug        run a JDWP debug server on #{JDEBUG_PORT}'
     puts '    --jexception[s] print java exceptions'
     puts 'jt e 14 + 2                                    evaluate an expression'
@@ -355,9 +356,10 @@ def run(*args)
     ]
 
     {
-        '--asm' => '--graal',
-        '--igv' => '--graal',
-        '--sulong' => '--graal'
+      '--asm' => '--graal',
+      '--igv' => '--graal',
+      '--sulong' => '--graal',
+      '--bips' => '--graal'
     }.each_pair do |arg, dep|
       args.unshift dep if args.include?(arg)
     end
@@ -387,6 +389,13 @@ def run(*args)
       jruby_args += %w[-J-XX:+UnlockDiagnosticVMOptions -J-XX:CompileCommand=print,*::callRoot]
     end
 
+    if args.delete('--bips')
+      bips_version = '2.6.1'
+      bips = "#{JRUBY_DIR}/lib/ruby/gems/shared/gems/benchmark-ips-#{bips_version}/lib"
+      sh 'bin/jruby', 'bin/gem', 'install', 'benchmark-ips', '-v', bips_version unless Dir.exist?(bips)
+      jruby_args << "-I#{bips}"
+    end
+
     if args.delete('--jdebug')
       jruby_args << JDEBUG
     end

diff --git a/truffle/src/main/c/cext/.jruby-cext-build.yml b/truffle/src/main/c/cext/.jruby-cext-build.yml
@@ -0,0 +1,2 @@
+src: ./*.c
+out: ruby.su
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:Array#[]= keeps the same storage if compatible and in bounds