# HG changeset patch # User Andreas Woess # Date 1433372400 -7200 # Node ID fb9f7fe346247968b10ef2669031639686d47445 # Parent 454a99ca00a97716cfe795b2aa39e97d651b9a2b Backed out changeset: 5db03b62b621 diff -r 454a99ca00a9 -r fb9f7fe34624 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Wed Jun 03 22:13:10 2015 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Thu Jun 04 01:00:00 2015 +0200 @@ -143,30 +143,6 @@ } } - private class InterceptLoadFieldPlugin implements NodePlugin { - public boolean handleLoadField(GraphBuilderContext builder, ValueNode receiver, ResolvedJavaField field) { - if (receiver.isConstant()) { - JavaConstant asJavaConstant = receiver.asJavaConstant(); - return tryConstantFold(builder, field, asJavaConstant); - } - return false; - } - - public boolean handleLoadStaticField(GraphBuilderContext builder, ResolvedJavaField field) { - return tryConstantFold(builder, field, null); - } - - private boolean tryConstantFold(GraphBuilderContext b, ResolvedJavaField field, JavaConstant object) { - JavaConstant result = providers.getConstantReflection().readConstantFieldValue(field, object); - if (result != null) { - ConstantNode constantNode = ConstantNode.forConstant(result, providers.getMetaAccess(), b.getGraph()); - b.push(field.getKind(), constantNode); - return true; - } - return false; - } - } - private class PEInlineInvokePlugin implements InlineInvokePlugin { private Deque inlining; @@ -297,7 +273,6 @@ newConfig.setUseProfiling(false); Plugins plugins = newConfig.getPlugins(); plugins.prependParameterPlugin(new InterceptReceiverPlugin(callTarget)); - plugins.prependNodePlugin(new InterceptLoadFieldPlugin()); callTarget.setInlining(new TruffleInlining(callTarget, new DefaultInliningPolicy())); plugins.setLoopExplosionPlugin(new PELoopExplosionPlugin());