# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1360089969 -3600
# Node ID cb820e70ecef1ceaaf0f6b44a11e7b7b825e607a
# Parent  8b7996916df607573411384a4ba4e333752eef05# Parent  cf27135ccf5b36a15b690493f4bdd79acf8e6492
Merge.

diff -r cf27135ccf5b -r cb820e70ecef graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java
--- 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;
             }
diff -r cf27135ccf5b -r cb820e70ecef graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/ControlFlowException.java
--- 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;
     }
 }
diff -r cf27135ccf5b -r cb820e70ecef graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/UnexpectedResultException.java
--- 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;
     }
 }