Mercurial > hg > truffle
changeset 14633:da2431cc1506
Rename ValueNode kind() to getKind().
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64LIRGenerator.java Thu Mar 20 11:48:39 2014 +0100 @@ -361,7 +361,7 @@ @Override public void emitNullCheck(ValueNode v, DeoptimizingNode deopt) { - assert v.kind() == Kind.Object : v + " - " + v.stamp() + " @ " + deopt; + assert v.getKind() == Kind.Object : v + " - " + v.stamp() + " @ " + deopt; append(new AMD64Move.NullCheckOp(load(operand(v)), state(deopt))); }
--- a/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXLIRGenerator.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXLIRGenerator.java Thu Mar 20 11:48:39 2014 +0100 @@ -926,7 +926,7 @@ @Override public void emitNullCheck(ValueNode v, DeoptimizingNode deopting) { - assert v.kind() == Kind.Object; + assert v.getKind() == Kind.Object; append(new PTXMove.NullCheckOp(load(operand(v)), state(deopting))); } @@ -983,7 +983,7 @@ public void visitReturn(ReturnNode x) { AllocatableValue operand = Value.ILLEGAL; if (x.result() != null) { - operand = resultOperandFor(x.result().kind()); + operand = resultOperandFor(x.result().getKind()); // Load the global memory address from return parameter Variable loadVar = emitLoadReturnAddress(operand.getKind(), operand, null); // Store result in global memory whose location is loadVar
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java Thu Mar 20 11:48:39 2014 +0100 @@ -941,7 +941,7 @@ @Override public void emitNullCheck(ValueNode v, DeoptimizingNode deopting) { - assert v.kind() == Kind.Object; + assert v.getKind() == Kind.Object; append(new NullCheckOp(load(operand(v)), state(deopting))); }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/CompiledMethodTest.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/deopt/CompiledMethodTest.java Thu Mar 20 11:48:39 2014 +0100 @@ -59,7 +59,7 @@ new DeadCodeEliminationPhase().apply(graph); for (ConstantNode node : ConstantNode.getConstantNodes(graph)) { - if (node.kind() == Kind.Object && " ".equals(node.getValue().asObject())) { + if (node.getKind() == Kind.Object && " ".equals(node.getValue().asObject())) { node.replace(graph, ConstantNode.forObject("-", getMetaAccess(), graph)); } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/DebugInfoBuilder.java Thu Mar 20 11:48:39 2014 +0100 @@ -89,7 +89,7 @@ if (!currentField.fieldValues().get(i).isConstant() || currentField.fieldValues().get(i).asConstant().getKind() != Kind.Illegal) { values[pos++] = toValue(currentField.fieldValues().get(i)); } else { - assert currentField.fieldValues().get(i - 1).kind() == Kind.Double || currentField.fieldValues().get(i - 1).kind() == Kind.Long : vobj + " " + i + " " + + assert currentField.fieldValues().get(i - 1).getKind() == Kind.Double || currentField.fieldValues().get(i - 1).getKind() == Kind.Long : vobj + " " + i + " " + currentField.fieldValues().get(i - 1); } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Thu Mar 20 11:48:39 2014 +0100 @@ -309,7 +309,7 @@ assert (!isRegister(operand) || !attributes(asRegister(operand)).isAllocatable()); assert nodeOperands == null || nodeOperands.get(x) == null : "operand cannot be set twice"; assert operand != null && isLegal(operand) : "operand must be legal"; - assert operand.getKind().getStackKind() == x.kind() || x.kind() == Kind.Illegal : operand.getKind().getStackKind() + " must match " + x.kind(); + assert operand.getKind().getStackKind() == x.getKind() || x.getKind() == Kind.Illegal : operand.getKind().getStackKind() + " must match " + x.getKind(); assert !(x instanceof VirtualObjectNode); nodeOperands.set(x, operand); return operand; @@ -540,7 +540,7 @@ for (ParameterNode param : graph.getNodes(ParameterNode.class)) { Value paramValue = params[param.index()]; - assert paramValue.getKind() == param.kind().getStackKind(); + assert paramValue.getKind() == param.getKind().getStackKind(); setResult(param, emitMove(paramValue)); } } @@ -553,7 +553,7 @@ public void visitReturn(ReturnNode x) { AllocatableValue operand = ILLEGAL; if (x.result() != null) { - operand = resultOperandFor(x.result().kind()); + operand = resultOperandFor(x.result().getKind()); emitMove(operand, operand(x.result())); } emitReturn(operand); @@ -594,7 +594,7 @@ } protected PlatformKind getPhiKind(PhiNode phi) { - return phi.kind(); + return phi.getKind(); } private Value operandForPhi(PhiNode phi) {
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Thu Mar 20 11:48:39 2014 +0100 @@ -180,7 +180,7 @@ for (ParameterNode param : graph.getNodes(ParameterNode.class)) { Value paramValue = params[param.index()]; - assert paramValue.getKind() == param.kind().getStackKind(); + assert paramValue.getKind() == param.getKind().getStackKind(); setResult(param, emitMove(paramValue)); } } @@ -316,8 +316,8 @@ @SuppressWarnings("hiding") @Override public void visitDirectCompareAndSwap(DirectCompareAndSwapNode x) { - Kind kind = x.newValue().kind(); - assert kind == x.expectedValue().kind(); + Kind kind = x.newValue().getKind(); + assert kind == x.expectedValue().getKind(); Value expected = loadNonConst(operand(x.expectedValue())); Variable newVal = load(operand(x.newValue())); @@ -337,7 +337,7 @@ emitMove(rax, expected); append(new CompareAndSwapOp(rax, address, rax, newVal)); - Variable result = newVariable(x.kind()); + Variable result = newVariable(x.getKind()); emitMove(result, rax); setResult(x, result); } @@ -562,8 +562,8 @@ @Override public void visitCompareAndSwap(LoweredCompareAndSwapNode node, Value address) { - Kind kind = node.getNewValue().kind(); - assert kind == node.getExpectedValue().kind(); + Kind kind = node.getNewValue().getKind(); + assert kind == node.getExpectedValue().getKind(); Value expected = loadNonConst(operand(node.getExpectedValue())); Variable newValue = load(operand(node.getNewValue())); AMD64AddressValue addressValue = asAddressValue(address); @@ -576,7 +576,7 @@ } else { append(new CompareAndSwapOp(raxRes, addressValue, raxRes, newValue)); } - Variable result = newVariable(node.kind()); + Variable result = newVariable(node.getKind()); append(new CondMoveOp(result, Condition.EQ, load(Constant.TRUE), Constant.FALSE)); setResult(node, result); }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64RawNativeCallNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64RawNativeCallNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -55,7 +55,7 @@ ResolvedJavaType returnType = stamp().javaType(gen.getMetaAccess()); CallingConvention cc = generator.getCodeCache().getRegisterConfig().getCallingConvention(Type.NativeCall, returnType, parameterTypes, generator.target(), false); gen.emitCCall(functionPointer.asLong(), cc, parameter, countFloatingTypeArguments(args)); - if (this.kind() != Kind.Void) { + if (this.getKind() != Kind.Void) { generator.setResult(this, gen.emitMove(cc.getReturn())); } } @@ -63,7 +63,7 @@ private static int countFloatingTypeArguments(NodeInputList<ValueNode> args) { int count = 0; for (ValueNode n : args) { - if (n.kind() == Kind.Double || n.kind() == Kind.Float) { + if (n.getKind() == Kind.Double || n.getKind() == Kind.Float) { count++; } }
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLIRGenerator.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLIRGenerator.java Thu Mar 20 11:48:39 2014 +0100 @@ -98,8 +98,8 @@ */ @Override public void visitCompareAndSwap(LoweredCompareAndSwapNode node, Value address) { - Kind kind = node.getNewValue().kind(); - assert kind == node.getExpectedValue().kind(); + Kind kind = node.getNewValue().getKind(); + assert kind == node.getExpectedValue().getKind(); Variable expected = load(operand(node.getExpectedValue())); Variable newValue = load(operand(node.getNewValue())); HSAILAddressValue addressValue = asAddressValue(address); @@ -117,7 +117,7 @@ } else { append(new CompareAndSwapOp(casResult, addressValue, expected, newValue)); } - Variable nodeResult = newVariable(node.kind()); + Variable nodeResult = newVariable(node.getKind()); append(new CondMoveOp(mapKindToCompareOp(kind), casResult, expected, nodeResult, Condition.EQ, Constant.INT_1, Constant.INT_0)); setResult(node, nodeResult); }
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXWrapperBuilder.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXWrapperBuilder.java Thu Mar 20 11:48:39 2014 +0100 @@ -235,7 +235,7 @@ for (javaParametersIndex = 0; javaParametersIndex < javaParameters.length; javaParametersIndex++) { ParameterNode javaParameter = javaParameters[javaParametersIndex]; int javaParameterOffset = javaParameterOffsetsInKernelParametersBuffer[javaParametersIndex]; - LocationNode location = ConstantLocationNode.create(FINAL_LOCATION, javaParameter.kind(), javaParameterOffset, getGraph()); + LocationNode location = ConstantLocationNode.create(FINAL_LOCATION, javaParameter.getKind(), javaParameterOffset, getGraph()); append(new WriteNode(buf, javaParameter, location, BarrierType.NONE, false, false)); updateDimArg(method, sig, sigIndex++, args, javaParameter); }
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerator.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotLIRGenerator.java Thu Mar 20 11:48:39 2014 +0100 @@ -125,8 +125,8 @@ @Override public void visitDirectCompareAndSwap(DirectCompareAndSwapNode x) { - Kind kind = x.newValue().kind(); - assert kind == x.expectedValue().kind(); + Kind kind = x.newValue().getKind(); + assert kind == x.expectedValue().getKind(); Variable address = load(operand(x.object())); Value offset = operand(x.offset()); @@ -146,7 +146,7 @@ append(new CompareAndSwapOp(address, cmpValue, newValue)); - Variable result = newVariable(x.kind()); + Variable result = newVariable(x.getKind()); emitMove(result, newValue); setResult(x, result); }
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Thu Mar 20 11:48:39 2014 +0100 @@ -67,7 +67,7 @@ public void testStaticFinalObjectAOT() { StructuredGraph result = compile("getStaticFinalObject", true); assertEquals(1, getConstantNodes(result).count()); - assertEquals(getCodeCache().getTarget().wordKind, getConstantNodes(result).first().kind()); + assertEquals(getCodeCache().getTarget().wordKind, getConstantNodes(result).first().getKind()); assertEquals(2, result.getNodes(FloatingReadNode.class).count()); assertEquals(0, result.getNodes().filter(ReadNode.class).count()); } @@ -76,7 +76,7 @@ public void testStaticFinalObject() { StructuredGraph result = compile("getStaticFinalObject", false); assertEquals(1, getConstantNodes(result).count()); - assertEquals(Kind.Object, getConstantNodes(result).first().kind()); + assertEquals(Kind.Object, getConstantNodes(result).first().getKind()); assertEquals(0, result.getNodes(FloatingReadNode.class).count()); assertEquals(0, result.getNodes().filter(ReadNode.class).count()); } @@ -121,7 +121,7 @@ StructuredGraph result = compile("getPrimitiveClassObject", true); NodeIterable<ConstantNode> filter = getConstantNodes(result); assertEquals(1, filter.count()); - assertEquals(getCodeCache().getTarget().wordKind, filter.first().kind()); + assertEquals(getCodeCache().getTarget().wordKind, filter.first().getKind()); assertEquals(2, result.getNodes(FloatingReadNode.class).count()); assertEquals(0, result.getNodes().filter(ReadNode.class).count()); @@ -181,7 +181,7 @@ assertEquals(1, result.getNodes(PiNode.class).count()); assertEquals(1, getConstantNodes(result).count()); ConstantNode constant = getConstantNodes(result).first(); - assertEquals(Kind.Long, constant.kind()); + assertEquals(Kind.Long, constant.getKind()); assertEquals(((HotSpotResolvedObjectType) getMetaAccess().lookupJavaType(Boolean.class)).klass(), constant.asConstant()); } @@ -192,7 +192,7 @@ assertEquals(0, result.getNodes(PiNode.class).count()); assertEquals(1, getConstantNodes(result).count()); ConstantNode constant = getConstantNodes(result).first(); - assertEquals(Kind.Object, constant.kind()); + assertEquals(Kind.Object, constant.getKind()); assertEquals(Boolean.TRUE, constant.asConstant().asObject()); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotLoweringProvider.java Thu Mar 20 11:48:39 2014 +0100 @@ -259,9 +259,9 @@ StructuredGraph graph = loadField.graph(); HotSpotResolvedJavaField field = (HotSpotResolvedJavaField) loadField.field(); ValueNode object = loadField.isStatic() ? ConstantNode.forObject(field.getDeclaringClass().mirror(), metaAccess, graph) : loadField.object(); - assert loadField.kind() != Kind.Illegal; + assert loadField.getKind() != Kind.Illegal; BarrierType barrierType = getFieldLoadBarrierType(field); - ReadNode memoryRead = graph.add(new ReadNode(object, createFieldLocation(graph, field, false), loadField.stamp(), barrierType, (loadField.kind() == Kind.Object))); + ReadNode memoryRead = graph.add(new ReadNode(object, createFieldLocation(graph, field, false), loadField.stamp(), barrierType, (loadField.getKind() == Kind.Object))); graph.replaceFixedWithFixed(loadField, memoryRead); memoryRead.setGuard(createNullCheck(object, memoryRead, tool)); @@ -296,9 +296,9 @@ private static void lowerCompareAndSwapNode(CompareAndSwapNode cas) { // Separate out GC barrier semantics StructuredGraph graph = cas.graph(); - LocationNode location = IndexedLocationNode.create(cas.getLocationIdentity(), cas.expected().kind(), cas.displacement(), cas.offset(), graph, 1); + LocationNode location = IndexedLocationNode.create(cas.getLocationIdentity(), cas.expected().getKind(), cas.displacement(), cas.offset(), graph, 1); LoweredCompareAndSwapNode atomicNode = graph.add(new LoweredCompareAndSwapNode(cas.object(), location, cas.expected(), cas.newValue(), getCompareAndSwapBarrier(cas), - cas.expected().kind() == Kind.Object)); + cas.expected().getKind() == Kind.Object)); atomicNode.setStateAfter(cas.stateAfter()); graph.replaceFixedWithFixed(cas, atomicNode); } @@ -372,7 +372,7 @@ graph.replaceFixedWithFixed(load, valueAnchorNode); graph.addAfterFixed(valueAnchorNode, memoryRead); } else if (graph.getGuardsStage().ordinal() > StructuredGraph.GuardsStage.FLOATING_GUARDS.ordinal()) { - assert load.kind() != Kind.Illegal; + assert load.getKind() != Kind.Illegal; boolean compressible = (!load.object().isNullConstant() && load.accessKind() == Kind.Object); if (addReadBarrier(load)) { unsafeLoadSnippets.lower(load, tool); @@ -392,7 +392,7 @@ LocationNode location = createLocation(store); ValueNode object = store.object(); BarrierType barrierType = getUnsafeStoreBarrierType(store); - WriteNode write = graph.add(new WriteNode(object, store.value(), location, barrierType, store.value().kind() == Kind.Object)); + WriteNode write = graph.add(new WriteNode(object, store.value(), location, barrierType, store.value().getKind() == Kind.Object)); write.setStateAfter(store.stateAfter()); graph.replaceFixedWithFixed(store, write); } @@ -401,7 +401,7 @@ StructuredGraph graph = loadHub.graph(); if (graph.getGuardsStage().ordinal() >= StructuredGraph.GuardsStage.FIXED_DEOPTS.ordinal()) { Kind wordKind = runtime.getTarget().wordKind; - assert loadHub.kind() == wordKind; + assert loadHub.getKind() == wordKind; ValueNode object = loadHub.object(); GuardingNode guard = loadHub.getGuard(); FloatingReadNode hub = createReadHub(graph, wordKind, object, guard); @@ -447,7 +447,7 @@ omittedValues.set(valuePos); } else if (!(value.isConstant() && value.asConstant().isDefaultForKind())) { // Constant.illegal is always the defaultForKind, so it is skipped - Kind valueKind = value.kind(); + Kind valueKind = value.getKind(); Kind entryKind = virtual.entryKind(i); // Truffle requires some leniency in terms of what can be put where: @@ -483,7 +483,7 @@ assert value instanceof VirtualObjectNode; ValueNode allocValue = allocations[commit.getVirtualObjects().indexOf(value)]; if (!(allocValue.isConstant() && allocValue.asConstant().isDefaultForKind())) { - assert virtual.entryKind(i) == Kind.Object && allocValue.kind() == Kind.Object; + assert virtual.entryKind(i) == Kind.Object && allocValue.getKind() == Kind.Object; WriteNode write; if (virtual instanceof VirtualInstanceNode) { VirtualInstanceNode virtualInstance = (VirtualInstanceNode) virtual; @@ -520,9 +520,9 @@ // mirroring the calculations in c1_GraphBuilder.cpp (setup_osr_entry_block) int localsOffset = (graph.method().getMaxLocals() - 1) * 8; for (OSRLocalNode osrLocal : graph.getNodes(OSRLocalNode.class)) { - int size = FrameStateBuilder.stackSlots(osrLocal.kind()); + int size = FrameStateBuilder.stackSlots(osrLocal.getKind()); int offset = localsOffset - (osrLocal.index() + size - 1) * 8; - IndexedLocationNode location = IndexedLocationNode.create(ANY_LOCATION, osrLocal.kind(), offset, ConstantNode.forLong(0, graph), graph, 1); + IndexedLocationNode location = IndexedLocationNode.create(ANY_LOCATION, osrLocal.getKind(), offset, ConstantNode.forLong(0, graph), graph, 1); ReadNode load = graph.add(new ReadNode(buffer, location, osrLocal.stamp(), BarrierType.NONE, false)); osrLocal.replaceAndDelete(load); graph.addBeforeFixed(migrationEnd, load); @@ -606,7 +606,7 @@ } private static boolean addReadBarrier(UnsafeLoadNode load) { - if (useG1GC() && load.graph().getGuardsStage() == StructuredGraph.GuardsStage.FIXED_DEOPTS && load.object().kind() == Kind.Object && load.accessKind() == Kind.Object && + if (useG1GC() && load.graph().getGuardsStage() == StructuredGraph.GuardsStage.FIXED_DEOPTS && load.object().getKind() == Kind.Object && load.accessKind() == Kind.Object && !ObjectStamp.isObjectAlwaysNull(load.object())) { ResolvedJavaType type = ObjectStamp.typeOrNull(load.object()); if (type != null && !type.isArray()) { @@ -669,7 +669,7 @@ private static BarrierType getUnsafeStoreBarrierType(UnsafeStoreNode store) { BarrierType barrierType = BarrierType.NONE; - if (store.value().kind() == Kind.Object) { + if (store.value().getKind() == Kind.Object) { ResolvedJavaType type = ObjectStamp.typeOrNull(store.object()); if (type != null && !type.isArray()) { barrierType = BarrierType.IMPRECISE; @@ -682,7 +682,7 @@ private static BarrierType getCompareAndSwapBarrier(CompareAndSwapNode cas) { BarrierType barrierType = BarrierType.NONE; - if (cas.expected().kind() == Kind.Object) { + if (cas.expected().getKind() == Kind.Object) { ResolvedJavaType type = ObjectStamp.typeOrNull(cas.object()); if (type != null && !type.isArray()) { barrierType = BarrierType.IMPRECISE;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/NativeCallStubGraphBuilder.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/NativeCallStubGraphBuilder.java Thu Mar 20 11:48:39 2014 +0100 @@ -79,12 +79,12 @@ // box result BoxNode boxedResult; - if (callNode.kind() != Kind.Void) { - if (callNode.kind() == Kind.Object) { + if (callNode.getKind() != Kind.Void) { + if (callNode.getKind() == Kind.Object) { throw new IllegalArgumentException("Return type not supported: " + returnType.getName()); } - ResolvedJavaType type = providers.getMetaAccess().lookupJavaType(callNode.kind().toBoxedJavaClass()); - boxedResult = g.unique(new BoxNode(callNode, type, callNode.kind())); + ResolvedJavaType type = providers.getMetaAccess().lookupJavaType(callNode.getKind().toBoxedJavaClass()); + boxedResult = g.unique(new BoxNode(callNode, type, callNode.getKind())); } else { boxedResult = g.unique(new BoxNode(ConstantNode.forLong(0, g), providers.getMetaAccess().lookupJavaType(Long.class), Kind.Long)); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -43,7 +43,7 @@ @Override public void generate(LIRGeneratorTool gen) { Register rawThread = ((HotSpotLIRGenerator) gen).getProviders().getRegisters().getThreadRegister(); - gen.setResult(this, rawThread.asValue(this.kind())); + gen.setResult(this, rawThread.asValue(this.getKind())); } private static int eetopOffset() {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -67,7 +67,7 @@ JavaType[] signature = MetaUtil.signatureToTypes(method.getSignature(), isStatic ? null : method.getDeclaringClass()); CallingConvention cc = gen.frameMap().registerConfig.getCallingConvention(CallingConvention.Type.JavaCall, null, signature, gen.target(), false); List<ValueNode> parameters = new ArrayList<>(); - for (int i = 0, slot = 0; i < cc.getArgumentCount(); i++, slot += FrameStateBuilder.stackSlots(frameState.localAt(slot).kind())) { + for (int i = 0, slot = 0; i < cc.getArgumentCount(); i++, slot += FrameStateBuilder.stackSlots(frameState.localAt(slot).getKind())) { parameters.add(frameState.localAt(slot)); } Value[] args = gen.visitInvokeArguments(cc, parameters);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/AheadOfTimeVerificationPhase.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/phases/AheadOfTimeVerificationPhase.java Thu Mar 20 11:48:39 2014 +0100 @@ -51,7 +51,7 @@ } private static boolean isObject(ConstantNode node) { - return node.kind() == Kind.Object; + return node.getKind() == Kind.Object; } private static boolean isNullReference(ConstantNode node) {
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Thu Mar 20 11:48:39 2014 +0100 @@ -157,7 +157,7 @@ for (int i = 0; i < stackSize(); i++) { ValueNode x = stackAt(i); ValueNode y = other.stackAt(i); - if (x != y && (x == null || x.isDeleted() || y == null || y.isDeleted() || x.kind() != y.kind())) { + if (x != y && (x == null || x.isDeleted() || y == null || y.isDeleted() || x.getKind() != y.getKind())) { return false; } } @@ -192,7 +192,7 @@ return null; } else if (block.isPhiAtMerge(currentValue)) { - if (otherValue == null || otherValue.isDeleted() || currentValue.kind() != otherValue.kind()) { + if (otherValue == null || otherValue.isDeleted() || currentValue.getKind() != otherValue.getKind()) { propagateDelete((PhiNode) currentValue); return null; } @@ -201,7 +201,7 @@ } else if (currentValue != otherValue) { assert !(block instanceof LoopBeginNode) : "Phi functions for loop headers are create eagerly for all locals and stack slots"; - if (otherValue == null || otherValue.isDeleted() || currentValue.kind() != otherValue.kind()) { + if (otherValue == null || otherValue.isDeleted() || currentValue.getKind() != otherValue.getKind()) { return null; } @@ -392,7 +392,7 @@ * @param object the object whose monitor will be locked. */ public void pushLock(ValueNode object, MonitorIdNode monitorId) { - assert object.isAlive() && object.kind() == Kind.Object : "unexpected value: " + object; + assert object.isAlive() && object.getKind() == Kind.Object : "unexpected value: " + object; lockedObjects = Arrays.copyOf(lockedObjects, lockedObjects.length + 1); monitorIds = Arrays.copyOf(monitorIds, monitorIds.length + 1); lockedObjects[lockedObjects.length - 1] = object; @@ -436,8 +436,8 @@ public ValueNode loadLocal(int i) { ValueNode x = locals[i]; assert !x.isDeleted(); - assert !isTwoSlot(x.kind()) || locals[i + 1] == null; - assert i == 0 || locals[i - 1] == null || !isTwoSlot(locals[i - 1].kind()); + assert !isTwoSlot(x.getKind()) || locals[i + 1] == null; + assert i == 0 || locals[i - 1] == null || !isTwoSlot(locals[i - 1].getKind()); return x; } @@ -450,15 +450,15 @@ * @param x the instruction which produces the value for the local */ public void storeLocal(int i, ValueNode x) { - assert x == null || x.isAlive() && x.kind() != Kind.Void && x.kind() != Kind.Illegal : "unexpected value: " + x; + assert x == null || x.isAlive() && x.getKind() != Kind.Void && x.getKind() != Kind.Illegal : "unexpected value: " + x; locals[i] = x; - if (x != null && isTwoSlot(x.kind())) { + if (x != null && isTwoSlot(x.getKind())) { // if this is a double word, then kill i+1 locals[i + 1] = null; } if (x != null && i > 0) { ValueNode p = locals[i - 1]; - if (p != null && isTwoSlot(p.kind())) { + if (p != null && isTwoSlot(p.getKind())) { // if there was a double word at i - 1, then kill it locals[i - 1] = null; } @@ -466,7 +466,7 @@ } public void storeStack(int i, ValueNode x) { - assert x == null || x.isAlive() && (stack[i] == null || x.kind() == stack[i].kind()) : "Method does not handle changes from one-slot to two-slot values or non-alive values"; + assert x == null || x.isAlive() && (stack[i] == null || x.getKind() == stack[i].getKind()) : "Method does not handle changes from one-slot to two-slot values or non-alive values"; stack[i] = x; } @@ -477,7 +477,7 @@ * @param x the instruction to push onto the stack */ public void push(Kind kind, ValueNode x) { - assert x.isAlive() && x.kind() != Kind.Void && x.kind() != Kind.Illegal; + assert x.isAlive() && x.getKind() != Kind.Void && x.getKind() != Kind.Illegal; xpush(assertKind(kind, x)); if (isTwoSlot(kind)) { xpush(null); @@ -490,7 +490,7 @@ * @param x the instruction to push onto the stack */ public void xpush(ValueNode x) { - assert x == null || (x.isAlive() && x.kind() != Kind.Void && x.kind() != Kind.Illegal); + assert x == null || (x.isAlive() && x.getKind() != Kind.Void && x.getKind() != Kind.Illegal); stack[stackSize++] = x; } @@ -634,7 +634,7 @@ ValueNode element = stack[base + stackindex]; assert element != null; r[argIndex++] = element; - stackindex += stackSlots(element.kind()); + stackindex += stackSlots(element.getKind()); } stackSize = base; return r; @@ -653,7 +653,7 @@ for (int i = 0; i < argumentNumber; i++) { if (stackAt(idx) == null) { idx--; - assert isTwoSlot(stackAt(idx).kind()); + assert isTwoSlot(stackAt(idx).getKind()); } idx--; }
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Thu Mar 20 11:48:39 2014 +0100 @@ -313,7 +313,7 @@ if (kind == Kind.Object) { value = frameState.xpop(); // astore and astore_<n> may be used to store a returnAddress (jsr) - assert value.kind() == Kind.Object || value.kind() == Kind.Int; + assert value.getKind() == Kind.Object || value.getKind() == Kind.Int; } else { value = frameState.pop(kind); } @@ -767,15 +767,15 @@ ValueNode b = mirror ? x : y; CompareNode condition; - assert !a.kind().isNumericFloat(); + assert !a.getKind().isNumericFloat(); if (cond == Condition.EQ || cond == Condition.NE) { - if (a.kind() == Kind.Object) { + if (a.getKind() == Kind.Object) { condition = new ObjectEqualsNode(a, b); } else { condition = new IntegerEqualsNode(a, b); } } else { - assert a.kind() != Kind.Object && !cond.isUnsigned(); + assert a.getKind() != Kind.Object && !cond.isUnsigned(); condition = new IntegerLessThanNode(a, b); } condition = currentGraph.unique(condition); @@ -1696,7 +1696,7 @@ if (Modifier.isSynchronized(method.getModifiers())) { MonitorExitNode monitorExit = genMonitorExit(methodSynchronizedObject, returnValue); if (returnValue != null) { - frameState.push(returnValue.kind(), returnValue); + frameState.push(returnValue.getKind(), returnValue); } monitorExit.setStateAfter(frameState.create(bci)); assert !frameState.rethrowException(); @@ -1857,11 +1857,11 @@ Debug.log(String.format("| state [nr locals = %d, stack depth = %d, method = %s]", frameState.localsSize(), frameState.stackSize(), method)); for (int i = 0; i < frameState.localsSize(); ++i) { ValueNode value = frameState.localAt(i); - Debug.log(String.format("| local[%d] = %-8s : %s", i, value == null ? "bogus" : value.kind().getJavaName(), value)); + Debug.log(String.format("| local[%d] = %-8s : %s", i, value == null ? "bogus" : value.getKind().getJavaName(), value)); } for (int i = 0; i < frameState.stackSize(); ++i) { ValueNode value = frameState.stackAt(i); - Debug.log(String.format("| stack[%d] = %-8s : %s", i, value == null ? "bogus" : value.kind().getJavaName(), value)); + Debug.log(String.format("| stack[%d] = %-8s : %s", i, value == null ? "bogus" : value.getKind().getJavaName(), value)); } } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java Thu Mar 20 11:48:39 2014 +0100 @@ -254,12 +254,12 @@ copy.remove(copy.size() - 1); } ValueNode lastSlot = copy.get(copy.size() - 1); - assert lastSlot.kind().getStackKind() == popKind.getStackKind(); + assert lastSlot.getKind().getStackKind() == popKind.getStackKind(); copy.remove(copy.size() - 1); } for (ValueNode node : pushedValues) { copy.add(node); - if (node.kind() == Kind.Long || node.kind() == Kind.Double) { + if (node.getKind() == Kind.Long || node.getKind() == Kind.Double) { copy.add(null); } } @@ -404,7 +404,7 @@ assertTrue(values.size() - localsSize - stackSize == monitorIds.size(), "mismatch in number of locks"); for (ValueNode value : values) { assertTrue(value == null || !value.isDeleted(), "frame state must not contain deleted nodes"); - assertTrue(value == null || value instanceof VirtualObjectNode || (value.kind() != Kind.Void), "unexpected value: %s", value); + assertTrue(value == null || value instanceof VirtualObjectNode || (value.getKind() != Kind.Void), "unexpected value: %s", value); } return super.verify(); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -54,7 +54,7 @@ @Override public void generate(LIRGeneratorTool generator) { - if (object.kind() != Kind.Void && object.kind() != Kind.Illegal) { + if (object.getKind() != Kind.Void && object.getKind() != Kind.Illegal) { generator.setResult(this, generator.operand(object)); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardingPiNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardingPiNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -99,7 +99,7 @@ @Override public Node canonical(CanonicalizerTool tool) { - if (stamp() == StampFactory.illegal(object.kind())) { + if (stamp() == StampFactory.illegal(object.getKind())) { // The guard always fails return graph().add(new DeoptimizeNode(action, reason)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -356,10 +356,10 @@ boolean inverted = trueEnd == merge.forwardEndAt(1); ValueNode trueValue = singlePhi.valueAt(inverted ? 1 : 0); ValueNode falseValue = singlePhi.valueAt(inverted ? 0 : 1); - if (trueValue.kind() != falseValue.kind()) { + if (trueValue.getKind() != falseValue.getKind()) { return false; } - if (trueValue.kind() != Kind.Int && trueValue.kind() != Kind.Long) { + if (trueValue.getKind() != Kind.Int && trueValue.getKind() != Kind.Long) { return false; } ConditionalNode conditional = canonicalizeConditionalCascade(trueValue, falseValue); @@ -379,10 +379,10 @@ ValueNode falseValue = falseEnd.result(); ConditionalNode conditional = null; if (trueValue != null) { - if (trueValue.kind() != falseValue.kind()) { + if (trueValue.getKind() != falseValue.getKind()) { return false; } - if (trueValue.kind() != Kind.Int && trueValue.kind() != Kind.Long) { + if (trueValue.getKind() != Kind.Int && trueValue.getKind() != Kind.Long) { return false; } conditional = canonicalizeConditionalCascade(trueValue, falseValue);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -138,14 +138,14 @@ if (stateAfter == null) { return null; } - FrameState stateDuring = stateAfter.duplicateModified(bci(), stateAfter.rethrowException(), kind()); + FrameState stateDuring = stateAfter.duplicateModified(bci(), stateAfter.rethrowException(), getKind()); stateDuring.setDuringCall(true); return stateDuring; } @Override public void intrinsify(Node node) { - assert !(node instanceof ValueNode) || (((ValueNode) node).kind() == Kind.Void) == (kind() == Kind.Void); + assert !(node instanceof ValueNode) || (((ValueNode) node).getKind() == Kind.Void) == (getKind() == Kind.Void); CallTargetNode call = callTarget; FrameState stateAfter = stateAfter(); if (node instanceof StateSplit) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -157,7 +157,7 @@ public FrameState stateDuring() { FrameState tempStateAfter = stateAfter(); - FrameState stateDuring = tempStateAfter.duplicateModified(bci(), tempStateAfter.rethrowException(), kind()); + FrameState stateDuring = tempStateAfter.duplicateModified(bci(), tempStateAfter.rethrowException(), getKind()); stateDuring.setDuringCall(true); return stateDuring; } @@ -177,7 +177,7 @@ @Override public void intrinsify(Node node) { - assert !(node instanceof ValueNode) || (((ValueNode) node).kind() == Kind.Void) == (kind() == Kind.Void); + assert !(node instanceof ValueNode) || (((ValueNode) node).getKind() == Kind.Void) == (getKind() == Kind.Void); CallTargetNode call = callTarget; FrameState state = stateAfter(); killExceptionEdge(); @@ -186,7 +186,7 @@ stateSplit.setStateAfter(state); } if (node == null) { - assert kind() == Kind.Void && usages().isEmpty(); + assert getKind() == Kind.Void && usages().isEmpty(); graph().removeSplit(this, next()); } else if (node instanceof ControlSinkNode) { this.replaceAtPredecessor(node);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -63,7 +63,7 @@ @Override public void generate(LIRGeneratorTool generator) { - if (object.kind() != Kind.Void && object.kind() != Kind.Illegal) { + if (object.getKind() != Kind.Void && object.getKind() != Kind.Illegal) { generator.setResult(this, generator.operand(object)); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -39,7 +39,7 @@ public UnwindNode(ValueNode exception) { super(StampFactory.forVoid()); - assert exception == null || exception.kind() == Kind.Object; + assert exception == null || exception.getKind() == Kind.Object; this.exception = exception; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -79,7 +79,7 @@ return false; } - public final Kind kind() { + public final Kind getKind() { return stamp().getStackKind(); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNodeUtil.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ValueNodeUtil.java Thu Mar 20 11:48:39 2014 +0100 @@ -32,7 +32,7 @@ public class ValueNodeUtil { public static ValueNode assertKind(Kind kind, ValueNode x) { - assert x != null && x.kind() == kind : "kind=" + kind + ", value=" + x + ((x == null) ? "" : ", value.kind=" + x.kind()); + assert x != null && x.getKind() == kind : "kind=" + kind + ", value=" + x + ((x == null) ? "" : ", value.kind=" + x.getKind()); return x; } @@ -45,27 +45,27 @@ } public static ValueNode assertLong(ValueNode x) { - assert x != null && (x.kind() == Kind.Long); + assert x != null && (x.getKind() == Kind.Long); return x; } public static ValueNode assertInt(ValueNode x) { - assert x != null && (x.kind() == Kind.Int); + assert x != null && (x.getKind() == Kind.Int); return x; } public static ValueNode assertFloat(ValueNode x) { - assert x != null && (x.kind() == Kind.Float); + assert x != null && (x.getKind() == Kind.Float); return x; } public static ValueNode assertObject(ValueNode x) { - assert x != null && (x.kind() == Kind.Object); + assert x != null && (x.getKind() == Kind.Object); return x; } public static ValueNode assertDouble(ValueNode x) { - assert x != null && (x.kind() == Kind.Double); + assert x != null && (x.getKind() == Kind.Double); return x; } @@ -87,14 +87,14 @@ /** * Converts a given instruction to a value string. The representation of an node as a value is * formed by concatenating the {@linkplain com.oracle.graal.api.meta.Kind#getTypeChar character} - * denoting its {@linkplain ValueNode#kind kind} and its id. For example, {@code "i13"}. + * denoting its {@linkplain ValueNode#getKind kind} and its id. For example, {@code "i13"}. * * @param value the instruction to convert to a value string. If {@code value == null}, then "-" * is returned. * @return the instruction representation as a string */ public static String valueString(ValueNode value) { - return (value == null) ? "-" : ("" + value.kind().getTypeChar() + value.toString(Verbosity.Id)); + return (value == null) ? "-" : ("" + value.getKind().getTypeChar() + value.toString(Verbosity.Id)); } public static ValueNode asNode(MemoryNode node) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -54,7 +54,7 @@ * @param y the instruction that produces the second input to this instruction */ public CompareNode(ValueNode x, ValueNode y) { - assert x != null && y != null && x.kind() == y.kind(); + assert x != null && y != null && x.getKind() == y.getKind(); this.x = x; this.y = y; } @@ -169,24 +169,24 @@ } public static CompareNode createCompareNode(StructuredGraph graph, Condition condition, ValueNode x, ValueNode y) { - assert x.kind() == y.kind(); + assert x.getKind() == y.getKind(); assert condition.isCanonical() : "condition is not canonical: " + condition; - assert !x.kind().isNumericFloat(); + assert !x.getKind().isNumericFloat(); CompareNode comparison; if (condition == Condition.EQ) { - if (x.kind() == Kind.Object) { + if (x.getKind() == Kind.Object) { comparison = new ObjectEqualsNode(x, y); } else { - assert x.kind().isNumericInteger(); + assert x.getKind().isNumericInteger(); comparison = new IntegerEqualsNode(x, y); } } else if (condition == Condition.LT) { - assert x.kind().isNumericInteger(); + assert x.getKind().isNumericInteger(); comparison = new IntegerLessThanNode(x, y); } else { assert condition == Condition.BT; - assert x.kind().isNumericInteger(); + assert x.getKind().isNumericInteger(); comparison = new IntegerBelowThanNode(x, y); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerBelowThanNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerBelowThanNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -39,8 +39,8 @@ */ public IntegerBelowThanNode(ValueNode x, ValueNode y) { super(x, y); - assert !x.kind().isNumericFloat() && x.kind() != Kind.Object; - assert !y.kind().isNumericFloat() && y.kind() != Kind.Object; + assert !x.getKind().isNumericFloat() && x.getKind() != Kind.Object; + assert !y.getKind().isNumericFloat() && y.getKind() != Kind.Object; } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerEqualsNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -38,8 +38,8 @@ */ public IntegerEqualsNode(ValueNode x, ValueNode y) { super(x, y); - assert !x.kind().isNumericFloat() && x.kind() != Kind.Object; - assert !y.kind().isNumericFloat() && y.kind() != Kind.Object; + assert !x.getKind().isNumericFloat() && x.getKind() != Kind.Object; + assert !y.getKind().isNumericFloat() && y.getKind() != Kind.Object; } @Override @@ -58,7 +58,7 @@ ValueNode a = mirrored ? normalizeNode.y() : normalizeNode.x(); ValueNode b = mirrored ? normalizeNode.x() : normalizeNode.y(); - if (normalizeNode.x().kind() == Kind.Double || normalizeNode.x().kind() == Kind.Float) { + if (normalizeNode.x().getKind() == Kind.Double || normalizeNode.x().getKind() == Kind.Float) { return graph().unique(new FloatEqualsNode(a, b)); } else { return graph().unique(new IntegerEqualsNode(a, b));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerLessThanNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerLessThanNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -39,8 +39,8 @@ */ public IntegerLessThanNode(ValueNode x, ValueNode y) { super(x, y); - assert !x.kind().isNumericFloat() && x.kind() != Kind.Object; - assert !y.kind().isNumericFloat() && y.kind() != Kind.Object; + assert !x.getKind().isNumericFloat() && x.getKind() != Kind.Object; + assert !y.getKind().isNumericFloat() && y.getKind() != Kind.Object; } @Override @@ -60,7 +60,7 @@ ValueNode a = mirrored ? normalizeNode.y() : normalizeNode.x(); ValueNode b = mirrored ? normalizeNode.x() : normalizeNode.y(); - if (normalizeNode.x().kind() == Kind.Double || normalizeNode.x().kind() == Kind.Float) { + if (normalizeNode.x().getKind() == Kind.Double || normalizeNode.x().getKind() == Kind.Float) { return graph().unique(new FloatLessThanNode(a, b, mirrored ^ normalizeNode.isUnorderedLess)); } else { return graph().unique(new IntegerLessThanNode(a, b));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -44,10 +44,10 @@ @Override public Constant evalConst(Constant... inputs) { assert inputs.length == 2; - if (kind() == Kind.Int) { + if (getKind() == Kind.Int) { return Constant.forInt(inputs[0].asInt() << inputs[1].asInt()); } else { - assert kind() == Kind.Long; + assert getKind() == Kind.Long; return Constant.forLong(inputs[0].asLong() << inputs[1].asLong()); } } @@ -60,10 +60,10 @@ int amount = y().asConstant().asInt(); int originalAmout = amount; int mask; - if (kind() == Kind.Int) { + if (getKind() == Kind.Int) { mask = 0x1f; } else { - assert kind() == Kind.Long; + assert getKind() == Kind.Long; mask = 0x3f; } amount &= mask; @@ -77,14 +77,14 @@ if (other instanceof LeftShiftNode) { int total = amount + otherAmount; if (total != (total & mask)) { - return ConstantNode.forIntegerKind(kind(), 0, graph()); + return ConstantNode.forIntegerKind(getKind(), 0, graph()); } return graph().unique(new LeftShiftNode(stamp(), other.x(), ConstantNode.forInt(total, graph()))); } else if ((other instanceof RightShiftNode || other instanceof UnsignedRightShiftNode) && otherAmount == amount) { - if (kind() == Kind.Long) { + if (getKind() == Kind.Long) { return graph().unique(new AndNode(stamp(), other.x(), ConstantNode.forLong(-1L << amount, graph()))); } else { - assert kind() == Kind.Int; + assert getKind() == Kind.Int; return graph().unique(new AndNode(stamp(), other.x(), ConstantNode.forInt(-1 << amount, graph()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ObjectEqualsNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -40,8 +40,8 @@ */ public ObjectEqualsNode(ValueNode x, ValueNode y) { super(x, y); - assert x.kind() == Kind.Object; - assert y.kind() == Kind.Object; + assert x.getKind() == Kind.Object; + assert y.getKind() == Kind.Object; } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -39,10 +39,10 @@ @Override public Constant evalConst(Constant... inputs) { assert inputs.length == 2; - if (kind() == Kind.Int) { + if (getKind() == Kind.Int) { return Constant.forInt(inputs[0].asInt() >> inputs[1].asInt()); } else { - assert kind() == Kind.Long; + assert getKind() == Kind.Long; return Constant.forLong(inputs[0].asLong() >> inputs[1].asLong()); } } @@ -58,10 +58,10 @@ int amount = y().asConstant().asInt(); int originalAmout = amount; int mask; - if (kind() == Kind.Int) { + if (getKind() == Kind.Int) { mask = 0x1f; } else { - assert kind() == Kind.Long; + assert getKind() == Kind.Long; mask = 0x3f; } amount &= mask; @@ -79,10 +79,10 @@ IntegerStamp istamp = (IntegerStamp) other.x().stamp(); if (istamp.isPositive()) { - return ConstantNode.forIntegerKind(kind(), 0, graph()); + return ConstantNode.forIntegerKind(getKind(), 0, graph()); } if (istamp.isStrictlyNegative()) { - return ConstantNode.forIntegerKind(kind(), -1L, graph()); + return ConstantNode.forIntegerKind(getKind(), -1L, graph()); } /*
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -44,10 +44,10 @@ @Override public Constant evalConst(Constant... inputs) { assert inputs.length == 2; - if (kind() == Kind.Int) { + if (getKind() == Kind.Int) { return Constant.forInt(inputs[0].asInt() >>> inputs[1].asInt()); } else { - assert kind() == Kind.Long; + assert getKind() == Kind.Long; return Constant.forLong(inputs[0].asLong() >>> inputs[1].asLong()); } } @@ -60,10 +60,10 @@ int amount = y().asConstant().asInt(); int originalAmout = amount; int mask; - if (kind() == Kind.Int) { + if (getKind() == Kind.Int) { mask = 0x1f; } else { - assert kind() == Kind.Long; + assert getKind() == Kind.Long; mask = 0x3f; } amount &= mask; @@ -77,14 +77,14 @@ if (other instanceof UnsignedRightShiftNode) { int total = amount + otherAmount; if (total != (total & mask)) { - return ConstantNode.forIntegerKind(kind(), 0, graph()); + return ConstantNode.forIntegerKind(getKind(), 0, graph()); } return graph().unique(new UnsignedRightShiftNode(stamp(), other.x(), ConstantNode.forInt(total, graph()))); } else if (other instanceof LeftShiftNode && otherAmount == amount) { - if (kind() == Kind.Long) { + if (getKind() == Kind.Long) { return graph().unique(new AndNode(stamp(), other.x(), ConstantNode.forLong(-1L >>> amount, graph()))); } else { - assert kind() == Kind.Int; + assert getKind() == Kind.Int; return graph().unique(new AndNode(stamp(), other.x(), ConstantNode.forInt(-1 >>> amount, graph()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -107,7 +107,7 @@ } else if (stateAfter() != null && canDeoptimize()) { FrameState stateDuring = stateAfter(); if ((stateDuring.stackSize() > 0 && stateDuring.stackAt(stateDuring.stackSize() - 1) == this) || (stateDuring.stackSize() > 1 && stateDuring.stackAt(stateDuring.stackSize() - 2) == this)) { - stateDuring = stateDuring.duplicateModified(stateDuring.bci, stateDuring.rethrowException(), this.kind()); + stateDuring = stateDuring.duplicateModified(stateDuring.bci, stateDuring.rethrowException(), this.getKind()); } setDeoptimizationState(stateDuring); return stateDuring;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -80,7 +80,7 @@ location instanceof ConstantLocationNode) { long displacement = ((ConstantLocationNode) location).getDisplacement(); Kind kind = location.getValueKind(); - if (object.kind() == Kind.Object) { + if (object.getKind() == Kind.Object) { Object base = object.asConstant().asObject(); if (base != null) { Constant constant = tool.getConstantReflection().readUnsafeConstant(kind, base, displacement, compressible); @@ -88,7 +88,7 @@ return ConstantNode.forConstant(constant, metaAccess, read.graph()); } } - } else if (object.kind().isNumericInteger()) { + } else if (object.getKind().isNumericInteger()) { long base = object.asConstant().asLong(); if (base != 0L) { Constant constant = tool.getConstantReflection().readUnsafeConstant(kind, null, base + displacement, compressible);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SwitchNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SwitchNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -47,7 +47,7 @@ */ public SwitchNode(ValueNode value, AbstractBeginNode[] successors, int[] keySuccessors, double[] keyProbabilities) { super(StampFactory.forVoid()); - assert value.kind() == Kind.Int || value.kind() == Kind.Long || value.kind() == Kind.Object : value.kind() + " key not supported by SwitchNode"; + assert value.getKind() == Kind.Int || value.getKind() == Kind.Long || value.getKind() == Kind.Object : value.getKind() + " key not supported by SwitchNode"; assert keySuccessors.length == keyProbabilities.length; this.successors = new NodeSuccessorList<>(this, successors); this.value = value; @@ -67,7 +67,7 @@ } protected boolean assertValues() { - Kind kind = value.kind(); + Kind kind = value.getKind(); for (int i = 0; i < keyCount(); i++) { Constant key = keyAt(i); assert key.getKind() == kind;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -60,7 +60,7 @@ @Override public Node canonical(CanonicalizerTool tool) { - assert kind() == Kind.Object && object.kind() == Kind.Object; + assert getKind() == Kind.Object && object.getKind() == Kind.Object; ObjectStamp my = (ObjectStamp) stamp(); ObjectStamp other = (ObjectStamp) object.stamp(); @@ -95,7 +95,7 @@ @Override public void generate(LIRGeneratorTool generator) { - assert kind() == Kind.Object && object.kind() == Kind.Object; + assert getKind() == Kind.Object && object.getKind() == Kind.Object; /* * The LIR only cares about the kind of an operand, not the actual type of an object. So we * do not have to introduce a new operand.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -65,7 +65,7 @@ int entryIndex = state.getVirtualObject().entryIndexForOffset(offset); if (entryIndex != -1) { ValueNode entry = state.getEntry(entryIndex); - if (entry.kind() == kind() || state.getVirtualObject().entryKind(entryIndex) == accessKind()) { + if (entry.getKind() == getKind() || state.getVirtualObject().entryKind(entryIndex) == accessKind()) { tool.replaceWith(entry); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -79,7 +79,7 @@ if (entryIndex != -1) { Kind entryKind = state.getVirtualObject().entryKind(entryIndex); ValueNode entry = state.getEntry(entryIndex); - if (entry.kind() == value.kind() || entryKind == accessKind()) { + if (entry.getKind() == value.getKind() || entryKind == accessKind()) { tool.setVirtualEntry(state, entryIndex, value(), true); tool.delete(); } else {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/InstanceOfDynamicNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -46,7 +46,7 @@ public InstanceOfDynamicNode(ValueNode mirror, ValueNode object) { this.mirror = mirror; this.object = object; - assert mirror.kind() == Kind.Object : mirror.kind(); + assert mirror.getKind() == Kind.Object : mirror.getKind(); assert ObjectStamp.isExactType(mirror); assert ObjectStamp.typeOrNull(mirror).getName().equals("Ljava/lang/Class;"); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -61,7 +61,7 @@ public LoweredCompareAndSwapNode(ValueNode object, LocationNode location, ValueNode expectedValue, ValueNode newValue, BarrierType barrierType, boolean compressible) { super(object, location, StampFactory.forKind(Kind.Boolean.getStackKind()), barrierType, compressible); - assert expectedValue.kind() == newValue.kind(); + assert expectedValue.getKind() == newValue.getKind(); this.expectedValue = expectedValue; this.newValue = newValue; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -61,7 +61,7 @@ @Override public boolean isSorted() { - Kind kind = value().kind(); + Kind kind = value().getKind(); if (kind.isNumericInteger()) { Constant lastKey = null; for (int i = 0; i < keyCount(); i++) {
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ConditionalEliminationPhase.java Thu Mar 20 11:48:39 2014 +0100 @@ -159,7 +159,7 @@ // this piece of code handles phis if (!(merge instanceof LoopBeginNode)) { for (PhiNode phi : merge.phis()) { - if (phi.type() == PhiType.Value && phi.kind() == Kind.Object) { + if (phi.type() == PhiType.Value && phi.getKind() == Kind.Object) { ValueNode firstValue = phi.valueAt(0); ResolvedJavaType type = getNodeType(firstValue); boolean nonNull = knownNonNull.contains(firstValue);
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/InliningUtil.java Thu Mar 20 11:48:39 2014 +0100 @@ -482,7 +482,7 @@ private void createGuard(StructuredGraph graph, MetaAccessProvider metaAccess) { ValueNode nonNullReceiver = InliningUtil.nonNullReceiver(invoke); ConstantNode typeHub = ConstantNode.forConstant(type.getEncoding(Representation.ObjectHub), metaAccess, graph); - LoadHubNode receiverHub = graph.unique(new LoadHubNode(nonNullReceiver, typeHub.kind(), null)); + LoadHubNode receiverHub = graph.unique(new LoadHubNode(nonNullReceiver, typeHub.getKind(), null)); CompareNode typeCheck = CompareNode.createCompareNode(graph, Condition.EQ, receiverHub, typeHub); FixedGuardNode guard = graph.add(new FixedGuardNode(typeCheck, DeoptimizationReason.TypeCheckedInliningViolated, DeoptimizationAction.InvalidateReprofile)); @@ -624,7 +624,7 @@ returnMerge.setStateAfter(invoke.stateAfter()); PhiNode returnValuePhi = null; - if (invoke.asNode().kind() != Kind.Void) { + if (invoke.asNode().getKind() != Kind.Void) { returnValuePhi = graph.addWithoutUnique(new PhiNode(invoke.asNode().stamp().unrestricted(), returnMerge)); } @@ -812,7 +812,7 @@ FixedNode lastSucc = successors[concretes.size()]; for (int i = concretes.size() - 1; i >= 0; --i) { - LoadMethodNode method = graph.add(new LoadMethodNode(concretes.get(i), hub, constantMethods[i].kind())); + LoadMethodNode method = graph.add(new LoadMethodNode(concretes.get(i), hub, constantMethods[i].getKind())); CompareNode methodCheck = CompareNode.createCompareNode(graph, Condition.EQ, method, constantMethods[i]); IfNode ifNode = graph.add(new IfNode(methodCheck, successors[i], lastSucc, probability[i])); method.setNext(ifNode); @@ -910,7 +910,7 @@ result.asNode().replaceFirstInput(result.callTarget(), callTarget); result.setUseForInlining(useForInlining); - Kind kind = invoke.asNode().kind(); + Kind kind = invoke.asNode().getKind(); if (kind != Kind.Void) { FrameState stateAfter = invoke.stateAfter(); stateAfter = stateAfter.duplicate(stateAfter.bci); @@ -1314,7 +1314,7 @@ assert inlineGraph.getGuardsStage().ordinal() >= graph.getGuardsStage().ordinal(); assert !invokeNode.graph().isAfterFloatingReadPhase() : "inline isn't handled correctly after floating reads phase"; - Kind returnKind = invokeNode.kind(); + Kind returnKind = invokeNode.getKind(); FrameState stateAfter = invoke.stateAfter(); assert stateAfter == null || stateAfter.isAlive(); @@ -1431,7 +1431,7 @@ if (frameState.outerFrameState() == null) { assert frameState.bci == FrameState.INVALID_FRAMESTATE_BCI || frameState.method().equals(inlineGraph.method()); if (outerFrameState == null) { - outerFrameState = stateAfter.duplicateModified(invoke.bci(), stateAfter.rethrowException(), invokeNode.kind()); + outerFrameState = stateAfter.duplicateModified(invoke.bci(), stateAfter.rethrowException(), invokeNode.getKind()); outerFrameState.setDuringCall(true); } frameState.setOuterFrameState(outerFrameState); @@ -1515,7 +1515,7 @@ assert !callTarget.isStatic() : callTarget.targetMethod(); StructuredGraph graph = callTarget.graph(); ValueNode firstParam = callTarget.arguments().get(0); - if (firstParam.kind() == Kind.Object && !ObjectStamp.isObjectNonNull(firstParam)) { + if (firstParam.getKind() == Kind.Object && !ObjectStamp.isObjectNonNull(firstParam)) { IsNullNode condition = graph.unique(new IsNullNode(firstParam)); Stamp stamp = firstParam.stamp().join(objectNonNull()); GuardingPiNode nonNullReceiver = graph.add(new GuardingPiNode(firstParam, condition, true, NullCheckException, InvalidateReprofile, stamp));
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java Thu Mar 20 11:48:39 2014 +0100 @@ -477,10 +477,10 @@ prefix = "B"; } else if (node instanceof ValueNode) { ValueNode value = (ValueNode) node; - if (value.kind() == Kind.Illegal) { + if (value.getKind() == Kind.Illegal) { prefix = "v"; } else { - prefix = String.valueOf(value.kind().getTypeChar()); + prefix = String.valueOf(value.getKind().getTypeChar()); } } else { prefix = "?";
--- a/graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/HSAILMathIntrinsicsNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/HSAILMathIntrinsicsNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -77,7 +77,7 @@ * @param op the math operation */ public HSAILMathIntrinsicsNode(ValueNode x, HSAILArithmetic op) { - super(StampFactory.forKind(x.kind())); + super(StampFactory.forKind(x.getKind())); this.param = x; this.operation = op; }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraphKit.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/GraphKit.java Thu Mar 20 11:48:39 2014 +0100 @@ -132,12 +132,12 @@ InvokeNode invoke = append(new InvokeNode(callTarget, bci)); if (frameStateBuilder != null) { - if (invoke.kind() != Kind.Void) { - frameStateBuilder.push(invoke.kind(), invoke); + if (invoke.getKind() != Kind.Void) { + frameStateBuilder.push(invoke.getKind(), invoke); } invoke.setStateAfter(frameStateBuilder.create(0)); - if (invoke.kind() != Kind.Void) { - frameStateBuilder.pop(invoke.kind()); + if (invoke.getKind() != Kind.Void) { + frameStateBuilder.pop(invoke.getKind()); } } return invoke;
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/NodeIntrinsificationPhase.java Thu Mar 20 11:48:39 2014 +0100 @@ -326,7 +326,7 @@ public void cleanUpReturnCheckCast(Node newInstance) { if (newInstance.recordsUsages() && newInstance instanceof ValueNode && - (((ValueNode) newInstance).kind() != Kind.Object || ((ValueNode) newInstance).stamp() == StampFactory.forNodeIntrinsic())) { + (((ValueNode) newInstance).getKind() != Kind.Object || ((ValueNode) newInstance).stamp() == StampFactory.forNodeIntrinsic())) { StructuredGraph graph = (StructuredGraph) newInstance.graph(); for (CheckCastNode checkCastNode : newInstance.usages().filter(CheckCastNode.class).snapshot()) { for (Node checkCastUsage : checkCastNode.usages().snapshot()) {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Thu Mar 20 11:48:39 2014 +0100 @@ -778,7 +778,7 @@ if (argument instanceof ValueNode) { replacements.put((ParameterNode) parameter, (ValueNode) argument); } else { - Kind kind = ((ParameterNode) parameter).kind(); + Kind kind = ((ParameterNode) parameter).getKind(); assert argument != null || kind == Kind.Object : this + " cannot accept null for non-object parameter named " + args.info.names[i]; Constant constant = forBoxed(argument, kind); replacements.put((ParameterNode) parameter, ConstantNode.forConstant(constant, metaAccess, replaceeGraph)); @@ -805,7 +805,7 @@ if (value instanceof ValueNode) { replacements.put(param, (ValueNode) value); } else { - Constant constant = forBoxed(value, param.kind()); + Constant constant = forBoxed(value, param.getKind()); ConstantNode element = ConstantNode.forConstant(constant, metaAccess, replaceeGraph); replacements.put(param, element); } @@ -1172,10 +1172,10 @@ buf.append("<constant> ").append(name); } else if (value instanceof ParameterNode) { ParameterNode param = (ParameterNode) value; - buf.append(param.kind().getJavaName()).append(' ').append(name); + buf.append(param.getKind().getJavaName()).append(' ').append(name); } else { ParameterNode[] params = (ParameterNode[]) value; - String kind = params.length == 0 ? "?" : params[0].kind().getJavaName(); + String kind = params.length == 0 ? "?" : params[0].getKind().getJavaName(); buf.append(kind).append('[').append(params.length).append("] ").append(name); } }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectObjectStoreNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectObjectStoreNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -58,8 +58,8 @@ @Override public void lower(LoweringTool tool) { - IndexedLocationNode location = IndexedLocationNode.create(locationIdentity, value.kind(), displacement, offset, graph(), 1); - WriteNode write = graph().add(new WriteNode(object, value, location, BarrierType.NONE, value.kind() == Kind.Object)); + IndexedLocationNode location = IndexedLocationNode.create(locationIdentity, value.getKind(), displacement, offset, graph(), 1); + WriteNode write = graph().add(new WriteNode(object, value, location, BarrierType.NONE, value.getKind() == Kind.Object)); graph().replaceFixedWithFixed(this, write); } }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -159,7 +159,7 @@ InvokeNode invoke = graph().add(new InvokeNode(callTarget, bci)); if (stateAfter() != null) { invoke.setStateAfter(stateAfter().duplicate()); - if (kind() != Kind.Void) { + if (getKind() != Kind.Void) { invoke.stateAfter().replaceFirstInput(this, invoke); } }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReadRegisterNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReadRegisterNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -76,7 +76,7 @@ @Override public void generate(LIRGenerator generator) { - Value result = register.asValue(kind()); + Value result = register.asValue(getKind()); if (incoming) { generator.emitIncomingValues(new Value[]{result}); }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReverseBytesNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReverseBytesNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -37,8 +37,8 @@ @Input private ValueNode value; public ReverseBytesNode(ValueNode value) { - super(StampFactory.forKind(value.kind())); - assert kind().isNumericInteger(); + super(StampFactory.forKind(value.getKind())); + assert getKind().isNumericInteger(); this.value = value; } @@ -46,9 +46,9 @@ public Node canonical(CanonicalizerTool tool) { if (value.isConstant()) { long v = value.asConstant().asLong(); - if (kind().getStackKind() == Kind.Int) { + if (getKind().getStackKind() == Kind.Int) { return ConstantNode.forInt(Integer.reverseBytes((int) v), graph()); - } else if (kind() == Kind.Long) { + } else if (getKind() == Kind.Long) { return ConstantNode.forLong(Long.reverseBytes(v), graph()); } } @@ -67,7 +67,7 @@ @Override public void generate(LIRGenerator gen) { - Variable result = gen.newVariable(value.kind()); + Variable result = gen.newVariable(value.getKind()); gen.emitByteSwap(result, gen.operand(value)); gen.setResult(this, result); }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluatorCanonicalizer.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluatorCanonicalizer.java Thu Mar 20 11:48:39 2014 +0100 @@ -49,7 +49,7 @@ if (node instanceof LoadFieldNode) { LoadFieldNode loadFieldNode = (LoadFieldNode) node; if (!loadFieldNode.isStatic() && loadFieldNode.object().isConstant() && !loadFieldNode.object().isNullConstant()) { - if (Modifier.isFinal(loadFieldNode.field().getModifiers()) || (loadFieldNode.kind() == Kind.Object && loadFieldNode.field().getAnnotation(Child.class) != null) || + if (Modifier.isFinal(loadFieldNode.field().getModifiers()) || (loadFieldNode.getKind() == Kind.Object && loadFieldNode.field().getAnnotation(Child.class) != null) || loadFieldNode.field().getAnnotation(CompilerDirectives.CompilationFinal.class) != null) { Constant constant = loadFieldNode.field().readValue(loadFieldNode.object().asConstant()); assert verifyFieldValue(loadFieldNode.field(), constant);
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCache.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCache.java Thu Mar 20 11:48:39 2014 +0100 @@ -79,7 +79,7 @@ List<Object> key = new ArrayList<>(arguments.size() + 1); key.add(method); for (ValueNode v : arguments) { - if (v.kind() == Kind.Object) { + if (v.getKind() == Kind.Object) { key.add(v.stamp()); } } @@ -125,7 +125,7 @@ new GraphBuilderPhase.Instance(phaseContext.getMetaAccess(), config, optimisticOptimizations).apply(graph); for (ParameterNode param : graph.getNodes(ParameterNode.class)) { - if (param.kind() == Kind.Object) { + if (param.getKind() == Kind.Object) { ValueNode actualArgument = arguments.get(param.index()); param.setStamp(param.stamp().join(actualArgument.stamp())); }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadFinalNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/typesystem/CustomizedUnsafeLoadFinalNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -75,7 +75,7 @@ int entryIndex = state.getVirtualObject().entryIndexForOffset(constantOffset); if (entryIndex != -1) { ValueNode entry = state.getEntry(entryIndex); - if (entry.kind() == kind() || state.getVirtualObject().entryKind(entryIndex) == accessKind) { + if (entry.getKind() == getKind() || state.getVirtualObject().entryKind(entryIndex) == accessKind) { tool.replaceWith(entry); } }
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PEReadEliminationClosure.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PEReadEliminationClosure.java Thu Mar 20 11:48:39 2014 +0100 @@ -173,7 +173,7 @@ } } for (PhiNode phi : merge.phis()) { - if (phi.kind() == Kind.Object) { + if (phi.getKind() == Kind.Object) { for (Map.Entry<ReadCacheEntry, ValueNode> entry : states.get(0).readCache.entrySet()) { if (entry.getKey().object == phi.valueAt(0)) { mergeReadCachePhi(phi, entry.getKey().identity, states);
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java Thu Mar 20 11:48:39 2014 +0100 @@ -411,7 +411,7 @@ ValueNode[] entries = objStates[i].getEntries(); int valueIndex = 0; while (valueIndex < values.length) { - Kind otherKind = entries[valueIndex].kind(); + Kind otherKind = entries[valueIndex].getKind(); Kind entryKind = object.entryKind(valueIndex); if (entryKind == Kind.Int && (otherKind == Kind.Long || otherKind == Kind.Double)) { if (twoSlotKinds == null) { @@ -437,7 +437,7 @@ assert valueIndex < object.entryCount() - 1 && object.entryKind(valueIndex) == Kind.Int && object.entryKind(valueIndex + 1) == Kind.Int; for (int i = 0; i < objStates.length; i++) { ValueNode value = objStates[i].getEntry(valueIndex); - Kind valueKind = value.kind(); + Kind valueKind = value.getKind(); if (valueKind != twoSlotKinds[valueIndex]) { ValueNode nextValue = objStates[i].getEntry(valueIndex + 1); if (value.isConstant() && value.asConstant().equals(Constant.INT_0) && nextValue.isConstant() && nextValue.asConstant().equals(Constant.INT_0)) {
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ReadEliminationClosure.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/ReadEliminationClosure.java Thu Mar 20 11:48:39 2014 +0100 @@ -241,7 +241,7 @@ } } for (PhiNode phi : merge.phis()) { - if (phi.kind() == Kind.Object) { + if (phi.getKind() == Kind.Object) { for (Map.Entry<CacheEntry<?>, ValueNode> entry : states.get(0).readCache.entrySet()) { if (entry.getKey().object == phi.valueAt(0)) { mergeReadCachePhi(phi, entry.getKey(), states);
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualizerToolImpl.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/VirtualizerToolImpl.java Thu Mar 20 11:48:39 2014 +0100 @@ -93,11 +93,11 @@ ObjectState valueState = closure.getObjectState(state, value); if (valueState == null) { newValue = getReplacedValue(value); - assert unsafe || obj.getEntry(index) == null || obj.getEntry(index).kind() == newValue.kind() || (isObjectEntry(obj.getEntry(index)) && isObjectEntry(newValue)); + assert unsafe || obj.getEntry(index) == null || obj.getEntry(index).getKind() == newValue.getKind() || (isObjectEntry(obj.getEntry(index)) && isObjectEntry(newValue)); } else { if (valueState.getState() != EscapeState.Virtual) { newValue = valueState.getMaterializedValue(); - assert newValue.kind() == Kind.Object; + assert newValue.getKind() == Kind.Object; } else { newValue = valueState.getVirtualObject(); } @@ -108,7 +108,7 @@ } private static boolean isObjectEntry(ValueNode value) { - return value.kind() == Kind.Object || value instanceof VirtualObjectNode; + return value.getKind() == Kind.Object || value instanceof VirtualObjectNode; } @Override
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Thu Mar 20 11:48:39 2014 +0100 @@ -37,12 +37,12 @@ public final class WordCastNode extends FixedWithNextNode implements LIRLowerable, Canonicalizable { public static WordCastNode wordToObject(ValueNode input, Kind wordKind) { - assert input.kind() == wordKind; + assert input.getKind() == wordKind; return new WordCastNode(StampFactory.object(), input); } public static WordCastNode objectToWord(ValueNode input, Kind wordKind) { - assert input.kind() == Kind.Object; + assert input.getKind() == Kind.Object; return new WordCastNode(StampFactory.forKind(wordKind), input); } @@ -68,10 +68,10 @@ @Override public void generate(LIRGeneratorTool generator) { - assert kind() != input.kind(); - assert generator.target().getSizeInBytes(kind()) == generator.target().getSizeInBytes(input.kind()); + assert getKind() != input.getKind(); + assert generator.target().getSizeInBytes(getKind()) == generator.target().getSizeInBytes(input.getKind()); - AllocatableValue result = generator.newVariable(kind()); + AllocatableValue result = generator.newVariable(getKind()); generator.emitMove(result, generator.operand(input)); generator.setResult(this, result); }
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeRewriterPhase.java Thu Mar 20 03:14:12 2014 +0100 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/phases/WordTypeRewriterPhase.java Thu Mar 20 11:48:39 2014 +0100 @@ -116,7 +116,7 @@ * Remove casts between word types (which by now no longer have kind Object). */ protected void rewriteCheckCast(StructuredGraph graph, CheckCastNode node) { - if (node.kind() == wordKind) { + if (node.getKind() == wordKind) { node.replaceAtUsages(node.object()); graph.removeFixed(node); } @@ -173,7 +173,7 @@ } if (!callTargetNode.isStatic()) { - assert callTargetNode.receiver().kind() == wordKind : "changeToWord() missed the receiver"; + assert callTargetNode.receiver().getKind() == wordKind : "changeToWord() missed the receiver"; targetMethod = wordImplType.resolveMethod(targetMethod); } Operation operation = targetMethod.getAnnotation(Word.Operation.class); @@ -295,16 +295,16 @@ } private static ValueNode convert(StructuredGraph graph, ValueNode value, Kind toKind, boolean unsigned) { - if (value.kind() == toKind) { + if (value.getKind() == toKind) { return value; } if (toKind == Kind.Int) { - assert value.kind() == Kind.Long; + assert value.getKind() == Kind.Long; return graph.unique(new NarrowNode(value, 32)); } else { assert toKind == Kind.Long; - assert value.kind().getStackKind() == Kind.Int; + assert value.getKind().getStackKind() == Kind.Int; if (unsigned) { return graph.unique(new ZeroExtendNode(value, 64)); } else { @@ -328,7 +328,7 @@ } private ValueNode comparisonOp(StructuredGraph graph, Condition condition, ValueNode left, ValueNode right) { - assert left.kind() == wordKind && right.kind() == wordKind; + assert left.getKind() == wordKind && right.getKind() == wordKind; // mirroring gets the condition into canonical form boolean mirror = condition.canonicalMirror();