jruby · Jun 14, 2015 · Jun 14, 2015 · Jun 14, 2015 · Jun 14, 2015
diff --git a/bin/jruby.bash b/bin/jruby.bash
@@ -146,6 +146,13 @@ for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
     JRUBY_ALREADY_ADDED=true
 done
 
+# The Truffle jar always needs to be on the boot classpath so that the VM can
+# substitute classes. We add it even if the jar isn't necessarily available,
+# but this doesn't cause any problems.
+if [ -e "$JRUBY_HOME/lib/jruby-truffle.jar" ]; then
+  JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
+fi
+
 if $cygwin; then
     JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
 fi

diff --git a/bin/jruby.sh b/bin/jruby.sh
@@ -107,6 +107,12 @@ for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
     JRUBY_ALREADY_ADDED=true
 done
 
+# The Truffle jar always needs to be on the boot classpath so that the VM can
+# substitute classes. We add it even if the jar isn't necessarily available,
+# but this doesn't cause any problems.
+if [ -e "$JRUBY_HOME/lib/jruby-truffle.jar" ]; then
+  JRUBY_CP="$JRUBY_CP$CP_DELIMITER$JRUBY_HOME/lib/jruby-truffle.jar"
+fi
 
 # ----- Set Up The System Classpath -------------------------------------------
 

diff --git a/test/truffle/pe/language/constant_pe.rb b/test/truffle/pe/language/constant_pe.rb
@@ -51,7 +51,9 @@ def self.const_missing(const)
 example "ConstantFixtures.get_existing"
 example "ConstantFixtures.get"
 example "ConstantFixtures.get_const_get(:A)"
-example "ConstantFixtures.get_const_get('A')"
+
+# Internal Graal compiler error
+tagged_example "ConstantFixtures.get_const_get('A')"
 
 example "ConstantFixtures::Nested.get_nested"
 example "ConstantFixtures::Child.get_inherited"

diff --git a/test/truffle/pe/pe.rb b/test/truffle/pe/pe.rb
@@ -56,27 +56,38 @@ def tagged_example(code)
 
 tested = 0
 failed = 0
-tagged = 0
+errored = 0
+timedout = 0
 
 EXAMPLES.each do |code, expected_constant, tagged|
+  next if tagged
+
   finished = false
 
   test_thread = Thread.new do
     begin
       tested += 1
       eval "loop { Truffle::Primitive.assert_constant #{code}; Truffle::Primitive.assert_not_compiled; Thread.pass }"
     rescue RubyTruffleError => e
-      constant = e.message.include? 'Truffle::Primitive.assert_not_compiled'
-      if expected_constant
-        unless constant
-          puts "FAILURE: #{code} wasn't constant"
-          failed += 1
-        end
+      if e.message.include? 'Truffle::Primitive.assert_not_compiled'
+        constant = true
+      elsif e.message.include? 'Truffle::Primitive.assert_constant'
+        constant = false
+      else
+        constant = nil
+      end
+
+      if constant.nil?
+        puts "ERROR: #{code} errored in some unexpected way: #{e.message}"
+        errored += 1
       else
-        if constant
-          if tagged
-            puts "QUERY: #{code} was tagged but it still passed"
-          else
+        if expected_constant
+          unless constant
+            puts "FAILURE: #{code} wasn't constant"
+            failed += 1
+          end
+        else
+          if constant
             puts "QUERY: #{code} wasn't supposed to be constant but it was"
             failed += 1
           end
@@ -91,9 +102,10 @@ def tagged_example(code)
 
   unless finished
     puts "TIMEOUT: #{code} didn't compile in time so I don't know if it's constant or not"
+    timedout += 1
   end
 end
 
-puts "Tested #{tested}, #{EXAMPLES.select{|c,e,t| t}.size} tagged, #{failed} failed"
+puts "Tested #{tested}, #{EXAMPLES.select{|c,e,t| t}.size} tagged, #{failed} failed, #{errored} errored, #{timedout} timed out"
 
-exit 1 unless failed.zero?
+exit 1 unless failed.zero? && errored.zero? && timedout.zero?
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/debug/AssertConstantNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/debug/AssertConstantNode.java
@@ -36,7 +36,7 @@ public RubyBasicObject assertCompilationConstant(Object value) {
 
         if (!compilationConstant[0]) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw new RaiseException(getContext().getCoreLibrary().internalError("Value was not constant", this));
+            throw new RaiseException(getContext().getCoreLibrary().internalError("Value in Truffle::Primitive.assert_constant was not constant", this));
         }
 
         return nil();

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -634,17 +634,13 @@ public void loadRubyCore(String fileName, String prefix) {
     }
 
     public InputStream getRubyCoreInputStream(String fileName) {
-        final LoadServiceResource resource = context.getRuntime().getLoadService().getClassPathResource(getClass().getClassLoader(), fileName);
+        final InputStream resource = getClass().getResourceAsStream("/" + fileName);
 
         if (resource == null) {
             throw new RuntimeException("couldn't load Truffle core library " + fileName);
         }
 
-        try {
-            return resource.getInputStream();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        return resource;
     }
 
     public void initializeEncodingConstants() {