Mercurial > hg > truffle

changeset 7732:cb820e70ecef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Feb 2013 19:46:09 +0100
parents 8b7996916df6 (diff) cf27135ccf5b (current diff)
children f6bf0f6a8431 77de316e40a4
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MaterializeNode.java
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java	Tue Feb 05 18:33:01 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java	Tue Feb 05 19:46:09 2013 +0100
@@ -232,7 +232,7 @@
         RuntimeException exception = new RuntimeException(cause.getMessage(), cause) {
 
             @Override
-            public synchronized Throwable fillInStackTrace() {
+            public final synchronized Throwable fillInStackTrace() {
                 setStackTrace(elements);
                 return this;
             }
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/ControlFlowException.java	Tue Feb 05 18:33:01 2013 +0100
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/ControlFlowException.java	Tue Feb 05 19:46:09 2013 +0100
@@ -39,8 +39,9 @@
     /**
      * For performance reasons, this exception does not record any stack trace information.
      */
+    @SuppressWarnings("sync-override")
     @Override
-    public synchronized Throwable fillInStackTrace() {
+    public final Throwable fillInStackTrace() {
         return null;
     }
 }
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/UnexpectedResultException.java	Tue Feb 05 18:33:01 2013 +0100
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/UnexpectedResultException.java	Tue Feb 05 19:46:09 2013 +0100
@@ -54,8 +54,9 @@
     /**
      * For performance reasons, this exception does not record any stack trace information.
      */
+    @SuppressWarnings("sync-override")
     @Override
-    public synchronized Throwable fillInStackTrace() {
+    public Throwable fillInStackTrace() {
         return null;
     }
 }