Merge branch 'master' into truffle-head

jruby · Mar 8, 2016 · 42c6e93 · 42c6e93
2 parents 7a3252a + 72da265
commit 42c6e93
Showing 13 changed files with 48 additions and 33 deletions.
diff --git a/core/pom.rb b/core/pom.rb
@@ -42,16 +42,16 @@
 
   # exclude jnr-ffi to avoid problems with shading and relocation of the asm packages
   jar 'com.github.jnr:jnr-netdb:1.1.5', :exclusions => ['com.github.jnr:jnr-ffi']
-  jar 'com.github.jnr:jnr-enxio:0.11-SNAPSHOT', :exclusions => ['com.github.jnr:jnr-ffi']
+  jar 'com.github.jnr:jnr-enxio:0.11', :exclusions => ['com.github.jnr:jnr-ffi']
   jar 'com.github.jnr:jnr-x86asm:1.0.2', :exclusions => ['com.github.jnr:jnr-ffi']
-  jar 'com.github.jnr:jnr-unixsocket:0.11-SNAPSHOT', :exclusions => ['com.github.jnr:jnr-ffi']
-  jar 'com.github.jnr:jnr-posix:3.0.28-SNAPSHOT', :exclusions => ['com.github.jnr:jnr-ffi']
-  jar 'com.github.jnr:jnr-constants:0.9.1-SNAPSHOT', :exclusions => ['com.github.jnr:jnr-ffi']
-  jar 'com.github.jnr:jnr-ffi:2.0.8-SNAPSHOT'
+  jar 'com.github.jnr:jnr-unixsocket:0.11', :exclusions => ['com.github.jnr:jnr-ffi']
+  jar 'com.github.jnr:jnr-posix:3.0.28', :exclusions => ['com.github.jnr:jnr-ffi']
+  jar 'com.github.jnr:jnr-constants:0.9.1', :exclusions => ['com.github.jnr:jnr-ffi']
+  jar 'com.github.jnr:jnr-ffi:2.0.8'
   jar 'com.github.jnr:jffi:${jffi.version}'
   jar 'com.github.jnr:jffi:${jffi.version}:native'
 
-  jar 'org.jruby.joni:joni:2.1.10-SNAPSHOT'
+  jar 'org.jruby.joni:joni:2.1.10'
   jar 'org.jruby.extras:bytelist:1.0.13'
   jar 'org.jruby.jcodings:jcodings:1.0.17'
   jar 'org.jruby:dirgra:0.3'

diff --git a/core/pom.xml b/core/pom.xml
@@ -103,7 +103,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-enxio</artifactId>
-      <version>0.11-SNAPSHOT</version>
+      <version>0.11</version>
       <exclusions>
         <exclusion>
           <artifactId>jnr-ffi</artifactId>
@@ -125,7 +125,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-unixsocket</artifactId>
-      <version>0.11-SNAPSHOT</version>
+      <version>0.11</version>
       <exclusions>
         <exclusion>
           <artifactId>jnr-ffi</artifactId>
@@ -136,7 +136,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-posix</artifactId>
-      <version>3.0.28-SNAPSHOT</version>
+      <version>3.0.28</version>
       <exclusions>
         <exclusion>
           <artifactId>jnr-ffi</artifactId>
@@ -147,7 +147,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-constants</artifactId>
-      <version>0.9.1-SNAPSHOT</version>
+      <version>0.9.1</version>
       <exclusions>
         <exclusion>
           <artifactId>jnr-ffi</artifactId>
@@ -158,7 +158,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.github.jnr</groupId>
       <artifactId>jnr-ffi</artifactId>
-      <version>2.0.8-SNAPSHOT</version>
+      <version>2.0.8</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
@@ -174,7 +174,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby.joni</groupId>
       <artifactId>joni</artifactId>
-      <version>2.1.10-SNAPSHOT</version>
+      <version>2.1.10</version>
     </dependency>
     <dependency>
       <groupId>org.jruby.extras</groupId>

diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -1020,13 +1020,16 @@ public void resetState() {
 
         // Invalidate compiler pass state.
         //
-        // SSS FIXME: This is to get around concurrent-modification issues
-        // since CompilerPass.invalidate modifies this, but some passes
-        // cannot be invalidated.
-        int i = 0;
-        while (i < getFullInterpreterContext().getExecutedPasses().size()) {
-            if (!getFullInterpreterContext().getExecutedPasses().get(i).invalidate(this)) {
-                i++;
+        // SSS FIXME: Re-grabbing passes each iter is to get around concurrent-modification issues
+        // since CompilerPass.invalidate modifies this, but some passes cannot be invalidated.  This
+        // should be wrapped in an iterator.
+        FullInterpreterContext fic = getFullInterpreterContext();
+        if (fic != null) {
+            int i = 0;
+            while (i < fic.getExecutedPasses().size()) {
+                if (!fic.getExecutedPasses().get(i).invalidate(this)) {
+                    i++;
+                }
             }
         }
     }

diff --git a/core/src/main/java/org/jruby/ir/runtime/IRWrappedLambdaReturnValue.java b/core/src/main/java/org/jruby/ir/runtime/IRWrappedLambdaReturnValue.java
@@ -2,6 +2,7 @@
 
 import org.jruby.exceptions.Unrescuable;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.cli.Options;
 
 // This class is just a thin wrapper around a return value
 // from nonlocal-return and break instructions.
@@ -19,4 +20,13 @@ public class IRWrappedLambdaReturnValue extends RuntimeException implements Unre
     public IRWrappedLambdaReturnValue(IRubyObject v) {
         this.returnValue = v;
     }
+
+    @Override
+    public Throwable fillInStackTrace() {
+        if (Options.JUMP_BACKTRACE.load()) {
+            return super.fillInStackTrace();
+        }
+
+        return this;
+    }
 }
diff --git a/pom.rb b/pom.rb
@@ -82,7 +82,7 @@
               'jruby-launcher.version' => '1.1.1',
               'ant.version' => '1.9.2',
               'asm.version' => '5.0.4',
-              'jffi.version' => '1.2.11-SNAPSHOT',
+              'jffi.version' => '1.2.11',
               'bouncy-castle.version' => '1.47',
               'joda.time.version' => '2.8.2' )
 

