Mercurial > hg > graal-compiler
changeset 9527:f49e1f023f7d
Merge
author | Christian Wimmer <christian.wimmer@oracle.com> |
---|---|
date | Thu, 02 May 2013 12:13:51 -0700 |
parents | ae5cd887e67c (current diff) f63750de9dc9 (diff) |
children | 2c540cdf4af9 6fed251e3cee |
files | |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameDescriptor.java Thu May 02 12:12:51 2013 -0700 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameDescriptor.java Thu May 02 12:13:51 2013 -0700 @@ -50,7 +50,7 @@ } public FrameSlot addFrameSlot(Object identifier) { - return addFrameSlot(identifier, null); + return addFrameSlot(identifier, FrameSlotKind.Illegal); } public FrameSlot addFrameSlot(Object identifier, FrameSlotKind kind) {
--- a/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java Thu May 02 12:12:51 2013 -0700 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java Thu May 02 12:13:51 2013 -0700 @@ -98,7 +98,12 @@ private static String getJsHelperText() { InputStream is = null; - StringBuilder sb = new StringBuilder("importPackage(Packages.com.sun.hotspot.igv.filter);importPackage(Packages.com.sun.hotspot.igv.graph);importPackage(Packages.com.sun.hotspot.igv.data);importPackage(Packages.com.sun.hotspot.igv.util);importPackage(java.awt);"); + StringBuilder sb = new StringBuilder("if (typeof importPackage === 'undefined') { try { load('nashorn:mozilla_compat.js'); } catch (e) {} }" + + "importPackage(Packages.com.sun.hotspot.igv.filter);" + + "importPackage(Packages.com.sun.hotspot.igv.graph);" + + "importPackage(Packages.com.sun.hotspot.igv.data);" + + "importPackage(Packages.com.sun.hotspot.igv.util);" + + "importPackage(java.awt);"); try { FileObject fo = FileUtil.getConfigRoot().getFileObject(JAVASCRIPT_HELPER_ID); is = fo.getInputStream();