Mercurial > hg > truffle

changeset 7273:7f6bf286629c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace checked casts with unsafe casts in snippets where the exact type of a value loaded from metadata is known
author Doug Simon <doug.simon@oracle.com>
date Tue, 18 Dec 2012 17:59:03 +0100
parents a25b441f6cc0
children 19f5c9b96fa7
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ClassSnippets.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ObjectSnippets.java
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ClassSnippets.java	Tue Dec 18 17:58:08 2012 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ClassSnippets.java	Tue Dec 18 17:59:03 2012 +0100
@@ -23,6 +23,7 @@
 package com.oracle.graal.hotspot.snippets;
 
 import static com.oracle.graal.hotspot.snippets.HotSpotSnippetUtils.*;
+import static com.oracle.graal.nodes.extended.UnsafeCastNode.*;
 
 import java.lang.reflect.*;
 
@@ -87,7 +88,7 @@
                     if (superKlass == Word.zero()) {
                         return null;
                     } else {
-                        return (Class<?>) loadObjectFromWord(superKlass, classMirrorOffset());
+                        return unsafeCast(loadObjectFromWord(superKlass, classMirrorOffset()), Class.class, true, true);
                     }
                 }
             }
@@ -101,7 +102,7 @@
         if (klass != Word.zero()) {
             int layoutHelper = loadIntFromWord(klass, klassLayoutHelperOffset());
             if ((layoutHelper & arrayKlassLayoutHelperIdentifier()) != 0) {
-                return (Class<?>) loadObjectFromWord(klass, arrayKlassComponentMirrorOffset());
+                return unsafeCast(loadObjectFromWord(klass, arrayKlassComponentMirrorOffset()), Class.class, true, true);
             }
         }
         return null;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ObjectSnippets.java	Tue Dec 18 17:58:08 2012 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ObjectSnippets.java	Tue Dec 18 17:59:03 2012 +0100
@@ -23,6 +23,7 @@
 package com.oracle.graal.hotspot.snippets;
 
 import static com.oracle.graal.hotspot.snippets.HotSpotSnippetUtils.*;
+import static com.oracle.graal.nodes.extended.UnsafeCastNode.*;
 
 import com.oracle.graal.hotspot.nodes.*;
 import com.oracle.graal.snippets.*;
@@ -36,7 +37,7 @@
     @MethodSubstitution(isStatic = false)
     public static Class<?> getClass(final Object thisObj) {
         Word hub = loadHub(thisObj);
-        return (Class<?>) readFinalObject(hub, classMirrorOffset());
+        return unsafeCast(readFinalObject(hub, classMirrorOffset()), Class.class, true, true);
     }
 
     @MethodSubstitution(isStatic = false)