--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java	Wed Sep 18 02:41:52 2013 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java	Tue Sep 17 18:36:54 2013 -0700
@@ -28,16 +28,15 @@
 import com.oracle.graal.graph.*;
 import com.oracle.graal.nodes.calc.*;
 import com.oracle.graal.nodes.spi.*;
-import com.oracle.graal.nodes.type.*;
 import com.oracle.graal.word.*;
 
 /**
  * Gets the address of the C++ JavaThread object for the current thread.
  */
-public class CurrentJavaThreadNode extends FloatingNode implements LIRLowerable {
+public final class CurrentJavaThreadNode extends FloatingNode implements LIRLowerable {
 
-    public CurrentJavaThreadNode() {
-        super(StampFactory.forWord());
+    private CurrentJavaThreadNode() {
+        super(null);
     }
 
     @Override
@@ -54,7 +53,7 @@
         }
     }
 
-    @NodeIntrinsic
+    @NodeIntrinsic(setStampFromReturnType = true)
     public static Word get() {
         return Word.unsigned(unsafeReadWord(Thread.currentThread(), eetopOffset()));
     }