jruby · Jan 26, 2015 · Jan 26, 2015 · Jan 26, 2015 · Jan 27, 2015 · Jan 27, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -69,7 +69,6 @@ matrix:
     - env: PHASE='-Pcomplete'
     - env: PHASE='-Prake -Dtask=spec:jrubyc'
     - env: PHASE='-Prake -Dtask=spec:profiler'
-    - env: PHASE='-Ptruffle-specs-rubysl'
     - env: COMMAND=tool/truffle-findbugs.sh
 
 branches:

diff --git a/core/pom.rb b/core/pom.rb
@@ -245,6 +245,17 @@
   end
 
 
+  plugin :shade do
+    execute_goals( 'shade',
+                   :id => 'create lib/jruby.jar',
+                   :phase => 'package',
+                   'relocations' => [ { 'pattern' => 'org.objectweb',
+                                        'shadedPattern' => 'org.jruby.org.objectweb' } ],
+                   'outputFile' => '${jruby.basedir}/lib/jruby.jar',
+                   'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
+                                         'mainClass' => 'org.jruby.Main' } ] )
+  end
+
   [ :osgi, :dist, :'jruby-jars', :main, :all, :complete, :release, :jruby_complete_jar_extended ].each do |name|
     profile name do
       plugin :shade do

diff --git a/core/pom.xml b/core/pom.xml
@@ -528,6 +528,32 @@
           </additionalClasspathElements>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>pack lib/jruby.jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <relocations>
+                <relocation>
+                  <pattern>org.objectweb</pattern>
+                  <shadedPattern>org.jruby.org.objectweb</shadedPattern>
+                </relocation>
+              </relocations>
+              <outputFile>${jruby.basedir}/lib/jruby.jar</outputFile>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>org.jruby.Main</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <profiles>

diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -141,6 +141,7 @@
 import org.jruby.util.ByteList;
 import org.jruby.util.DefinedMessage;
 import org.jruby.util.JRubyClassLoader;
+import org.jruby.util.SelfFirstJRubyClassLoader;
 import org.jruby.util.IOInputStream;
 import org.jruby.util.IOOutputStream;
 import org.jruby.util.ClassDefininngJRubyClassLoader;