diff --git a/pom.xml b/pom.xml
@@ -113,7 +113,7 @@ DO NOT MODIFIY - GENERATED CODE
     <minitest.version>5.4.1</minitest.version>
     <ant.version>1.9.2</ant.version>
     <diff-lcs.version>1.1.3</diff-lcs.version>
-    <jffi.version>1.2.11-SNAPSHOT</jffi.version>
+    <jffi.version>1.2.11</jffi.version>
     <rake.version>10.4.2</rake.version>
     <jruby-launcher.version>1.1.1</jruby-launcher.version>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>

diff --git a/test/mri/ruby/test_require.rb b/test/mri/ruby/test_require.rb
@@ -686,7 +686,7 @@ def test_require_with_loaded_features_pop
           Thread.new do
             ITERATIONS_PER_THREAD.times do
               require PATH
-              $".pop
+              $".delete_if {|p| Regexp.new(PATH) =~ p}
             end
           end
         }.each(&:join)

diff --git a/test/truffle/integration/common/test_server.sh.inc b/test/truffle/integration/common/test_server.sh.inc
@@ -1,4 +1,4 @@
-PORT=8080
+PORT=14873
 
 function test_server {
   serverpid=$!

diff --git a/test/truffle/integration/instrumentation-server.sh b/test/truffle/integration/instrumentation-server.sh
@@ -2,16 +2,18 @@
 
 set -e
 
-ruby -X+T -Xtruffle.instrumentation_server_port=8080 test/truffle/integration/instrumentation-server/subject.rb &
+PORT=14873
+
+ruby -X+T -Xtruffle.instrumentation_server_port=$PORT test/truffle/integration/instrumentation-server/subject.rb &
 pid=$!
 
-while ! (curl -s http://localhost:8080/stacks > /dev/null);
+while ! (curl -s http://localhost:$PORT/stacks > /dev/null);
 do
   echo -n .
   sleep 1
 done
 
-if [[ $(curl -s http://localhost:8080/stacks) != *"test/truffle/integration/instrumentation-server/subject.rb:1"* ]]
+if [[ $(curl -s http://localhost:$PORT/stacks) != *"test/truffle/integration/instrumentation-server/subject.rb:1"* ]]
 then
   echo Expected line not found in stacks
   exit 1
@@ -21,16 +23,16 @@ kill -9 $pid || true
 wait $pid || true
 
 ( echo backtrace ; echo 20000+1400 ; echo continue ) > in.txt
-ruby -X+T -Xtruffle.instrumentation_server_port=8080 test/truffle/integration/instrumentation-server/subject.rb < in.txt > out.txt &
+ruby -X+T -Xtruffle.instrumentation_server_port=$PORT test/truffle/integration/instrumentation-server/subject.rb < in.txt > out.txt &
 pid=$!
 
-while ! (curl -s http://localhost:8080/stacks > /dev/null);
+while ! (curl -s http://localhost:$PORT/stacks > /dev/null);
 do
   echo -n .
   sleep 1
 done
 
-curl -s http://localhost:8080/break
+curl -s http://localhost:$PORT/break
 
 sleep 1
 kill -9 $pid || true

diff --git a/test/truffle/integration/rack-server/rack-server.rb b/test/truffle/integration/rack-server/rack-server.rb
@@ -16,5 +16,5 @@ def call(env)
 
 Rack::Handler::WEBrick.run(
   Example.new,
-  :Port => 8080
+  :Port => 14873
 )
diff --git a/test/truffle/integration/sinatra-server/sinatra-server.rb b/test/truffle/integration/sinatra-server/sinatra-server.rb
@@ -8,7 +8,7 @@
 
 require 'sinatra'
 
-set :port, 8080
+set :port, 14873
 
 get '/' do
   "Hello Sinatra!"

diff --git a/test/truffle/integration/tcp-server/tcp-server.rb b/test/truffle/integration/tcp-server/tcp-server.rb
@@ -8,7 +8,7 @@
 
 require 'socket'
 
-server = TCPServer.new('localhost', 8080)
+server = TCPServer.new('localhost', 14873)
 
 loop do
   socket = server.accept

diff --git a/test/truffle/integration/webrick-server/webrick-server.rb b/test/truffle/integration/webrick-server/webrick-server.rb
@@ -8,7 +8,7 @@
 
 require 'webrick'
 
-server = WEBrick::HTTPServer.new(:Port => 8080)
+server = WEBrick::HTTPServer.new(:Port => 14873)
 
 server.mount_proc '/' do |req, res|
   res.body = "Hello, world!\n"