Mercurial > hg > truffle
comparison graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GraphBuilderPhase.java @ 2952:ec86f14be4cf
removed System.out and System.err rewiring in Sandbox, removed duplicate deopts in GraphBuilderPhase
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Wed, 15 Jun 2011 09:50:02 +0200 |
parents | 0c0e407faa39 |
children | cbece91420af |
comparison
equal
deleted
inserted
replaced
2951:0c0e407faa39 | 2952:ec86f14be4cf |
---|---|
818 CiKind kind = field.kind(); | 818 CiKind kind = field.kind(); |
819 if (container != null) { | 819 if (container != null) { |
820 LoadField load = new LoadField(container, field, graph); | 820 LoadField load = new LoadField(container, field, graph); |
821 appendOptimizedLoadField(kind, load); | 821 appendOptimizedLoadField(kind, load); |
822 } else { | 822 } else { |
823 append(new Deoptimize(DeoptAction.InvalidateRecompile, graph)); | 823 // deopt will be generated by genTypeOrDeopt, not needed here |
824 frameState.push(kind.stackKind(), append(Constant.defaultForKind(kind, graph))); | 824 frameState.push(kind.stackKind(), append(Constant.defaultForKind(kind, graph))); |
825 } | 825 } |
826 } | 826 } |
827 } | 827 } |
828 | 828 |
832 Value value = frameState.pop(field.kind().stackKind()); | 832 Value value = frameState.pop(field.kind().stackKind()); |
833 if (container != null) { | 833 if (container != null) { |
834 StoreField store = new StoreField(container, field, value, graph); | 834 StoreField store = new StoreField(container, field, value, graph); |
835 appendOptimizedStoreField(store); | 835 appendOptimizedStoreField(store); |
836 } else { | 836 } else { |
837 append(new Deoptimize(DeoptAction.InvalidateRecompile, graph)); | 837 // deopt will be generated by genTypeOrDeopt, not needed here |
838 } | 838 } |
839 } | 839 } |
840 | 840 |
841 private Value genTypeOrDeopt(RiType.Representation representation, RiType holder, boolean initialized, int cpi) { | 841 private Value genTypeOrDeopt(RiType.Representation representation, RiType holder, boolean initialized, int cpi) { |
842 if (initialized) { | 842 if (initialized) { |