# HG changeset patch # User Christos Kotselidis # Date 1366205821 -7200 # Node ID f6a8efb8d1049ededb5542ffe3b3780f9c766b17 # Parent bc5c5336008bb3f694fda2e11a1da85bb78748f9 Better naming for WriteBarrierType get-functions diff -r bc5c5336008b -r f6a8efb8d104 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Wed Apr 17 11:02:23 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotRuntime.java Wed Apr 17 15:37:01 2013 +0200 @@ -563,7 +563,7 @@ HotSpotResolvedJavaField field = (HotSpotResolvedJavaField) storeField.field(); ValueNode object = storeField.isStatic() ? ConstantNode.forObject(field.getDeclaringClass().mirror(), this, graph) : storeField.object(); LocationNode location = LocationNode.create(field, field.getKind(), field.offset(), graph); - WriteBarrierType barrierType = getFieldStoreBarrier(storeField); + WriteBarrierType barrierType = getFieldStoreBarrierType(storeField); WriteNode memoryWrite = graph.add(new WriteNode(object, storeField.value(), location, barrierType)); memoryWrite.dependencies().add(tool.createNullCheckGuard(object)); memoryWrite.setStateAfter(storeField.stateAfter()); @@ -616,7 +616,7 @@ value = checkcast; } } - WriteBarrierType barrierType = getArrayStoreBarrier(storeIndexed); + WriteBarrierType barrierType = getArrayStoreBarrierType(storeIndexed); WriteNode memoryWrite = graph.add(new WriteNode(array, value, arrayLocation, barrierType)); memoryWrite.dependencies().add(boundsCheck); memoryWrite.setStateAfter(storeIndexed.stateAfter()); @@ -635,7 +635,7 @@ UnsafeStoreNode store = (UnsafeStoreNode) n; IndexedLocationNode location = IndexedLocationNode.create(LocationNode.ANY_LOCATION, store.accessKind(), store.displacement(), store.offset(), graph, 1); ValueNode object = store.object(); - WriteBarrierType barrierType = getUnsafeStoreBarrier(store); + WriteBarrierType barrierType = getUnsafeStoreBarrierType(store); WriteNode write = graph.add(new WriteNode(object, store.value(), location, barrierType)); write.setStateAfter(store.stateAfter()); graph.replaceFixedWithFixed(store, write); @@ -699,7 +699,7 @@ } } - private static WriteBarrierType getFieldStoreBarrier(StoreFieldNode storeField) { + private static WriteBarrierType getFieldStoreBarrierType(StoreFieldNode storeField) { WriteBarrierType barrierType = WriteBarrierType.NONE; if (storeField.field().getKind() == Kind.Object && !storeField.value().objectStamp().alwaysNull()) { barrierType = WriteBarrierType.IMPRECISE; @@ -707,7 +707,7 @@ return barrierType; } - private static WriteBarrierType getArrayStoreBarrier(StoreIndexedNode store) { + private static WriteBarrierType getArrayStoreBarrierType(StoreIndexedNode store) { WriteBarrierType barrierType = WriteBarrierType.NONE; if (store.elementKind() == Kind.Object && !store.value().objectStamp().alwaysNull()) { barrierType = WriteBarrierType.PRECISE; @@ -715,7 +715,7 @@ return barrierType; } - private static WriteBarrierType getUnsafeStoreBarrier(UnsafeStoreNode store) { + private static WriteBarrierType getUnsafeStoreBarrierType(UnsafeStoreNode store) { WriteBarrierType barrierType = WriteBarrierType.NONE; if (store.value().kind() == Kind.Object && !store.value().objectStamp().alwaysNull()) { ResolvedJavaType type = store.object().objectStamp().type();