# HG changeset patch # User Thomas Wuerthinger # Date 1424006881 -3600 # Node ID 1a9d5e9ab0f4333db193bda4bca812452c87458f # Parent 2ff3a30501da764a0aead147ba5ffb5b210a9bd7 Fix "materialize" Truffle graph builder plugins. diff -r 2ff3a30501da -r 1a9d5e9ab0f4 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java Sat Feb 14 21:34:37 2015 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java Sun Feb 15 14:28:01 2015 +0100 @@ -138,7 +138,7 @@ }); r.register1("materialize", Object.class, new InvocationPlugin() { public boolean apply(GraphBuilderContext builder, ValueNode value) { - builder.append(new ForceMaterializeNode(value)); + builder.push(Kind.Object, builder.append(new ForceMaterializeNode(value))); return true; } }); @@ -156,7 +156,7 @@ r = new Registration(plugins, metaAccess, FrameWithoutBoxing.class); r.register1("materialize", Receiver.class, new InvocationPlugin() { public boolean apply(GraphBuilderContext builder, ValueNode frame) { - builder.append(new MaterializeFrameNode(frame)); + builder.push(Kind.Object, builder.append(new MaterializeFrameNode(frame))); return true; } });