# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1415646972 -3600
# Node ID 58b7133cd0e1510d13161fabdd4e99ffca9461a4
# Parent  13273385abb5a9f973bc284a6f437f7eb84ae7b8# Parent  0459da9d94c002828a02c11d94b77117c8021ef7
Merge.

diff -r 13273385abb5 -r 58b7133cd0e1 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	Mon Nov 10 18:18:42 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCodeCacheProvider.java	Mon Nov 10 20:16:12 2014 +0100
@@ -312,7 +312,7 @@
 
     public String disassemble(InstalledCode code) {
         if (code.isValid()) {
-            long codeBlob = ((HotSpotInstalledCode) code).getAddress();
+            long codeBlob = code.getAddress();
             return runtime.getCompilerToVM().disassembleCodeBlob(codeBlob);
         }
         return null;