jruby · Apr 15, 2016 · Apr 15, 2016 · Apr 15, 2016 · Apr 15, 2016 · Apr 15, 2016
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/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/truffle/src/main/java/org/jruby/truffle/core/format/printf/PrintfTreeBuilder.java b/truffle/src/main/java/org/jruby/truffle/core/format/printf/PrintfTreeBuilder.java
@@ -139,25 +139,22 @@ public void exitFormat(PrintfParser.FormatContext ctx) {
 
         switch (type) {
             case 's':
+            case 'p':
+                final String conversionMethodName = type == 's' ? "to_s" : "inspect";
+                final FormatNode conversionNode;
+
                 if (ctx.ANGLE_KEY() == null) {
-                    if (spacePadding == DEFAULT) {
-                        node = WriteBytesNodeGen.create(context, ReadStringNodeGen.create(
-                                context, true, "to_s", false, EMPTY_BYTES,
-                                        new SourceNode()));
-                    } else {
-                        node = WritePaddedBytesNodeGen.create(context, spacePadding, leftJustified,
-                                ReadStringNodeGen.create(context, true, "to_s", false, EMPTY_BYTES,
-                                        new SourceNode()));
-                    }
+                    conversionNode = ReadStringNodeGen.create(context, true, conversionMethodName, false, EMPTY_BYTES, new SourceNode());
                 } else {
-                    if (spacePadding == DEFAULT) {
-                        node = WriteBytesNodeGen.create(context, ToStringNodeGen.create(
-                                context, true, "to_s", false, EMPTY_BYTES, valueNode));
-                    } else {
-                        node = WritePaddedBytesNodeGen.create(context, spacePadding, leftJustified,
-                                ToStringNodeGen.create(context, true, "to_s", false, EMPTY_BYTES, valueNode));
-                    }
+                    conversionNode = ToStringNodeGen.create(context, true, conversionMethodName, false, EMPTY_BYTES, valueNode);
                 }
+
+                if (spacePadding == DEFAULT) {
+                    node = WriteBytesNodeGen.create(context, conversionNode);
+                } else {
+                    node = WritePaddedBytesNodeGen.create(context, spacePadding, leftJustified, conversionNode);
+                }
+
                 break;
             case 'd':
             case 'i':

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fails:Array#[]= keeps the same storage if compatible and in bounds