Mercurial > hg > truffle

diff graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLStackTraceBuiltin.java @ 15097:a1b0d7a1ef40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SL: Make SLStackTraceBuilting comfortable with non-graal runtimes.
author Christian Humer <christian.humer@gmail.com>
date Mon, 14 Apr 2014 22:36:42 +0200
parents d3add9b82b71
children a3b0ecef8a15
line wrap: on
line diff
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLStackTraceBuiltin.java	Mon Apr 14 22:36:16 2014 +0200
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/builtins/SLStackTraceBuiltin.java	Mon Apr 14 22:36:42 2014 +0200
@@ -45,8 +45,12 @@
     @SlowPath
     private static String createStackTrace() {
         StringBuilder str = new StringBuilder();
-        for (FrameInstance frame : Truffle.getRuntime().getStackTrace()) {
-            dumpFrame(str, frame.getCallTarget(), frame.getFrame(FrameAccess.READ_ONLY, true), frame.isVirtualFrame());
+        Iterable<FrameInstance> frames = Truffle.getRuntime().getStackTrace();
+
+        if (frames != null) {
+            for (FrameInstance frame : frames) {
+                dumpFrame(str, frame.getCallTarget(), frame.getFrame(FrameAccess.READ_ONLY, true), frame.isVirtualFrame());
+            }
         }
         return str.toString();
     }