# HG changeset patch
# User Christian Haeubl <christian.haeubl@oracle.com>
# Date 1332199377 25200
# Node ID 352a95d5031c6e0fecf00461a9f70c4152ff589b
# Parent  e5427faad19245844bda3e46f8284b95c84eb082
minor cleanups after merge

diff -r e5427faad192 -r 352a95d5031c graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java	Mon Mar 19 15:51:49 2012 -0700
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java	Mon Mar 19 16:22:57 2012 -0700
@@ -50,7 +50,7 @@
     public BooleanNode condition() {
         return condition;
     }
-    
+
     public void setCondition(BooleanNode x) {
         updateUsages(condition, x);
         condition = x;
diff -r e5427faad192 -r 352a95d5031c graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java	Mon Mar 19 15:51:49 2012 -0700
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java	Mon Mar 19 16:22:57 2012 -0700
@@ -27,7 +27,6 @@
 import com.oracle.graal.nodes.calc.*;
 import com.oracle.graal.nodes.spi.*;
 import com.oracle.graal.nodes.type.*;
-import com.oracle.max.cri.ci.*;
 import com.oracle.max.cri.ri.*;
 
 
diff -r e5427faad192 -r 352a95d5031c src/share/vm/runtime/vmStructs.cpp
--- a/src/share/vm/runtime/vmStructs.cpp	Mon Mar 19 15:51:49 2012 -0700
+++ b/src/share/vm/runtime/vmStructs.cpp	Mon Mar 19 16:22:57 2012 -0700
@@ -2452,6 +2452,7 @@
   declare_constant(Location::on_stack)                                    \
   declare_constant(Location::in_register)                                 \
                                                                           \
+  /* TODO (chaeubl) those constants should be graal/c1/c2 specific */         \
   /*declare_constant(Deoptimization::Reason_many)*/                           \
   /*declare_constant(Deoptimization::Reason_none)*/                           \
   /*declare_constant(Deoptimization::Reason_null_check)*/                     \