Mercurial > hg > truffle

changeset 14929:de31e0f56fe7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't try to disassemble deoptimized/invalidated nmethods
author Doug Simon <doug.simon@oracle.com>
date Tue, 01 Apr 2014 22:46:52 +0200
parents 302d7b447d38
children 5c7718ae8c86
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCodeCacheProvider.java
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCodeCacheProvider.java	Tue Apr 01 19:49:51 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCodeCacheProvider.java	Tue Apr 01 22:46:52 2014 +0200
@@ -113,6 +113,10 @@
     @Override
     public String disassemble(CompilationResult compResult, InstalledCode installedCode) {
         byte[] code = installedCode == null ? Arrays.copyOf(compResult.getTargetCode(), compResult.getTargetCodeSize()) : installedCode.getCode();
+        if (code == null) {
+            // Method was deoptimized/invalidated
+            return "";
+        }
         long start = installedCode == null ? 0L : installedCode.getStart();
         HexCodeFile hcf = new HexCodeFile(code, start, target.arch.getName(), target.wordSize * 8);
         if (compResult != null) {