Mercurial > hg > truffle

changeset 4612:d8ff6f2bcabd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use parameters in graph group names for the visualizer so that successive compilation of methods with same name but different signature don't get fused Made CFGPrinterObserver a bit more robust to failed schedule When an exception occurs while intercepting exception, this new exception should be seen
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Feb 2012 20:05:06 +0100
parents d8a09bbba79a
children 09402dddc51e
files graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/DebugScope.java graal/com.oracle.max.graal.printer/src/com/oracle/max/graal/printer/CFGPrinterObserver.java graal/com.oracle.max.graal.printer/src/com/oracle/max/graal/printer/IdealGraphPrinterDumpHandler.java
diffstat 3 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/DebugScope.java	Tue Feb 14 11:32:21 2012 +0100
+++ b/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/DebugScope.java	Wed Feb 15 20:05:06 2012 +0100
@@ -185,7 +185,7 @@
                     try {
                         return config.interceptException(e);
                     } catch (Throwable t) {
-                        return new RuntimeException("Exception while intercepting exception", e);
+                        return new RuntimeException("Exception while intercepting exception", t);
                     }
                 }
             }, false, new Object[] {e});
--- a/graal/com.oracle.max.graal.printer/src/com/oracle/max/graal/printer/CFGPrinterObserver.java	Tue Feb 14 11:32:21 2012 +0100
+++ b/graal/com.oracle.max.graal.printer/src/com/oracle/max/graal/printer/CFGPrinterObserver.java	Wed Feb 15 20:05:06 2012 +0100
@@ -112,10 +112,13 @@
                     curSchedule = new SchedulePhase();
                     curSchedule.apply((StructuredGraph) object);
                 } catch (Throwable ex) {
+                    curSchedule = null;
                     // ignore
                 }
             }
-            cfgPrinter.printCFG(message, Arrays.asList(curSchedule.getCFG().getBlocks()), curSchedule);
+            if (curSchedule != null && curSchedule.getCFG() != null) {
+                cfgPrinter.printCFG(message, Arrays.asList(curSchedule.getCFG().getBlocks()), curSchedule);
+            }
 
         } else if (object instanceof CiTargetMethod) {
             cfgPrinter.printMachineCode(runtime.disassemble((CiTargetMethod) object), null);
--- a/graal/com.oracle.max.graal.printer/src/com/oracle/max/graal/printer/IdealGraphPrinterDumpHandler.java	Tue Feb 14 11:32:21 2012 +0100
+++ b/graal/com.oracle.max.graal.printer/src/com/oracle/max/graal/printer/IdealGraphPrinterDumpHandler.java	Wed Feb 15 20:05:06 2012 +0100
@@ -151,7 +151,7 @@
         for (Object o : Debug.context()) {
             if (o instanceof RiResolvedMethod) {
                 RiResolvedMethod method = (RiResolvedMethod) o;
-                result.add(CiUtil.format("%H::%n", method));
+                result.add(CiUtil.format("%H::%n(%p)", method));
             } else if (o instanceof DebugDumpScope) {
                 DebugDumpScope debugDumpScope = (DebugDumpScope) o;
                 result.add(debugDumpScope.getName());