jruby · Oct 10, 2015 · Oct 10, 2015
diff --git a/spec/truffle/tags/core/thread/alive_tags.txt b/spec/truffle/tags/core/thread/alive_tags.txt
diff --git a/spec/truffle/tags/core/thread/backtrace/location/inspect_tags.txt b/spec/truffle/tags/core/thread/backtrace/location/inspect_tags.txt
diff --git a/spec/truffle/tags/core/thread/backtrace/location/path_tags.txt b/spec/truffle/tags/core/thread/backtrace/location/path_tags.txt
@@ -1,7 +1,3 @@
-fails:Thread::Backtrace::Location#path outside a main script returns an absolute path
 fails:Thread::Backtrace::Location#path in a main script when the script is in the working directory when using a relative script path returns a path relative to the working directory
-fails:Thread::Backtrace::Location#path in a main script when the script is in the working directory when using an absolute script path returns an absolute path
 fails:Thread::Backtrace::Location#path in a main script when the script is in a sub directory of the working directory when using a relative script path returns a path relative to the working directory
-fails:Thread::Backtrace::Location#path in a main script when the script is in a sub directory of the working directory when using an absolute script path returns an absolute path
 fails:Thread::Backtrace::Location#path in a main script when the script is outside of the working directory when using a relative script path returns a path relative to the working directory
-fails:Thread::Backtrace::Location#path in a main script when the script is outside of the working directory when using an absolute path returns an absolute path
diff --git a/spec/truffle/tags/core/thread/backtrace/location/to_s_tags.txt b/spec/truffle/tags/core/thread/backtrace/location/to_s_tags.txt
diff --git a/spec/truffle/tags/core/thread/inspect_tags.txt b/spec/truffle/tags/core/thread/inspect_tags.txt
diff --git a/spec/truffle/tags/core/thread/list_tags.txt b/spec/truffle/tags/core/thread/list_tags.txt
diff --git a/spec/truffle/tags/core/thread/new_tags.txt b/spec/truffle/tags/core/thread/new_tags.txt
@@ -1,4 +1,2 @@
 fails:Thread.new raises an exception when not given a block
-fails:Thread.new creates a subclass of thread calls super with a block in initialize
 fails:Thread.new calls #initialize and raises an error if super not used
-fails:Thread.new calls and respects #initialize for the block to use
diff --git a/spec/truffle/tags/core/thread/raise_tags.txt b/spec/truffle/tags/core/thread/raise_tags.txt
diff --git a/spec/truffle/tags/core/thread/set_trace_func_tags.txt b/spec/truffle/tags/core/thread/set_trace_func_tags.txt
diff --git a/spec/truffle/tags/core/thread/start_tags.txt b/spec/truffle/tags/core/thread/start_tags.txt
@@ -1,4 +1,2 @@
 fails:Thread.start Thread.start raises an ArgumentError if not passed a block
-fails:Thread.start Thread.start spawns a new Thread running the block
 fails:Thread.start Thread.start respects Thread subclasses
-fails:Thread.start Thread.start does not call #initialize
diff --git a/spec/truffle/tags/core/thread/status_tags.txt b/spec/truffle/tags/core/thread/status_tags.txt
diff --git a/spec/truffle/tags/core/thread/stop_tags.txt b/spec/truffle/tags/core/thread/stop_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -1835,7 +1835,7 @@ private long doSleepMillis(final long durationInMillis) {
 
             // Clear the wakeUp flag, following Ruby semantics:
             // it should only be considered if we are inside the sleep when Thread#{run,wakeup} is called.
-            Layouts.THREAD.getWakeUp(thread).getAndSet(false);
+            Layouts.THREAD.getWakeUp(thread).set(false);
 
             return sleepFor(this, getContext(), durationInMillis);
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/MutexNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/MutexNodes.java
@@ -210,7 +210,7 @@ public long doSleepMillis(DynamicObject mutex, long durationInMillis) {
             // Here we do it before unlocking for providing nice semantics for
             // thread1: mutex.sleep
             // thread2: mutex.synchronize { <ensured that thread1 is sleeping and thread1.wakeup will wake it up> }
-            Layouts.THREAD.getWakeUp(thread).getAndSet(false);
+            Layouts.THREAD.getWakeUp(thread).set(false);
 
             UnlockNode.unlock(lock, thread, this);
             try {

diff --git a/truffle/src/main/ruby/core/rubinius/bootstrap/thread.rb b/truffle/src/main/ruby/core/rubinius/bootstrap/thread.rb
@@ -50,6 +50,15 @@ def priority=(val)
     Kernel.raise ThreadError, "Thread#priority= primitive failed"
   end
 
+  def inspect
+    stat = status()
+    stat = "dead" unless stat
+
+    "#<#{self.class}:0x#{object_id.to_s(16)} id=#{@thread_id} #{stat}>"
+  end
+
+  alias_method :to_s, :inspect
+
   def self.exit
     Thread.current.kill
   end