jruby · Sep 3, 2015 · Sep 4, 2015 · Sep 8, 2015 · Sep 8, 2015 · Sep 11, 2015
diff --git a/COPYING b/COPYING
@@ -64,11 +64,13 @@ below. Also see LICENSE.RUBY for most files found in lib/ruby/stdlib.
  The Rubinius API implementation in truffle/src/main/ruby/core/rubinius/api
  is copyright (c) 2011, Evan Phoenix, and released under the 3-clause BSD license.
 
- The Rubinius core library implementation
- in truffle/src/main/ruby/core/rubinius/bootstrap
- and truffle/src/main/ruby/core/rubinius/common is
- copyright (c) 2007-2014, Evan Phoenix and contributors,
- and released under the 3-clause BSD license.
+ The Rubinius core library implementation in truffle/src/main/ruby/core/rubinius
+ is copyright (c) 2007-2015, Evan Phoenix and contributors, and released under
+ the 3-clause BSD license.
+
+ Some parts of the Truffle Java code is derived from Rubinius C++ code which is
+ copyright (c) 2007-2015, Evan Phoenix and contributors, and released under the
+ 3-clause BSD license.
 
  Some parts of the RubySL implementations of the stdlib in lib/ruby/truffle/rubysl
  are copyright (c) 2013 Brian Shirai and are licensed under the 3-clause BSD license.

diff --git a/antlib/extra.xml b/antlib/extra.xml
@@ -25,7 +25,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.rc1.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -136,7 +136,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-9.0.0.0.rc1.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-9.0.0.0.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -152,7 +152,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.rc1.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -168,7 +168,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.rc1.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:lib/jruby.jar:maven/jruby-stdlib/target/jruby-stdlib-9.0.0.0.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>
@@ -460,7 +460,7 @@ build jruby-complete.jar
 <env key='GEM_PATH' value='lib/ruby/gems/shared'/>
 <arg value='-Djruby.home=uri:classloader://META-INF/jruby.home'/>
 <arg value='-cp'/>
-<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-9.0.0.0.rc1.jar'/>
+<arg value='core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-9.0.0.0.jar'/>
 <arg value='org.jruby.Main'/>
 <arg value='-I.:test/externals/ruby1.9:test/externals/ruby1.9/ruby'/>
 <arg value='-r./test/ruby19_env.rb'/>

diff --git a/core/src/main/java/org/jruby/IncludedModuleWrapper.java b/core/src/main/java/org/jruby/IncludedModuleWrapper.java
@@ -17,7 +17,7 @@
  * Copyright (C) 2005 Charles O Nutter <headius@headius.com>
  * Copyright (C) 2006 Miguel Covarrubias <mlcovarrubias@gmail.com>
  * Copyright (C) 2007 William N Dortch <bill.dortch@gmail.com>
- * 
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
  * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
@@ -48,11 +48,11 @@
  * other modules. It inserts itself as the immediate superClass of the includer, but defers all
  * module methods to the actual superclass. Multiple of these intermediate superclasses can be
  * added for multiple included modules.
- * 
+ *
  * This allows the normal superclass-based searches (searchMethod, getConstant, etc) to traverse
  * the superclass ancestors as normal while the included modules do not actually show up in
  * direct inheritance traversal.
