Mercurial > hg > truffle
changeset 9551:71330feed39d
Merge (fixed: f63750de9dc9 Preliminary Nashorn support in IGV)
| author | Lukas Stadler <lukas.stadler@jku.at> |
|---|---|
| date | Fri, 03 May 2013 20:26:24 +0200 |
| parents | 49b2c7b65e62 (current diff) f63750de9dc9 (diff) |
| children | 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 Fri May 03 20:25:58 2013 +0200 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameDescriptor.java Fri May 03 20:26:24 2013 +0200 @@ -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 Fri May 03 20:25:58 2013 +0200 +++ b/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java Fri May 03 20:26:24 2013 +0200 @@ -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();