Mercurial > hg > graal-compiler
changeset 5531:816fb2492760
Remove architecture boolean from Ri* interfaces.
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiUtil.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CiUtil.java Fri Jun 08 22:00:05 2012 +0200 @@ -605,7 +605,7 @@ } public static RiKind[] signatureToKinds(RiResolvedMethod method) { - RiKind receiver = isStatic(method.accessFlags()) ? null : method.holder().kind(true); + RiKind receiver = isStatic(method.accessFlags()) ? null : method.holder().kind(); return signatureToKinds(method.signature(), receiver); } @@ -621,7 +621,7 @@ result = new RiKind[args]; } for (int j = 0; j < args; j++) { - result[i + j] = signature.argumentKindAt(j, true); + result[i + j] = signature.argumentKindAt(j); } return result; }
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiField.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiField.java Fri Jun 08 22:00:05 2012 +0200 @@ -42,11 +42,9 @@ /** * Gets the kind of this field. - * @param architecture When true, the architecture-specific kind used for emitting machine code is returned. - * When false, the kind according to the Java specification is returned. * @return the kind */ - RiKind kind(boolean architecture); + RiKind kind(); /** * Gets the holder of this field as a compiler-runtime interface type.
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiSignature.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiSignature.java Fri Jun 08 22:00:05 2012 +0200 @@ -52,11 +52,9 @@ /** * Gets the argument kind at the specified position. * @param index the index into the parameters, with {@code 0} indicating the first parameter - * @param architecture When true, the architecture-specific kind used for emitting machine code is returned. - * When false, the kind according to the Java specification is returned. * @return the kind of the argument at the specified position */ - RiKind argumentKindAt(int index, boolean architecture); + RiKind argumentKindAt(int index); /** * Gets the return type of this signature. This method will return a @@ -72,11 +70,9 @@ /** * Gets the return kind of this signature. - * @param architectureSpecific When true, the architecture-specific kind used for emitting machine code is returned. - * When false, the kind according to the Java specification is returned. * @return the return kind */ - RiKind returnKind(boolean architectureSpecific); + RiKind returnKind(); /** * Converts this signature to a string.
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiType.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiType.java Fri Jun 08 22:00:05 2012 +0200 @@ -77,11 +77,9 @@ /** * Gets the kind of this compiler interface type. - * @param architecture When true, the architecture-specific kind used for emitting machine code is returned. - * When false, the kind according to the Java specification is returned. * @return the kind */ - RiKind kind(boolean architecture); + RiKind kind(); /** * Gets the kind used to represent the specified part of this type.
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiUtil.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/RiUtil.java Fri Jun 08 22:00:05 2012 +0200 @@ -84,7 +84,7 @@ * @return the Java name corresponding to {@code riType} */ public static String toJavaName(RiType riType, boolean qualified) { - RiKind kind = riType.kind(false); + RiKind kind = riType.kind(); if (kind.isPrimitive() || kind == RiKind.Void) { return kind.javaName; }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Fri Jun 08 22:00:05 2012 +0200 @@ -586,7 +586,7 @@ @Override public void visitNewTypeArray(NewTypeArrayNode x) { XirArgument length = toXirArgument(x.length()); - XirSnippet snippet = xir.genNewArray(site(x), length, x.elementType().kind(true), null, null); + XirSnippet snippet = xir.genNewArray(site(x), length, x.elementType().kind(), null, null); emitXir(snippet, x, state(), true); } @@ -829,7 +829,7 @@ // Current argument is receiver. stackIndex += stackSlots(RiKind.Object); } else { - stackIndex += stackSlots(signature.argumentKindAt(argumentIndex, false)); + stackIndex += stackSlots(signature.argumentKindAt(argumentIndex)); argumentIndex++; } } @@ -883,7 +883,7 @@ RiValue resultOperand = resultOperandFor(x.node().kind()); - RiKind[] signature = CiUtil.signatureToKinds(callTarget.targetMethod().signature(), callTarget.isStatic() ? null : callTarget.targetMethod().holder().kind(true)); + RiKind[] signature = CiUtil.signatureToKinds(callTarget.targetMethod().signature(), callTarget.isStatic() ? null : callTarget.targetMethod().holder().kind()); CiCallingConvention cc = frameMap.registerConfig.getCallingConvention(JavaCall, signature, target(), false); frameMap.callsMethod(cc, JavaCall); List<RiValue> argList = visitInvokeArguments(cc, callTarget.arguments());
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/EscapeAnalysisPhase.java Fri Jun 08 22:00:05 2012 +0200 @@ -54,7 +54,7 @@ this.virtualObjectField = null; this.graph = virtualObject.graph(); for (int i = 0; i < fields.length; i++) { - fieldState[i] = ConstantNode.defaultForKind(fields[i].type().kind(true), virtualObject.graph()); + fieldState[i] = ConstantNode.defaultForKind(fields[i].type().kind(), virtualObject.graph()); virtualObjectField = graph.add(new VirtualObjectFieldNode(virtualObject, virtualObjectField, fieldState[i], i)); } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/IdentifyBoxingPhase.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/IdentifyBoxingPhase.java Fri Jun 08 22:00:05 2012 +0200 @@ -58,7 +58,7 @@ if (returnKind == RiKind.Object) { // We have a boxing method here. assert Modifier.isStatic(targetMethod.accessFlags()) : "boxing method must be static"; - RiKind sourceKind = targetMethod.signature().argumentKindAt(0, false); + RiKind sourceKind = targetMethod.signature().argumentKindAt(0); newNode = invoke.graph().add(new BoxNode(sourceValue, targetMethod.holder(), sourceKind, invoke.bci())); } else { // We have an unboxing method here.
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/InliningPhase.java Fri Jun 08 22:00:05 2012 +0200 @@ -365,7 +365,7 @@ if (GraalOptions.InliningBonusPerTransferredValue != 0) { RiSignature signature = info.invoke.callTarget().targetMethod().signature(); int transferredValues = signature.argumentCount(!Modifier.isStatic(info.invoke.callTarget().targetMethod().accessFlags())); - if (signature.returnKind(false) != RiKind.Void) { + if (signature.returnKind() != RiKind.Void) { transferredValues++; } maxSize += transferredValues * GraalOptions.InliningBonusPerTransferredValue;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/SnippetIntrinsificationPhase.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/SnippetIntrinsificationPhase.java Fri Jun 08 22:00:05 2012 +0200 @@ -86,7 +86,7 @@ } // Call the method - RiConstant constant = callMethod(target.signature().returnKind(false), target.holder().toJava(), target.name(), parameterTypes, receiver, arguments); + RiConstant constant = callMethod(target.signature().returnKind(), target.holder().toJava(), target.name(), parameterTypes, receiver, arguments); if (constant != null) { // Replace the invoke with the result of the call
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Fri Jun 08 22:00:05 2012 +0200 @@ -61,7 +61,7 @@ RiResolvedMethod method = frameState.method(); boolean isStatic = Modifier.isStatic(method.accessFlags()); - RiKind[] signature = CiUtil.signatureToKinds(method.signature(), isStatic ? null : method.holder().kind(true)); + RiKind[] signature = CiUtil.signatureToKinds(method.signature(), isStatic ? null : method.holder().kind()); CiCallingConvention cc = gen.frameMap().registerConfig.getCallingConvention(CiCallingConvention.Type.JavaCall, signature, gen.target(), false); gen.frameMap().callsMethod(cc, CiCallingConvention.Type.JavaCall); // TODO (aw): I think this is unnecessary for a tail call. List<ValueNode> parameters = new ArrayList<>();
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotCompiledMethod.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotCompiledMethod.java Fri Jun 08 22:00:05 2012 +0200 @@ -63,9 +63,9 @@ @Override public Object execute(Object arg1, Object arg2, Object arg3) { assert method.signature().argumentCount(!Modifier.isStatic(method.accessFlags())) == 3; - assert method.signature().argumentKindAt(0, false) == RiKind.Object; - assert method.signature().argumentKindAt(1, false) == RiKind.Object; - assert !Modifier.isStatic(method.accessFlags()) || method.signature().argumentKindAt(2, false) == RiKind.Object; + assert method.signature().argumentKindAt(0) == RiKind.Object; + assert method.signature().argumentKindAt(1) == RiKind.Object; + assert !Modifier.isStatic(method.accessFlags()) || method.signature().argumentKindAt(2) == RiKind.Object; return HotSpotCompilerImpl.getInstance().getCompilerToVM().executeCompiledMethod(this, arg1, arg2, arg3); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotField.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotField.java Fri Jun 08 22:00:05 2012 +0200 @@ -67,7 +67,7 @@ if (holder.isInitialized() && holder.toJava() != System.class) { if (Modifier.isFinal(accessFlags()) || assumeStaticFieldsFinal(holder.toJava())) { RiConstant encoding = holder.getEncoding(Representation.StaticFields); - constant = this.kind(false).readUnsafeConstant(encoding.asObject(), offset); + constant = this.kind().readUnsafeConstant(encoding.asObject(), offset); } } } @@ -76,7 +76,7 @@ assert !Modifier.isStatic(accessFlags); // TODO (chaeubl) HotSpot does not trust final non-static fields (see ciField.cpp) if (Modifier.isFinal(accessFlags())) { - return this.kind(false).readUnsafeConstant(receiver.asObject(), offset); + return this.kind().readUnsafeConstant(receiver.asObject(), offset); } } return null; @@ -92,8 +92,8 @@ } @Override - public RiKind kind(boolean architecture) { - return type().kind(architecture); + public RiKind kind() { + return type().kind(); } @Override
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotRuntime.java Fri Jun 08 22:00:05 2012 +0200 @@ -235,7 +235,7 @@ LoadFieldNode field = (LoadFieldNode) n; int displacement = ((HotSpotField) field.field()).offset(); assert field.kind() != RiKind.Illegal; - ReadNode memoryRead = graph.add(new ReadNode(field.object(), LocationNode.create(field.field(), field.field().kind(true), displacement, graph), field.stamp())); + ReadNode memoryRead = graph.add(new ReadNode(field.object(), LocationNode.create(field.field(), field.field().kind(), displacement, graph), field.stamp())); memoryRead.dependencies().add(tool.createNullCheckGuard(field.object(), field.leafGraphId())); graph.replaceFixedWithFixed(field, memoryRead); if (field.isVolatile()) { @@ -247,13 +247,13 @@ } else if (n instanceof StoreFieldNode) { StoreFieldNode storeField = (StoreFieldNode) n; HotSpotField field = (HotSpotField) storeField.field(); - WriteNode memoryWrite = graph.add(new WriteNode(storeField.object(), storeField.value(), LocationNode.create(storeField.field(), storeField.field().kind(true), field.offset(), graph))); + WriteNode memoryWrite = graph.add(new WriteNode(storeField.object(), storeField.value(), LocationNode.create(storeField.field(), storeField.field().kind(), field.offset(), graph))); memoryWrite.dependencies().add(tool.createNullCheckGuard(storeField.object(), storeField.leafGraphId())); memoryWrite.setStateAfter(storeField.stateAfter()); graph.replaceFixedWithFixed(storeField, memoryWrite); FixedWithNextNode last = memoryWrite; - if (field.kind(true) == RiKind.Object && !memoryWrite.value().isNullConstant()) { + if (field.kind() == RiKind.Object && !memoryWrite.value().isNullConstant()) { FieldWriteBarrier writeBarrier = graph.add(new FieldWriteBarrier(memoryWrite.object())); graph.addAfterFixed(memoryWrite, writeBarrier); last = writeBarrier;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotSignature.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotSignature.java Fri Jun 08 22:00:05 2012 +0200 @@ -97,7 +97,7 @@ } @Override - public RiKind argumentKindAt(int index, boolean architecture) { + public RiKind argumentKindAt(int index) { return RiKind.fromTypeString(arguments.get(index)); } @@ -105,7 +105,7 @@ public int argumentSlots(boolean withReceiver) { int argSlots = 0; for (int i = 0; i < argumentCount(false); i++) { - argSlots += FrameStateBuilder.stackSlots(argumentKindAt(i, false)); + argSlots += FrameStateBuilder.stackSlots(argumentKindAt(i)); } return argSlots + (withReceiver ? 1 : 0); } @@ -129,7 +129,7 @@ } @Override - public RiKind returnKind(boolean architecture) { + public RiKind returnKind() { return RiKind.fromTypeString(returnType); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypePrimitive.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypePrimitive.java Fri Jun 08 22:00:05 2012 +0200 @@ -131,7 +131,7 @@ } @Override - public RiKind kind(boolean architecture) { + public RiKind kind() { return kind; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypeResolvedImpl.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypeResolvedImpl.java Fri Jun 08 22:00:05 2012 +0200 @@ -184,7 +184,7 @@ } @Override - public RiKind kind(boolean architecture) { + public RiKind kind() { return RiKind.Object; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypeUnresolved.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/ri/HotSpotTypeUnresolved.java Fri Jun 08 22:00:05 2012 +0200 @@ -89,7 +89,7 @@ } @Override - public RiKind kind(boolean architecture) { + public RiKind kind() { return RiKind.Object; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/IntrinsifyArrayCopyPhase.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/IntrinsifyArrayCopyPhase.java Fri Jun 08 22:00:05 2012 +0200 @@ -87,7 +87,7 @@ && srcType.isArrayClass() && destType != null && destType.isArrayClass()) { - RiKind componentKind = srcType.componentType().kind(false); + RiKind componentKind = srcType.componentType().kind(); if (srcType.componentType() == destType.componentType()) { if (componentKind == RiKind.Int) { snippetMethod = intArrayCopy;
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/FrameStateBuilder.java Fri Jun 08 22:00:05 2012 +0200 @@ -70,7 +70,7 @@ if (eagerResolve) { type = type.resolve(accessingClass); } - RiKind kind = type.kind(false).stackKind(); + RiKind kind = type.kind().stackKind(); Stamp stamp; if (kind == RiKind.Object && type instanceof RiResolvedType) { stamp = StampFactory.declared((RiResolvedType) type);
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java Fri Jun 08 22:00:05 2012 +0200 @@ -731,7 +731,7 @@ private void genGetField(RiField field) { emitExplicitExceptions(frameState.peek(0), null); - RiKind kind = field.kind(false); + RiKind kind = field.kind(); ValueNode receiver = frameState.apop(); if ((field instanceof RiResolvedField) && ((RiResolvedField) field).holder().isInitialized()) { LoadFieldNode load = currentGraph.add(new LoadFieldNode(receiver, (RiResolvedField) field, graphId)); @@ -808,7 +808,7 @@ private void genPutField(RiField field) { emitExplicitExceptions(frameState.peek(1), null); - ValueNode value = frameState.pop(field.kind(false).stackKind()); + ValueNode value = frameState.pop(field.kind().stackKind()); ValueNode receiver = frameState.apop(); if (field instanceof RiResolvedField && ((RiResolvedField) field).holder().isInitialized()) { StoreFieldNode store = currentGraph.add(new StoreFieldNode(receiver, (RiResolvedField) field, value, graphId)); @@ -829,7 +829,7 @@ frameState.push(constantValue.kind.stackKind(), appendConstant(constantValue)); } else { ValueNode container = genTypeOrDeopt(RiType.Representation.StaticFields, holder, isInitialized); - RiKind kind = field.kind(false); + RiKind kind = field.kind(); if (container != null) { LoadFieldNode load = currentGraph.add(new LoadFieldNode(container, (RiResolvedField) field, graphId)); appendOptimizedLoadField(kind, load); @@ -843,7 +843,7 @@ private void genPutStatic(RiField field) { RiType holder = field.holder(); ValueNode container = genTypeOrDeopt(RiType.Representation.StaticFields, holder, field instanceof RiResolvedField && ((RiResolvedType) holder).isInitialized()); - ValueNode value = frameState.pop(field.kind(false).stackKind()); + ValueNode value = frameState.pop(field.kind().stackKind()); if (container != null) { StoreFieldNode store = currentGraph.add(new StoreFieldNode(container, (RiResolvedField) field, value, graphId)); appendOptimizedStoreField(store); @@ -919,7 +919,7 @@ private void genInvokeDeopt(RiMethod unresolvedTarget, boolean withReceiver) { append(currentGraph.add(new DeoptimizeNode(CiDeoptAction.InvalidateRecompile, RiDeoptReason.Unresolved, graphId))); frameState.popArguments(unresolvedTarget.signature().argumentSlots(withReceiver), unresolvedTarget.signature().argumentCount(withReceiver)); - RiKind kind = unresolvedTarget.signature().returnKind(false); + RiKind kind = unresolvedTarget.signature().returnKind(); if (kind != RiKind.Void) { frameState.push(kind.stackKind(), append(ConstantNode.defaultForKind(kind, currentGraph))); } @@ -955,7 +955,7 @@ } private void appendInvoke(InvokeKind invokeKind, RiResolvedMethod targetMethod, ValueNode[] args) { - RiKind resultType = targetMethod.signature().returnKind(false); + RiKind resultType = targetMethod.signature().returnKind(); if (GraalOptions.DeoptALot) { DeoptimizeNode deoptimize = currentGraph.add(new DeoptimizeNode(CiDeoptAction.None, RiDeoptReason.RuntimeConstraint, graphId)); deoptimize.setMessage("invoke " + targetMethod.name()); @@ -1345,7 +1345,7 @@ if (method.isConstructor() && method.holder().superType() == null) { callRegisterFinalizer(); } - RiKind returnKind = method.signature().returnKind(false).stackKind(); + RiKind returnKind = method.signature().returnKind().stackKind(); ValueNode x = returnKind == RiKind.Void ? null : frameState.pop(returnKind); assert frameState.stackSize() == 0;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Fri Jun 08 22:00:05 2012 +0200 @@ -128,7 +128,7 @@ @Override public FrameState stateDuring() { FrameState stateAfter = stateAfter(); - FrameState stateDuring = stateAfter.duplicateModified(bci(), stateAfter.rethrowException(), this.callTarget.targetMethod().signature().returnKind(false)); + FrameState stateDuring = stateAfter.duplicateModified(bci(), stateAfter.rethrowException(), this.callTarget.targetMethod().signature().returnKind()); stateDuring.setDuringCall(true); return stateDuring; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Fri Jun 08 22:00:05 2012 +0200 @@ -152,7 +152,7 @@ public FrameState stateDuring() { FrameState tempStateAfter = stateAfter(); - FrameState stateDuring = tempStateAfter.duplicateModified(bci(), tempStateAfter.rethrowException(), this.callTarget.targetMethod().signature().returnKind(false)); + FrameState stateDuring = tempStateAfter.duplicateModified(bci(), tempStateAfter.rethrowException(), this.callTarget.targetMethod().signature().returnKind()); stateDuring.setDuringCall(true); return stateDuring; }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxingMethodPool.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/BoxingMethodPool.java Fri Jun 08 22:00:05 2012 +0200 @@ -72,7 +72,7 @@ // Get the field that contains the boxed value. RiResolvedField[] fields = runtime.getType(type).declaredFields(); RiResolvedField boxField = fields[0]; - assert fields.length == 1 && boxField.kind(false) == kind; + assert fields.length == 1 && boxField.kind() == kind; boxFields[kind.ordinal()] = boxField; } @@ -81,11 +81,11 @@ } public boolean isBoxingMethod(RiResolvedMethod method) { - return isSpecialMethod(method) && method.signature().returnKind(false) == RiKind.Object; + return isSpecialMethod(method) && method.signature().returnKind() == RiKind.Object; } public boolean isUnboxingMethod(RiResolvedMethod method) { - return isSpecialMethod(method) && method.signature().returnKind(false) != RiKind.Object; + return isSpecialMethod(method) && method.signature().returnKind() != RiKind.Object; } public RiResolvedMethod getBoxingMethod(RiKind kind) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoadFieldNode.java Fri Jun 08 22:00:05 2012 +0200 @@ -45,7 +45,7 @@ } private static Stamp createStamp(RiResolvedField field) { - RiKind kind = field.kind(false); + RiKind kind = field.kind(); if (kind == RiKind.Object && field.type() instanceof RiResolvedType) { return StampFactory.declared((RiResolvedType) field.type()); } else {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MethodCallTargetNode.java Fri Jun 08 22:00:05 2012 +0200 @@ -94,7 +94,7 @@ @Override public RiKind returnKind() { - return targetMethod().signature().returnKind(false); + return targetMethod().signature().returnKind(); } public Invoke invoke() { @@ -138,7 +138,7 @@ } public Stamp returnStamp() { - RiKind returnKind = targetMethod.signature().returnKind(false); + RiKind returnKind = targetMethod.signature().returnKind(); if (returnKind == RiKind.Object && returnType instanceof RiResolvedType) { return StampFactory.declared((RiResolvedType) returnType); } else {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampFactory.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/type/StampFactory.java Fri Jun 08 22:00:05 2012 +0200 @@ -147,7 +147,7 @@ public static Stamp declared(RiResolvedType type, boolean nonNull) { assert type != null; - assert type.kind(false) == RiKind.Object; + assert type.kind() == RiKind.Object; RiResolvedType exact = type.exactType(); if (exact != null) { return new ObjectStamp(exact, true, nonNull);
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetTemplate.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetTemplate.java Fri Jun 08 22:00:05 2012 +0200 @@ -195,7 +195,7 @@ String name = c.value(); Object arg = key.get(name); assert arg != null : method + ": requires a constant named " + name; - RiKind kind = signature.argumentKindAt(i, false); + RiKind kind = signature.argumentKindAt(i); assert checkConstantArgument(method, signature, i, name, arg, kind); replacements.put(snippetGraph.getLocal(i), ConstantNode.forCiConstant(RiConstant.forBoxed(kind, arg), runtime, snippetCopy)); } else { @@ -231,7 +231,7 @@ Object array = ((Multiple) key.get(p.value())).array; int length = Array.getLength(array); LocalNode[] locals = new LocalNode[length]; - Stamp stamp = StampFactory.forKind(runtime.getType(array.getClass().getComponentType()).kind(false)); + Stamp stamp = StampFactory.forKind(runtime.getType(array.getClass().getComponentType()).kind()); for (int j = 0; j < length; j++) { assert (parameterCount & 0xFFFF) == parameterCount; int idx = i << 16 | j;
--- a/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseUnresolvedField.java Fri Jun 08 21:48:37 2012 +0200 +++ b/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseUnresolvedField.java Fri Jun 08 22:00:05 2012 +0200 @@ -48,8 +48,8 @@ return type; } - public RiKind kind(boolean architecture) { - return type.kind(architecture); + public RiKind kind() { + return type.kind(); } public RiType holder() {