@@ -904,7 +905,7 @@ public synchronized TruffleBridge getTruffleBridge() {
              */
 
             try {
-                Class<?> clazz = getClass().getClassLoader().loadClass("org.jruby.truffle.TruffleBridgeImpl");
+                Class<?> clazz = getJRubyClassLoader().loadClass("org.jruby.truffle.TruffleBridgeImpl");
                 Constructor<?> con = clazz.getConstructor(Ruby.class);
                 truffleBridge = (TruffleBridge) con.newInstance(this);
                 truffleBridge.init();
@@ -2582,7 +2583,12 @@ public static ClassLoader getClassLoader() {
     public synchronized JRubyClassLoader getJRubyClassLoader() {
         // FIXME: Get rid of laziness and handle restricted access elsewhere
         if (!Ruby.isSecurityRestricted() && jrubyClassLoader == null) {
-            jrubyClassLoader = new JRubyClassLoader(config.getLoader());
+            if (config.isSelfFirstClassLoader()){
+                jrubyClassLoader = new SelfFirstJRubyClassLoader(config.getLoader());
+            }
+            else {
+                jrubyClassLoader = new JRubyClassLoader(config.getLoader());
+            }
 
             // if jit code cache is used, we need to add the cache directory to the classpath
             // so the previously generated class files can be reused.

diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -1227,6 +1227,28 @@ public boolean isNativeEnabled() {
         return _nativeEnabled;
     }
 
+    /**
+     * Set whether to use the self-first jruby classloader.
+     *
+     * @see Options#SELF_FIRST_CLASS_LOADER
+     *
+     * @param b new value indicating whether self-first classloader is used
+     */
+    public void setSelfFirstClassLoader(boolean b) {
+        _selfFirstClassLoader = b;
+    }
+
+    /**
+     * Get whether to use the self-first jruby classloader.
+     *
+     * @see Options#SELF_FIRST_CLASS_LOADER
+     *
+     * @return true if self-first classloader is used; false otherwise.
+     */
+    public boolean isSelfFirstClassLoader() {
+        return _selfFirstClassLoader;
+    }
+
     /**
      * @see Options#CLI_STRIP_HEADER
      */
@@ -1472,6 +1494,7 @@ public void setProfilingService( String service )  {
      * Whether native code is enabled for this configuration.
      */
     private boolean _nativeEnabled = NATIVE_ENABLED;
+    private boolean _selfFirstClassLoader = SELF_FIRST_CLASS_LOADER;
 
     private TraceType traceType =
             TraceType.traceTypeFor(Options.BACKTRACE_STYLE.load());
@@ -1674,6 +1697,7 @@ public boolean shouldPrecompileAll() {
      * Set with the <tt>jruby.native.enabled</tt> system property.
      */
     public static final boolean NATIVE_ENABLED = Options.NATIVE_ENABLED.load();
+    public static final boolean SELF_FIRST_CLASS_LOADER = Options.SELF_FIRST_CLASS_LOADER.load();
 
     @Deprecated
     public final static boolean CEXT_ENABLED = false;

diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -60,6 +60,7 @@
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
+import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.backtrace.RubyStackTraceElement;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.load.IAutoloadMethod;
@@ -76,6 +77,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Map;
 
 import static org.jruby.RubyEnumerator.enumeratorizeWithSize;
@@ -762,13 +764,21 @@ public static RubyArray local_variables(ThreadContext context, IRubyObject recv)
     @JRubyMethod(name = "local_variables", module = true, visibility = PRIVATE)
     public static RubyArray local_variables19(ThreadContext context, IRubyObject recv) {
         final Ruby runtime = context.runtime;
-        RubyArray localVariables = runtime.newArray();
-
-        for (String name: context.getCurrentScope().getAllNamesInScope()) {
-            if (IdUtil.isLocal(name)) localVariables.append(runtime.newSymbol(name));
+        HashSet<String> encounteredLocalVariables = new HashSet<String>();
+        RubyArray allLocalVariables = runtime.newArray();
+        DynamicScope currentScope = context.getCurrentScope();
+
+        while (currentScope != null) {
+            for (String name : currentScope.getStaticScope().getVariables()) {
+                if (IdUtil.isLocal(name) && !encounteredLocalVariables.contains(name)) {
+                    allLocalVariables.push(runtime.newSymbol(name));
+                    encounteredLocalVariables.add(name);
+                }
+            }
+            currentScope = currentScope.getParentScope();
         }
 
-        return localVariables;
+        return allLocalVariables;
     }
 
     public static RubyBinding binding(ThreadContext context, IRubyObject recv, Block block) {

diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -1026,6 +1026,7 @@ public Operand[] getCallArgs() {
 
         // We have two paths.  eval and non-eval.
         if (instrList == null) {  // CFG already made.  eval has zsuper and we walk back to some executing method/script
+            // FIXME: Need to verify this can never re-order recvs in a way to swap order to zsuper
             for (BasicBlock bb: getCFG().getBasicBlocks()) {
                 for (Instr instr: bb.getInstrs()) {
                     extractCallOperands(callArgs, keywordArgs, instr);

diff --git a/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java b/core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
@@ -260,7 +260,7 @@ public enum Keyword {
 
     public enum LexState {
         EXPR_BEG, EXPR_END, EXPR_ARG, EXPR_CMDARG, EXPR_ENDARG, EXPR_MID,
-        EXPR_FNAME, EXPR_DOT, EXPR_CLASS, EXPR_VALUE, EXPR_ENDFN
+        EXPR_FNAME, EXPR_DOT, EXPR_CLASS, EXPR_VALUE, EXPR_ENDFN, EXPR_LABELARG
     }
 
     public static Keyword getKeyword(String str) {
@@ -329,6 +329,7 @@ public void newtok() {
     private int braceNest = 0;
 
     private int leftParenBegin = 0;
+    public boolean inKwarg = false;
 
     public int incrementParenNest() {
         parenNest++;
@@ -510,7 +511,8 @@ private boolean isNext_identchar() throws IOException {
 
     private boolean isBEG() {
         return lex_state == LexState.EXPR_BEG || lex_state == LexState.EXPR_MID ||
-                lex_state == LexState.EXPR_CLASS || (lex_state == LexState.EXPR_VALUE);
+                lex_state == LexState.EXPR_CLASS || lex_state == LexState.EXPR_VALUE ||
+                lex_state == LexState.EXPR_LABELARG;
     }
 
     private boolean isEND() {
@@ -1160,6 +1162,13 @@ private int yylex() throws IOException {
                 case EXPR_BEG: case EXPR_FNAME: case EXPR_DOT:
                 case EXPR_CLASS: case EXPR_VALUE:
                     continue loop;
+                case EXPR_LABELARG:
+                    if (inKwarg) {
+                        commandStart = true;
+                        setState(LexState.EXPR_BEG);
+                        return '\n';
+                    }
+                    continue loop;
                 }
 
                 boolean done = false;
@@ -1816,7 +1825,7 @@ private int identifier(int c, boolean commandState) throws IOException {
         if (isLabelPossible(commandState)) {
             int c2 = src.read();
             if (c2 == ':' && !src.peek(':')) {
-                setState(LexState.EXPR_BEG);
+                setState(LexState.EXPR_LABELARG);
                 yaccValue = tempVal;
                 return Tokens.tLABEL;
             }

diff --git a/core/src/main/java/org/jruby/parser/Ruby19.java b/core/src/main/java/org/jruby/parser/Ruby19.java