# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1417030160 -3600
# Node ID 99bfecda9d2e7bff38b24bf9ed906b0cb7903b79
# Parent  21384a8fbb64f6cba0572d3194eed6ae48ddda97
expose raw metaspace value via HotSpotMetaspaceConstant

diff -r 21384a8fbb64 -r 99bfecda9d2e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCodeCacheProvider.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCodeCacheProvider.java	Wed Nov 26 20:18:03 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCodeCacheProvider.java	Wed Nov 26 20:29:20 2014 +0100
@@ -301,9 +301,9 @@
                 compressed = c.isCompressed();
                 raw = 0xDEADDEADDEADDEADL;
             } else if (constant instanceof HotSpotMetaspaceConstant) {
-                HotSpotMetaspaceConstantImpl meta = (HotSpotMetaspaceConstantImpl) constant;
-                compressed = meta.getKind() != target.wordKind;
-                raw = meta.asLong();
+                HotSpotMetaspaceConstant meta = (HotSpotMetaspaceConstant) constant;
+                compressed = meta.isCompressed();
+                raw = meta.rawValue();
             } else {
                 throw GraalInternalError.shouldNotReachHere();
             }
diff -r 21384a8fbb64 -r 99bfecda9d2e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstant.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstant.java	Wed Nov 26 20:18:03 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstant.java	Wed Nov 26 20:29:20 2014 +0100
@@ -34,4 +34,6 @@
     Constant uncompress(CompressEncoding encoding);
 
     HotSpotResolvedObjectType asResolvedJavaType();
+
+    long rawValue();
 }
diff -r 21384a8fbb64 -r 99bfecda9d2e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java	Wed Nov 26 20:18:03 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java	Wed Nov 26 20:29:20 2014 +0100
@@ -87,4 +87,8 @@
         }
         return null;
     }
+
+    public long rawValue() {
+        return asLong();
+    }
 }