jruby · Mar 24, 2016 · Mar 24, 2016 · Mar 24, 2016 · Mar 24, 2016 · Mar 24, 2016
diff --git a/core/src/main/java/org/jruby/parser/ParserSupport.java b/core/src/main/java/org/jruby/parser/ParserSupport.java
@@ -545,11 +545,11 @@ public void checkUselessStatements(BlockNode blockNode) {
 	 **/
     private boolean checkAssignmentInCondition(Node node) {
         if (node instanceof MultipleAsgnNode) {
-            lexer.compile_error(PID.MULTIPLE_ASSIGNMENT_IN_CONDITIONAL, "Multiple assignment in conditional.");
+            lexer.compile_error(PID.MULTIPLE_ASSIGNMENT_IN_CONDITIONAL, "multiple assignment in conditional");
         } else if (node instanceof LocalAsgnNode || node instanceof DAsgnNode || node instanceof GlobalAsgnNode || node instanceof InstAsgnNode) {
             Node valueNode = ((AssignableNode) node).getValueNode();
             if (valueNode instanceof ILiteralNode || valueNode instanceof NilNode || valueNode instanceof TrueNode || valueNode instanceof FalseNode) {
-                warnings.warn(ID.ASSIGNMENT_IN_CONDITIONAL, node.getPosition(), "Found '=' in conditional, should be '=='.");
+                warnings.warn(ID.ASSIGNMENT_IN_CONDITIONAL, node.getPosition(), "found = in conditional, should be ==");
             }
             return true;
         } 

diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -251,6 +251,7 @@ public class Options {
     public static final Option<Integer> TRUFFLE_CLASS_CACHE = integer(TRUFFLE, "truffle.class.cache", TRUFFLE_DEFAULT_CACHE.load(), ".class and .metaclass cache size");
     public static final Option<Integer> TRUFFLE_ENCODING_COMPATIBLE_QUERY_CACHE = integer(TRUFFLE, "truffle.encoding_compatible_query.cache", TRUFFLE_DEFAULT_CACHE.load(), "Encoding.compatible? cache size");
     public static final Option<Integer> TRUFFLE_THREAD_CACHE = integer(TRUFFLE, "truffle.thread.cache", TRUFFLE_DEFAULT_CACHE.load(), "Cache size of operations that depend on a particular thread");
+    public static final Option<Integer> TRUFFLE_ROPE_CLASS_CACHE = integer(TRUFFLE, "truffle.rope_class.cache", 6, "Cache size for rope operations that depend on a concrete rope implementation to avoid virtual calls");
 
     public static final Option<Boolean> TRUFFLE_CLONE_DEFAULT = bool(TRUFFLE, "truffle.clone.default", true, "Default option for cloning.");
     public static final Option<Boolean> TRUFFLE_INLINE_DEFAULT = bool(TRUFFLE, "truffle.inline.default", true, "Default option for inlining.");

diff --git a/spec/truffle/tags/core/kernel/require_tags.txt b/spec/truffle/tags/core/kernel/require_tags.txt
@@ -32,15 +32,3 @@ fails:Kernel.require ($LOAD_FEATURES) when a non-extensioned file is in $LOADED_
 fails:Kernel.require ($LOAD_FEATURES) when a non-extensioned file is in $LOADED_FEATURES returns false when passed a path and the file is not found
 fails:Kernel.require (shell expansion) performs tilde expansion on a .rb file before storing paths in $LOADED_FEATURES
 fails:Kernel.require (shell expansion) performs tilde expansion on a non-extensioned file before storing paths in $LOADED_FEATURES
-fails:Kernel#require stores the missing path in a LoadError object
-fails:Kernel.require stores the missing path in a LoadError object
-fails:Kernel#require (concurrently) blocks a second thread from returning while the 1st is still requiring
-fails:Kernel.require (concurrently) blocks a second thread from returning while the 1st is still requiring
-fails:Kernel#require (concurrently) blocks based on the path
-fails:Kernel.require (concurrently) blocks based on the path
-fails:Kernel#require (concurrently) allows a 2nd require if the 1st raised an exception
-fails:Kernel.require (concurrently) allows a 2nd require if the 1st raised an exception
-fails:Kernel#require (concurrently) blocks a 3rd require if the 1st raises an exception and the 2nd is still running
-fails:Kernel.require (concurrently) blocks a 3rd require if the 1st raises an exception and the 2nd is still running
-slow:Kernel#require (concurrently) blocks based on the path
-slow:Kernel.require (concurrently) blocks based on the path
diff --git a/test/mri/runner.rb b/test/mri/runner.rb
@@ -20,6 +20,9 @@ class Gem::TestCase < MiniTest::Unit::TestCase
 
 ENV["GEM_SKIP"] = ENV["GEM_HOME"] = ENV["GEM_PATH"] = "".freeze
 
+# Use MRI backtraces for tests that verify error output
+ENV["JRUBY_OPTS"] += ENV["JRUBY_OPTS"].to_s + " -Xbacktrace.style=mri"
+
 require_relative 'lib/profile_test_all' if ENV.has_key?('RUBY_TEST_ALL_PROFILE')
 #require_relative 'lib/tracepointchecker'
 require_relative 'lib/zombie_hunter'

diff --git a/test/truffle/compiler/pe/core/string_pe.rb b/test/truffle/compiler/pe/core/string_pe.rb
@@ -23,6 +23,14 @@
 example "x = 'abc'; x == x.dup", true
 example "x = 'abc'; 'abc' == x.dup", true
 
+example "'A' == String.from_codepoint(65, Encoding::US_ASCII)", true
+example "'A' == 65.chr", true
+example "'A'.ord == 65", true
+
+example "'aba'[0] == 'aca'[-1]", true
+
+example "x = 'abc'; x == x.b", true
+
 example "'abc'.ascii_only?", true
 example "'こにちわ'.ascii_only?", false
 
@@ -35,3 +43,9 @@
 example "''.empty?", true
 example "'abc'.empty?", false
 example "'こにちわ'.empty?", false
+
+example "x = 'abc'; y = 'xyz'; x.replace(y) == y", true
+
+example "'abc'.getbyte(0) == 97", true
+example "'abc'.getbyte(-1) == 99", true
+example "'abc'.getbyte(10_000) == nil", true
diff --git a/test/truffle/compiler/pe/language/defined_pe.rb b/test/truffle/compiler/pe/language/defined_pe.rb
@@ -6,8 +6,8 @@
 # GNU General Public License version 2
 # GNU Lesser General Public License version 2.1
 
-tagged_example "defined?(true) == 'true'", true
-tagged_example "defined?(false) == 'false'", true
-tagged_example "defined?(self) == 'self'", true
-tagged_example "defined?(14) == 'expression'", true
-tagged_example "defined?(14 + 2) == 'expression'", true
+example "defined?(true) == 'true'", true
+example "defined?(false) == 'false'", true
+example "defined?(self) == 'self'", true
+example "defined?(14) == 'expression'", true
+tagged_example "defined?(14 + 2) == 'method'", true
diff --git a/tool/truffle/bisect.rb b/tool/truffle/bisect.rb
@@ -13,10 +13,11 @@
 
 Then choose a THRESHOLD (between the number from the compare and 100%) and
 $ git bisect start BADCOMMIT GOODCOMMIT
-$ git bisect run ruby tool/truffle-bisect.rb BENCH THRESHOLD
+$ git bisect run ruby tool/truffle/bisect.rb BENCH THRESHOLD
 =end
 
 def jt(cmd)
+  puts "jt #{cmd}"
   cmd = "ruby tool/jt.rb #{cmd}"
   output = `#{cmd}`
   raise "#{cmd} failed: #{$?}" unless $?.success?
@@ -31,26 +32,24 @@ def jt(cmd)
 bench = String(ARGV[0])
 threshold = Integer(ARGV[1])
 
-jt 'build' rescue nil
-unless $?.success?
-  puts "Normal build failed, doing a rebuild"
+begin
   jt 'rebuild'
+rescue
+  puts "rebuild failed, skipping revision"
+  exit 125
 end
 
-output = (jt("bench compare #{bench}") rescue nil)
-unless $?.success?
-  puts "Benchmark failed, trying a rebuild"
-  jt 'rebuild'
-  output = jt("bench compare #{bench}")
-end
+output = jt("bench compare #{bench}")
 
 /^#{Regexp.escape bench} (\d+)\./ =~ output
 raise "Unexpected output:\n#{output}" unless $1
 percents = Integer($1)
 puts percents
 
 if percents < threshold
+  puts "bad"
   exit 1
 else
+  puts "good"
   exit 0
 end
diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -17,7 +17,7 @@
   repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
               :id => 'truffle' )
 
-  truffle_version = '1645cfe49997e03f40681d18f45d2ea6841df0b1-SNAPSHOT'
+  truffle_version = '47a45558a6e6ca5398e2ebb5579d0891b3a8f282-SNAPSHOT'
   jar 'com.oracle.truffle:truffle-api:' + truffle_version
   jar 'com.oracle.truffle:truffle-debug:' + truffle_version
   jar 'com.oracle.truffle:truffle-dsl-processor:' + truffle_version, :scope => 'provided'

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -41,23 +41,23 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-api</artifactId>
-      <version>1645cfe49997e03f40681d18f45d2ea6841df0b1-SNAPSHOT</version>
+      <version>47a45558a6e6ca5398e2ebb5579d0891b3a8f282-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-debug</artifactId>
-      <version>1645cfe49997e03f40681d18f45d2ea6841df0b1-SNAPSHOT</version>
+      <version>47a45558a6e6ca5398e2ebb5579d0891b3a8f282-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-dsl-processor</artifactId>
-      <version>1645cfe49997e03f40681d18f45d2ea6841df0b1-SNAPSHOT</version>
+      <version>47a45558a6e6ca5398e2ebb5579d0891b3a8f282-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-tck</artifactId>
-      <version>1645cfe49997e03f40681d18f45d2ea6841df0b1-SNAPSHOT</version>
+      <version>47a45558a6e6ca5398e2ebb5579d0891b3a8f282-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/truffle/src/main/antlr4/org/jruby/truffle/core/format/parser/PrintfLexer.g4 b/truffle/src/main/antlr4/org/jruby/truffle/core/format/parser/PrintfLexer.g4
@@ -10,7 +10,7 @@
 lexer grammar PrintfLexer;
 
 FORMAT  : '%' -> mode(FORMAT_MODE);
-LITERAL : (~'%')* ;
+LITERAL : (~'%')+ ;
 
 mode FORMAT_MODE;
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/core/kernel/KernelNodes.java
@@ -1590,22 +1590,30 @@ public boolean require(VirtualFrame frame, DynamicObject featureString, @Cached(
             final String feature = featureString.toString();
 
             // Pysch loads either the jar or the so - we need to intercept
-            if (feature.equals("psych.so") && callerIs("psych.rb")) {
+            if (feature.equals("psych.so") && callerIs("stdlib/psych.rb")) {
                 getContext().getFeatureLoader().require(frame, "truffle/psych.rb", callNode);
                 return true;
             }
 
             // TODO CS 1-Mar-15 ERB will use strscan if it's there, but strscan is not yet complete, so we need to hide it
-            if (feature.equals("strscan") && callerIs("erb.rb")) {
+            if (feature.equals("strscan") && callerIs("stdlib/erb.rb")) {
                 throw new RaiseException(coreLibrary().loadErrorCannotLoad(feature, this));
             }
 
             return getContext().getFeatureLoader().require(frame, feature, callNode);
         }
 
         private boolean callerIs(String caller) {
-            return getContext().getCallStack().getCallerFrameIgnoringSend().getCallNode()
-                    .getEncapsulatingSourceSection().getSource().getName().endsWith(caller);
+            for (Activation activation : getContext().getCallStack().getBacktrace(this).getActivations()) {
+
+                final Source source = activation.getCallNode().getEncapsulatingSourceSection().getSource();
+
+                if (source != null && source.getName().endsWith(caller)) {
+                    return true;
+                }
+            }
+
+            return false;
         }
     }
 
@@ -2003,17 +2011,17 @@ private DynamicObject finishFormat(int formatLength, PackResult result) {
             final DynamicObject string = createString(new ByteList((byte[]) result.getOutput(), 0, result.getOutputLength()));
 
             if (formatLength == 0) {
-                StringOperations.forceEncoding(string, USASCIIEncoding.INSTANCE);
+                StringOperations.forceEncodingVerySlow(string, USASCIIEncoding.INSTANCE);
             } else {
                 switch (result.getEncoding()) {
                     case DEFAULT:
                     case ASCII_8BIT:
                         break;
                     case US_ASCII:
-                        StringOperations.forceEncoding(string, USASCIIEncoding.INSTANCE);
+                        StringOperations.forceEncodingVerySlow(string, USASCIIEncoding.INSTANCE);
                         break;
                     case UTF_8:
-                        StringOperations.forceEncoding(string, UTF8Encoding.INSTANCE);
+                        StringOperations.forceEncodingVerySlow(string, UTF8Encoding.INSTANCE);
                         break;
                     default:
                         throw new UnsupportedOperationException();

diff --git a/truffle/src/main/java/org/jruby/truffle/core/regexp/InterpolatedRegexpNode.java b/truffle/src/main/java/org/jruby/truffle/core/regexp/InterpolatedRegexpNode.java
@@ -56,9 +56,9 @@ public Object execute(VirtualFrame frame) {
             final Rope source = Layouts.REGEXP.getSource(regexp);
 
             if (!BodyTranslator.all7Bit(preprocessed.getByteList().bytes())) {
-                Layouts.REGEXP.setSource(regexp, RopeOperations.withEncoding(source, getContext().getJRubyRuntime().getEncodingService().getAscii8bitEncoding()));
+                Layouts.REGEXP.setSource(regexp, RopeOperations.withEncodingVerySlow(source, getContext().getJRubyRuntime().getEncodingService().getAscii8bitEncoding()));
             } else {
-                Layouts.REGEXP.setSource(regexp, RopeOperations.withEncoding(source, getContext().getJRubyRuntime().getEncodingService().getUSAsciiEncoding()));
+                Layouts.REGEXP.setSource(regexp, RopeOperations.withEncodingVerySlow(source, getContext().getJRubyRuntime().getEncodingService().getUSAsciiEncoding()));
             }
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpNodes.java b/truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpNodes.java
@@ -295,7 +295,7 @@ public static Regex compile(Node currentNode, RubyContext context, Rope bytes, R
             //if (regexpOptions.isEncodingNone()) setEncodingNone();
 
             Regex ret = new Regex(unescaped.getUnsafeBytes(), unescaped.getBegin(), unescaped.getBegin() + unescaped.getRealSize(), options.toJoniOptions(), enc, Syntax.RUBY);
-            ret.setUserObject(RopeOperations.withEncoding(bytes, enc));
+            ret.setUserObject(RopeOperations.withEncodingVerySlow(bytes, enc));
 
             return ret;
         } catch (ValueException e) {

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeNodes.java
@@ -17,7 +17,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.CreateCast;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.NodeChildren;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -29,7 +28,7 @@
 import org.jcodings.specific.USASCIIEncoding;
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.truffle.RubyContext;
-import org.jruby.truffle.core.numeric.FixnumLowerNodeGen;
+import org.jruby.truffle.language.NotProvided;
 import org.jruby.truffle.language.RubyNode;
 import org.jruby.util.ByteList;
 import org.jruby.util.StringSupport;
@@ -76,7 +75,7 @@ public Rope substringZeroBytes(Rope base, int offset, int byteLength,
                 return RopeConstants.EMPTY_ASCII_8BIT_ROPE;
             }
 
-            return RopeOperations.withEncoding(RopeConstants.EMPTY_UTF8_ROPE, base.getEncoding());
+            return RopeOperations.withEncodingVerySlow(RopeConstants.EMPTY_UTF8_ROPE, base.getEncoding());
         }
 
         @Specialization(guards = "byteLength == 1")
@@ -98,7 +97,7 @@ public Rope substringOneByte(Rope base, int offset, int byteLength,
                 return RopeConstants.ASCII_8BIT_SINGLE_BYTE_ROPES[index];
             }
 
-            return RopeOperations.withEncoding(RopeConstants.ASCII_8BIT_SINGLE_BYTE_ROPES[index], base.getEncoding());
+            return RopeOperations.withEncodingVerySlow(RopeConstants.ASCII_8BIT_SINGLE_BYTE_ROPES[index], base.getEncoding());
         }
 
         @Specialization(guards = { "byteLength > 1", "sameAsBase(base, offset, byteLength)" })
@@ -298,6 +297,10 @@ protected static boolean isMutableRope(Rope rope) {
     })
     public abstract static class MakeLeafRopeNode extends RubyNode {
 
+        public static MakeLeafRopeNode create(RubyContext context, SourceSection sourceSection) {
+            return RopeNodesFactory.MakeLeafRopeNodeGen.create(context, sourceSection, null, null, null, null);
+        }
+
         public MakeLeafRopeNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
@@ -563,4 +566,65 @@ private void printPreamble(int level) {
         }
 
     }
+
+    @NodeChildren({
+            @NodeChild(type = RubyNode.class, value = "rope"),
+            @NodeChild(type = RubyNode.class, value = "encoding"),
+            @NodeChild(type = RubyNode.class, value = "codeRange")
+    })
+    public abstract static class WithEncodingNode extends RubyNode {
+
+        public WithEncodingNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public abstract Rope executeWithEncoding(Rope rope, Encoding encoding, CodeRange codeRange);
+
+        @Specialization(guards = "rope.getEncoding() == encoding")
+        public Rope withEncodingSameEncoding(Rope rope, Encoding encoding, CodeRange codeRange) {
+            return rope;
+        }
+
+        @Specialization(guards = {
+                "rope.getEncoding() != encoding",
+                "rope.getCodeRange() == codeRange"
+        })
+        public Rope withEncodingSameCodeRange(Rope rope, Encoding encoding, CodeRange codeRange) {
+            return rope.withEncoding(encoding, codeRange);
+        }
+
+        @Specialization(guards = {
+                "rope.getEncoding() != encoding",
+                "rope.getCodeRange() != codeRange",
+                "isAsciiCompatbileChange(rope, encoding)",
+                "rope.getClass() == cachedRopeClass"
+        }, limit = "getCacheLimit()")
+        public Rope withEncodingCr7Bit(Rope rope, Encoding encoding, CodeRange codeRange,
+                                       @Cached("rope.getClass()") Class<? extends Rope> cachedRopeClass) {
+            return cachedRopeClass.cast(rope).withEncoding(encoding, CodeRange.CR_7BIT);
+        }
+
+        @Specialization(guards = {
+                "rope.getEncoding() != encoding",
+                "rope.getCodeRange() != codeRange",
+                "!isAsciiCompatbileChange(rope, encoding)"
+        })
+        public Rope withEncoding(Rope rope, Encoding encoding, CodeRange codeRange,
+                                 @Cached("create(getContext(), getSourceSection())") MakeLeafRopeNode makeLeafRopeNode) {
+            return makeLeafRopeNode.executeMake(rope.getBytes(), encoding, codeRange, NotProvided.INSTANCE);
+        }
+
+        protected static boolean isAsciiCompatbileChange(Rope rope, Encoding encoding) {
+            return rope.getCodeRange() == CR_7BIT && encoding.isAsciiCompatible();
+        }
+
+        protected static boolean is7Bit(Rope rope) {
+            return rope.getCodeRange() == CR_7BIT;
+        }
+
+        protected int getCacheLimit() {
+            return getContext().getOptions().ROPE_CLASS_CACHE;
+        }
+
+    }
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java
@@ -85,7 +85,7 @@ public static LeafRope create(byte[] bytes, Encoding encoding, CodeRange codeRan
         }
     }
 
-    public static Rope withEncoding(Rope originalRope, Encoding newEncoding, CodeRange newCodeRange) {
+    public static Rope withEncodingVerySlow(Rope originalRope, Encoding newEncoding, CodeRange newCodeRange) {
         if ((originalRope.getEncoding() == newEncoding) && (originalRope.getCodeRange() == newCodeRange)) {
             return originalRope;
         }
@@ -101,8 +101,8 @@ public static Rope withEncoding(Rope originalRope, Encoding newEncoding, CodeRan
         return create(originalRope.getBytes(), newEncoding, newCodeRange);
     }
 
-    public static Rope withEncoding(Rope originalRope, Encoding newEncoding) {
-        return withEncoding(originalRope, newEncoding, originalRope.getCodeRange());
+    public static Rope withEncodingVerySlow(Rope originalRope, Encoding newEncoding) {
+        return withEncodingVerySlow(originalRope, newEncoding, originalRope.getCodeRange());
     }
 
     @TruffleBoundary