Mercurial > hg > graal-jvmci-8
diff graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java @ 2540:3fc322165071
More flags clean up.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Wed, 27 Apr 2011 20:27:43 +0200 |
parents | e1ba5a93e997 |
children | c58a301eb2d7 |
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Wed Apr 27 20:22:05 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java Wed Apr 27 20:27:43 2011 +0200 @@ -732,22 +732,20 @@ void genGetField(int cpi, RiField field) { // Must copy the state here, because the field holder must still be on the stack. FrameState stateBefore = curState.immutableCopy(bci()); - boolean isLoaded = !C1XOptions.TestPatching && field.isResolved(); - LoadField load = new LoadField(apop(), field, stateBefore, isLoaded); + LoadField load = new LoadField(apop(), field, stateBefore); appendOptimizedLoadField(field.kind(), load); } void genPutField(int cpi, RiField field) { // Must copy the state here, because the field holder must still be on the stack. FrameState stateBefore = curState.immutableCopy(bci()); - boolean isLoaded = !C1XOptions.TestPatching && field.isResolved(); Value value = pop(field.kind().stackKind()); - appendOptimizedStoreField(new StoreField(apop(), field, value, stateBefore, isLoaded)); + appendOptimizedStoreField(new StoreField(apop(), field, value, stateBefore)); } void genGetStatic(int cpi, RiField field) { RiType holder = field.holder(); - boolean isInitialized = !C1XOptions.TestPatching && field.isResolved() && holder.isResolved() && holder.isInitialized(); + boolean isInitialized = !C1XOptions.TestPatching && field.isResolved(); CiConstant constantValue = null; if (isInitialized) { constantValue = field.constantValue(null); @@ -755,18 +753,17 @@ if (constantValue != null) { push(constantValue.kind.stackKind(), appendConstant(constantValue)); } else { - Value container = genResolveClass(RiType.Representation.StaticFields, holder, isInitialized, cpi); - LoadField load = new LoadField(container, field, null, isInitialized); + Value container = genResolveClass(RiType.Representation.StaticFields, holder, field.isResolved(), cpi); + LoadField load = new LoadField(container, field, null); appendOptimizedLoadField(field.kind(), load); } } void genPutStatic(int cpi, RiField field) { RiType holder = field.holder(); - boolean isInitialized = !C1XOptions.TestPatching && field.isResolved() && holder.isResolved() && holder.isInitialized(); - Value container = genResolveClass(RiType.Representation.StaticFields, holder, isInitialized, cpi); + Value container = genResolveClass(RiType.Representation.StaticFields, holder, field.isResolved(), cpi); Value value = pop(field.kind().stackKind()); - StoreField store = new StoreField(container, field, value, null, isInitialized); + StoreField store = new StoreField(container, field, value, null); appendOptimizedStoreField(store); }