Mercurial > hg > truffle

changeset 8470:f9aee27a6ff0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed use of @Alias in Thread.isInterrupted() substitution
author Doug Simon <doug.simon@oracle.com>
date Tue, 26 Mar 2013 11:46:24 +0100
parents 95e21e035363
children 809819548c05
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ThreadSubstitutions.java
diffstat 1 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ThreadSubstitutions.java	Mon Mar 25 22:38:05 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/ThreadSubstitutions.java	Tue Mar 26 11:46:24 2013 +0100
@@ -22,11 +22,13 @@
  */
 package com.oracle.graal.hotspot.replacements;
 
+import static com.oracle.graal.graph.UnsafeAccess.*;
 import static com.oracle.graal.hotspot.replacements.HotSpotSnippetUtils.*;
-import static com.oracle.graal.nodes.extended.UnsafeCastNode.*;
 
 import com.oracle.graal.api.replacements.*;
+import com.oracle.graal.graph.*;
 import com.oracle.graal.hotspot.nodes.*;
+import com.oracle.graal.replacements.Snippet.Fold;
 import com.oracle.graal.word.*;
 
 /**
@@ -42,12 +44,20 @@
 
     @Alias(declaringClass = Thread.class) private long eetop;
 
+    @Fold
+    private static int eetopOffset() {
+        try {
+            return (int) unsafe.objectFieldOffset(Thread.class.getDeclaredField("eetop"));
+        } catch (Exception e) {
+            throw new GraalInternalError(e);
+        }
+    }
+
     @MethodSubstitution(isStatic = false)
     public static boolean isInterrupted(final Thread thisObject, boolean clearInterrupted) {
         Thread thread = CurrentThread.get();
         if (thisObject == thread) {
-            ThreadSubstitutions threadAlias = unsafeCast(thread, ThreadSubstitutions.class, false, true);
-            Word rawThread = Word.unsigned(threadAlias.eetop);
+            Word rawThread = loadWordFromObject(thread, eetopOffset());
             Word osThread = rawThread.readWord(osThreadOffset(), FINAL_LOCATION);
             int int0 = osThread.readInt(osThreadInterruptedOffset(), UNKNOWN_LOCATION);
             boolean interrupted = int0 != 0;