changeset 2860:e1be0d206934

Merge.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Tue, 07 Jun 2011 16:13:22 +0200
parents a4fbfbc3c858 (current diff) b20f0a48fec3 (diff)
children 29d33aac5ae3 4f64bd98f9dc 5c545fef2c81
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/And.java	Tue Jun 07 16:13:08 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/And.java	Tue Jun 07 16:13:22 2011 +0200
@@ -47,7 +47,7 @@
 
     @Override
     public Node copy(Graph into) {
-        And x = new And(kind, x(), y(), graph());
+        And x = new And(kind, null, null, graph());
         return x;
     }
 
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/Or.java	Tue Jun 07 16:13:08 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/Or.java	Tue Jun 07 16:13:22 2011 +0200
@@ -50,7 +50,7 @@
 
     @Override
     public Node copy(Graph into) {
-        Or x = new Or(kind, x(), y(), graph());
+        Or x = new Or(kind, null, null, graph());
         return x;
     }