changeset 19486:b53645225e48

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 18 Feb 2015 20:20:46 +0100
parents 82475095334f (current diff) bd2dd97f2bdb (diff)
children fb38e004503c
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java	Wed Feb 18 19:39:22 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java	Wed Feb 18 20:20:46 2015 +0100
@@ -171,7 +171,7 @@
         });
         r.register1("materialize", Object.class, new InvocationPlugin() {
             public boolean apply(GraphBuilderContext builder, ValueNode value) {
-                builder.push(Kind.Object, builder.append(new ForceMaterializeNode(value)));
+                builder.append(new ForceMaterializeNode(value));
                 return true;
             }
         });