clang

spec/ruby/core/thread/element_set_spec.rb

@@ -28,19 +28,5 @@
       Thread.current[:value] = 2
     end
 
-    it "stores a local in another thread when in a fiber" do
-      fib = Fiber.new do
-        t = Thread.new do
-          sleep
-          Thread.current[:value].should == 1
-        end
-
-        Thread.pass while t.status and t.status != "sleep"
-        t[:value] = 1
-        t.wakeup
-        t.join
-      end
-      fib.resume
-    end
   end
 end

spec/ruby/core/thread/key_spec.rb

@@ -46,19 +46,5 @@
       Thread.current.key?(:val2).should be_true
     end
 
-    it "stores a local in another thread when in a fiber" do
-      fib = Fiber.new do
-        t = Thread.new do
-          sleep
-          Thread.current.key?(:value).should be_true
-        end
-
-        Thread.pass while t.status and t.status != "sleep"
-        t[:value] = 1
-        t.wakeup
-        t.join
-      end
-      fib.resume
-    end
   end
 end

spec/ruby/core/thread/keys_spec.rb

@@ -28,20 +28,6 @@
       Thread.current.keys.should_not include(:val1)
     end
 
-    it "stores a local in another thread when in a fiber" do
-      fib = Fiber.new do
-        t = Thread.new do
-          sleep
-          Thread.current.keys.should include(:value)
-        end
-
-        Thread.pass while t.status and t.status != "sleep"
-        t[:value] = 1
-        t.wakeup
-        t.join
-      end
-      fib.resume
-    end
   end
 
 end

vendor/libffi/src/x86/unix64.S

@@ -347,11 +347,7 @@ ffi_closure_unix64:
 	.long	.LEFDE1-.LASFDE1	/* FDE Length */
 .LASFDE1:
 	.long	.LASFDE1-.Lframe1	/* FDE CIE offset */
-#if HAVE_AS_X86_PCREL
 	.long	.LUW0-.			/* FDE initial location */
-#else
-	.long	.LUW0@rel
-#endif
 	.long	.LUW4-.LUW0		/* FDE address range */
 	.uleb128 0x0			/* Augmentation size */
 
@@ -389,11 +385,7 @@ ffi_closure_unix64:
 	.long	.LEFDE3-.LASFDE3	/* FDE Length */
 .LASFDE3:
 	.long	.LASFDE3-.Lframe1	/* FDE CIE offset */
-#if HAVE_AS_X86_PCREL
 	.long	.LUW5-.			/* FDE initial location */
-#else
-	.long	.LUW5@rel
-#endif
 	.long	.LUW9-.LUW5		/* FDE address range */
 	.uleb128 0x0			/* Augmentation size */
 

vm/bug.hpp

@@ -3,8 +3,8 @@
 
 namespace rubinius {
   void abort();
-  void bug(const char* message);
-  void bug(const char* message, const char* arg);
+  noreturn(void bug(const char* message));
+  noreturn(void bug(const char* message, const char* arg));
   void warn(const char* message);
   void print_backtrace(size_t max=100);
 }

vm/builtin/exception.hpp

@@ -72,9 +72,9 @@ namespace rubinius {
     static void system_call_error(STATE, const char* reason);
     static void system_call_error(STATE, const std::string& reason);
 
-    static void thread_error(STATE, const char* reason);
-    static void fiber_error(STATE, const char* reason);
-    static void memory_error(STATE);
+    noreturn(static void thread_error(STATE, const char* reason));
+    noreturn(static void fiber_error(STATE, const char* reason));
+    noreturn(static void memory_error(STATE));
 
     static Exception* make_lje(STATE, CallFrame* frame);
 

vm/exception.hpp

@@ -104,7 +104,7 @@ namespace rubinius {
 
   public:   /* Interface */
 
-    static void raise(Exception* exception, bool make_backtrace = false);
+    noreturn(static void raise(Exception* exception, bool make_backtrace = false));
 
     /**
      * Prints out the exception message and the Ruby backtrace.

vm/util/optimize.hpp

@@ -6,11 +6,13 @@
 
 #define likely(x)       __builtin_expect((long int)(x),1)
 #define unlikely(x)     __builtin_expect((long int)(x),0)
+#define noreturn(x)     x __attribute__ ((noreturn))
 
 #else
 
 #define likely(x) x
 #define unlikely(x) x
+#define noreturn(x) x
 
 #endif