Mercurial > hg > truffle
changeset 5119:352a95d5031c
minor cleanups after merge
| author | Christian Haeubl <christian.haeubl@oracle.com> |
|---|---|
| date | Mon, 19 Mar 2012 16:22:57 -0700 |
| parents | e5427faad192 |
| children | 37e75b4de85e |
| files | graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SafeReadNode.java src/share/vm/runtime/vmStructs.cpp |
| diffstat | 3 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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.*;
--- 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)*/ \