- * 
+ *
  * @see org.jruby.RubyModule
  */
 public class IncludedModuleWrapper extends IncludedModule {
@@ -65,19 +65,19 @@ public IncludedModuleWrapper(Ruby runtime, RubyClass superClass, RubyModule orig
     /**
      * Overridden newIncludeClass implementation to allow attaching future includes to the correct module
      * (i.e. the one to which this is attached)
-     * 
+     *
      * @see org.jruby.RubyModule#newIncludeClass(RubyClass)
      */
     @Override
     @Deprecated
     public IncludedModuleWrapper newIncludeClass(RubyClass superClass) {
         IncludedModuleWrapper includedModule = new IncludedModuleWrapper(getRuntime(), superClass, getNonIncludedClass());
-        
+
         // include its parent (and in turn that module's parents)
         if (getSuperClass() != null) {
             includedModule.includeModule(getSuperClass());
         }
-        
+
         return includedModule;
     }
 
@@ -179,18 +179,23 @@ protected IRubyObject constantTableStore(String name, IRubyObject value) {
         return origin.constantTableStore(name, value);
     }
 
+    protected IRubyObject constantTableStore(String name, IRubyObject value, boolean hidden) {
+        // FIXME: legal here? may want UnsupportedOperationException
+        return origin.constantTableStore(name, value, hidden);
+    }
+
     @Override
     protected IRubyObject constantTableRemove(String name) {
         // this _is_ legal (when removing an undef)
         return origin.constantTableRemove(name);
     }
-    
+
     @Override
     @Deprecated
     public List<String> getStoredConstantNameList() {
         return origin.getStoredConstantNameList();
     }
-    
+
     @Override
     public Collection<String> getConstantNames() {
         return origin.getConstantNames();

diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -548,9 +548,7 @@ public void runFromMain(InputStream inputStream, String filename) {
             return;
         }
 
-        Main.printTruffleTimeMetric("before-parse-initial");
         ParseResult parseResult = parseFromMain(filename, inputStream);
-        Main.printTruffleTimeMetric("after-parse-initial");
 
         // if no DATA, we're done with the stream, shut it down
         if (fetchGlobalConstant("DATA") == null) {
@@ -844,8 +842,9 @@ public IRubyObject runInterpreter(ThreadContext context, Node rootNode, IRubyObj
         if (getInstanceConfig().getCompileMode() == CompileMode.TRUFFLE) {
             assert rootNode instanceof RootNode;
             assert self == getTopSelf();
+            final TruffleContextInterface truffleContext = getTruffleContext();
             Main.printTruffleTimeMetric("before-run");
-            getTruffleContext().execute((RootNode) rootNode);
+            truffleContext.execute((RootNode) rootNode);
             Main.printTruffleTimeMetric("after-run");
             return getNil();
         } else {

diff --git a/core/src/main/java/org/jruby/RubyFixnum.java b/core/src/main/java/org/jruby/RubyFixnum.java
@@ -269,6 +269,8 @@ public boolean equals(Object other) {
             if (num.value == value) {
                 return true;
             }
+        } else if (other instanceof RubyFloat) {
+            return (double)value == ((RubyFloat) other).getDoubleValue();
         }
 
         return false;

diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -305,12 +305,15 @@ private String calculateJRubyHome() {
             newJRubyHome = SafePropertyAccessor.getProperty("jruby.home");
         }
 
+        if (newJRubyHome == null && getLoader().getResource("META-INF/jruby.home/.jrubydir") != null) {
+            newJRubyHome = "uri:classloader://META-INF/jruby.home";
+        }
         if (newJRubyHome != null) {
             // verify it if it's there
             newJRubyHome = verifyHome(newJRubyHome, error);
         } else {
             try {
-                newJRubyHome = SystemPropertyCatcher.findJRubyHome(this);
+                newJRubyHome = SafePropertyAccessor.getenv("JRUBY_HOME");
             } catch (Exception e) {}
 
             if (newJRubyHome != null) {

diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -128,7 +128,6 @@ public class RubyModule extends RubyObject {
 
     private static final boolean DEBUG = false;
     protected static final String ERR_INSECURE_SET_CONSTANT  = "Insecure: can't modify constant";
-    protected static final String ERR_FROZEN_CONST_TYPE = "class/module ";
 
     public static final ObjectAllocator MODULE_ALLOCATOR = new ObjectAllocator() {
         @Override
@@ -3239,10 +3238,7 @@ public IRubyObject private_constant(ThreadContext context, IRubyObject rubyName)
     @JRubyMethod(required = 1, rest = true)
     public IRubyObject private_constant(ThreadContext context, IRubyObject[] rubyNames) {
         for (IRubyObject rubyName : rubyNames) {
-            String name = validateConstant(rubyName);
-
-            setConstantVisibility(context, name, true);
-            invalidateConstantCache(name);
+            private_constant(context, rubyName);
         }
         return this;
     }
@@ -3259,9 +3255,7 @@ public IRubyObject public_constant(ThreadContext context, IRubyObject rubyName)
     @JRubyMethod(required = 1, rest = true)
     public IRubyObject public_constant(ThreadContext context, IRubyObject[] rubyNames) {
         for (IRubyObject rubyName : rubyNames) {
-            String name = validateConstant(rubyName);
-            setConstantVisibility(context, name, false);
-            invalidateConstantCache(name);
+            public_constant(context, rubyName);
         }
         return this;
     }
@@ -3295,7 +3289,7 @@ private void setConstantVisibility(ThreadContext context, String name, boolean h
             throw context.runtime.newNameError("constant " + getName() + "::" + name + " not defined", name);
         }
 
-        getConstantMapForWrite().put(name, new ConstantEntry(entry.value, hidden));
+        storeConstant(name, entry.value, hidden);
     }
 
     //
@@ -3570,7 +3564,7 @@ public IRubyObject resolveUndefConstant(String name) {
      * @return The result of setting the variable.
      */
     public IRubyObject setConstantQuiet(String name, IRubyObject value) {
-        return setConstantCommon(name, value, false);
+        return setConstantCommon(name, value, false, false);
     }
 
     /**
@@ -3582,7 +3576,11 @@ public IRubyObject setConstantQuiet(String name, IRubyObject value) {
      * @return The result of setting the variable.
      */
     public IRubyObject setConstant(String name, IRubyObject value) {
-        return setConstantCommon(name, value, true);
+        return setConstantCommon(name, value, false, true);
+    }
+
+    public IRubyObject setConstant(String name, IRubyObject value, boolean hidden) {
+        return setConstantCommon(name, value, hidden, true);
     }
 
     /**
@@ -3593,7 +3591,7 @@ public IRubyObject setConstant(String name, IRubyObject value) {
      * @param value The value to assign to it; if an unnamed Module, also set its basename to name
      * @return The result of setting the variable.
      */
-    private IRubyObject setConstantCommon(String name, IRubyObject value, boolean warn) {
+    private IRubyObject setConstantCommon(String name, IRubyObject value, boolean hidden, boolean warn) {
         IRubyObject oldValue = fetchConstant(name);
         if (oldValue != null) {
             if (oldValue == UNDEF) {
@@ -3602,10 +3600,14 @@ private IRubyObject setConstantCommon(String name, IRubyObject value, boolean wa
                 if (warn) {
                     getRuntime().getWarnings().warn(ID.CONSTANT_ALREADY_INITIALIZED, "already initialized constant " + name);
                 }
-                storeConstant(name, value);
+                // might just call storeConstant(name, value, hidden) but to maintain
+                // backwards compatibility with calling #storeConstant overrides
+                if (hidden) storeConstant(name, value, true);
+                else storeConstant(name, value);
             }
         } else {
-            storeConstant(name, value);
+            if (hidden) storeConstant(name, value, true);
+            else storeConstant(name, value);
         }
 
         invalidateConstantCache(name);
@@ -3874,7 +3876,6 @@ public List<String> getClassVariableNameList() {
     }
 
     protected static final String ERR_INSECURE_SET_CLASS_VAR = "Insecure: can't modify class variable";
-    protected static final String ERR_FROZEN_CVAR_TYPE = "class/module ";
 
     protected final String validateClassVariable(String name) {
         if (IdUtil.isValidClassVariableName(name)) {
@@ -3884,17 +3885,7 @@ protected final String validateClassVariable(String name) {
     }
 
     protected final void ensureClassVariablesSettable() {
-        Ruby runtime = getRuntime();
-
-        if (!isFrozen()) {
-            return;
-        }
-
-        if (this instanceof RubyModule) {
-            throw runtime.newFrozenError(ERR_FROZEN_CONST_TYPE);
-        } else {
-            throw runtime.newFrozenError("");
-        }
+        checkAndRaiseIfFrozen();
     }
 
     //
@@ -3944,6 +3935,14 @@ public IRubyObject storeConstant(String name, IRubyObject value) {
         return constantTableStore(name, value);
     }
 
+    public IRubyObject storeConstant(String name, IRubyObject value, boolean hidden) {
+        assert IdUtil.isConstant(name) : name + " is not a valid constant name";
+        assert value != null : "value is null";
+
+        ensureConstantsSettable();
+        return constantTableStore(name, value, hidden);
+    }
+
     @Deprecated
     public IRubyObject fastStoreConstant(String internedName, IRubyObject value) {
         return storeConstant(internedName, value);
@@ -4014,7 +4013,21 @@ protected final String validateConstant(String name, IRubyObject errorName) {
     }
 
     protected final void ensureConstantsSettable() {
-        if (isFrozen()) throw getRuntime().newFrozenError(ERR_FROZEN_CONST_TYPE);
+        checkAndRaiseIfFrozen();
+    }
+
+    private void checkAndRaiseIfFrozen() throws RaiseException {
+        if ( isFrozen() ) {
+            if (this instanceof RubyClass) {
+                if (getBaseName() == null) { // anonymous
+                    // MRI 2.2.2 does get ugly ... as it skips this logic :
+                    // RuntimeError: can't modify frozen #<Class:#<Class:0x0000000095a920>>
+                    throw getRuntime().newFrozenError(getName());
+                }
+                throw getRuntime().newFrozenError("#<Class:" + getName() + '>');
+            }
+            throw getRuntime().newFrozenError("Module");
+        }
     }
 
     protected boolean constantTableContains(String name) {
@@ -4042,6 +4055,12 @@ protected IRubyObject constantTableStore(String name, IRubyObject value) {
         return value;
     }
 
+    protected IRubyObject constantTableStore(String name, IRubyObject value, boolean hidden) {
+        Map<String, ConstantEntry> constMap = getConstantMapForWrite();
+        constMap.put(name, new ConstantEntry(value, hidden));
+        return value;
+    }
+
     protected IRubyObject constantTableRemove(String name) {
         ConstantEntry entry = getConstantMapForWrite().remove(name);
         if (entry == null) return null;

diff --git a/core/src/main/java/org/jruby/RubyObjectSpace.java b/core/src/main/java/org/jruby/RubyObjectSpace.java
@@ -114,7 +114,7 @@ public static IRubyObject id2ref(IRubyObject recv, IRubyObject id) {
                 return object;
             } else {
                 runtime.getWarnings().warn("ObjectSpace is disabled; _id2ref only supports immediates, pass -X+O to enable");
-                return runtime.getNil();
+                throw recv.getRuntime().newRangeError(String.format("0x%016x is not id value", longId));
             }
         }
     }

diff --git a/core/src/main/java/org/jruby/embed/ScriptingContainer.java b/core/src/main/java/org/jruby/embed/ScriptingContainer.java
@@ -67,6 +67,7 @@
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.profile.builtin.ProfileOutput;
 import org.jruby.util.KCode;
+import org.jruby.util.SafePropertyAccessor;
 import org.jruby.util.cli.OutputStrings;
 import org.jruby.util.cli.Options;
 
@@ -264,7 +265,7 @@ static LocalContextProvider getProviderInstance(LocalContextScope scope, LocalVa
     }
 
     private void initRubyInstanceConfig() throws RaiseException {
-        String home = SystemPropertyCatcher.findJRubyHome(this);
+        String home = SafePropertyAccessor.getenv("JRUBY_HOME");
         if (home != null) {
         	provider.getRubyInstanceConfig().setJRubyHome(home);
         }

diff --git a/core/src/main/java/org/jruby/embed/util/SystemPropertyCatcher.java b/core/src/main/java/org/jruby/embed/util/SystemPropertyCatcher.java
@@ -180,6 +180,7 @@ public static void setJRubyHome(ScriptingContainer container) {
      * @param instance any instance to get a resource
      * @return JRuby home path if exists, null when failed to find it.
      */
+    @Deprecated
     public static String findJRubyHome(Object instance) {
         String jrubyhome;
         if ((jrubyhome = SafePropertyAccessor.getenv("JRUBY_HOME")) != null) {
@@ -191,6 +192,7 @@ public static String findJRubyHome(Object instance) {
         return "uri:classloader://META-INF/jruby.home";
     }
 
+    @Deprecated
     public static String findFromJar(Object instance) {
         URL resource = instance.getClass().getResource("/META-INF/jruby.home");
         if (resource == null) {
@@ -229,6 +231,7 @@ public static String findFromJar(Object instance) {
      *
      * @return a list of load paths.
      */
+    @Deprecated
     public static List<String> findLoadPaths() {
         String paths = SafePropertyAccessor.getProperty(PropertyName.CLASSPATH.toString());
         List<String> loadPaths = new ArrayList<String>();