From e23541c0301e78525f16d314d13ee0dd8bf06aed Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Sat, 14 Jan 2017 19:36:34 +0100 Subject: [PATCH] Rename Specialization.contains to replaces `contains` was deprecated, and seems to have caused compilation issues with Graal. Signed-off-by: Stefan Marr --- src/som/interpreter/nodes/LocalVariableNode.java | 4 ++-- src/som/interpreter/nodes/NonLocalVariableNode.java | 4 ++-- src/som/interpreter/nodes/OuterObjectRead.java | 4 ++-- src/som/interpreter/nodes/specialized/IfMessageNode.java | 2 +- .../nodes/specialized/IfTrueIfFalseMessageNode.java | 6 +++--- .../nodes/specialized/whileloops/WhileCache.java | 2 +- .../interpreter/objectstorage/InitializerFieldWrite.java | 8 ++++---- src/som/primitives/BlockPrims.java | 6 +++--- src/som/primitives/ExceptionsPrims.java | 2 +- src/som/primitives/actors/PromisePrims.java | 2 +- src/som/primitives/arrays/PutAllNode.java | 2 +- src/som/primitives/reflection/AbstractSymbolDispatch.java | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/som/interpreter/nodes/LocalVariableNode.java b/src/som/interpreter/nodes/LocalVariableNode.java index cf8046186..ca5c4e451 100644 --- a/src/som/interpreter/nodes/LocalVariableNode.java +++ b/src/som/interpreter/nodes/LocalVariableNode.java @@ -83,7 +83,7 @@ public final double doDouble(final VirtualFrame frame) throws FrameSlotTypeExcep } @Specialization(guards = {"isObject(frame)"}, - contains = {"doBoolean", "doLong", "doDouble"}, + replaces = {"doBoolean", "doLong", "doDouble"}, rewriteOn = {FrameSlotTypeException.class}) public final Object doObject(final VirtualFrame frame) throws FrameSlotTypeException { return frame.getObject(slot); @@ -144,7 +144,7 @@ public final double writeDouble(final VirtualFrame frame, final double expValue) return expValue; } - @Specialization(contains = {"writeBoolean", "writeLong", "writeDouble"}) + @Specialization(replaces = {"writeBoolean", "writeLong", "writeDouble"}) public final Object writeGeneric(final VirtualFrame frame, final Object expValue) { slot.setKind(FrameSlotKind.Object); frame.setObject(slot, expValue); diff --git a/src/som/interpreter/nodes/NonLocalVariableNode.java b/src/som/interpreter/nodes/NonLocalVariableNode.java index bb7e42c9d..ff58278d8 100644 --- a/src/som/interpreter/nodes/NonLocalVariableNode.java +++ b/src/som/interpreter/nodes/NonLocalVariableNode.java @@ -87,7 +87,7 @@ public final double doDouble(final VirtualFrame frame) throws FrameSlotTypeExcep } @Specialization(guards = {"isObject(frame)"}, - contains = {"doBoolean", "doLong", "doDouble"}, + replaces = {"doBoolean", "doLong", "doDouble"}, rewriteOn = {FrameSlotTypeException.class}) public final Object doObject(final VirtualFrame frame) throws FrameSlotTypeException { return determineContext(frame).getObject(slot); @@ -144,7 +144,7 @@ public final double writeDouble(final VirtualFrame frame, final double expValue) return expValue; } - @Specialization(contains = {"writeBoolean", "writeLong", "writeDouble"}) + @Specialization(replaces = {"writeBoolean", "writeLong", "writeDouble"}) public final Object writeGeneric(final VirtualFrame frame, final Object expValue) { ensureObjectKind(); determineContext(frame).setObject(slot, expValue); diff --git a/src/som/interpreter/nodes/OuterObjectRead.java b/src/som/interpreter/nodes/OuterObjectRead.java index 663723fa2..15f404303 100644 --- a/src/som/interpreter/nodes/OuterObjectRead.java +++ b/src/som/interpreter/nodes/OuterObjectRead.java @@ -111,7 +111,7 @@ protected boolean isSameEnclosingGroup(final SObjectWithClass receiver, } @Specialization(guards = {"isSameEnclosingGroup(receiver, superclassIdx, factory)"}, - contains = "doForFurtherOuter") + replaces = "doForFurtherOuter") public final Object fixedLookup(final SObjectWithClass receiver, @Cached("getIdx(receiver)") final int superclassIdx, @Cached("getEnclosingClass(receiver).getInstanceFactory()") final ClassFactory factory) { @@ -119,7 +119,7 @@ public final Object fixedLookup(final SObjectWithClass receiver, return getEnclosingObject(getEnclosingClassWithPotentialFailure(receiver, superclassIdx)); } - @Specialization(contains = "fixedLookup") + @Specialization(replaces = "fixedLookup") public final Object fallback(final SObjectWithClass receiver) { return getEnclosingObject(getEnclosingClass(receiver)); } diff --git a/src/som/interpreter/nodes/specialized/IfMessageNode.java b/src/som/interpreter/nodes/specialized/IfMessageNode.java index 6b01aa5d6..de0f0d489 100644 --- a/src/som/interpreter/nodes/specialized/IfMessageNode.java +++ b/src/som/interpreter/nodes/specialized/IfMessageNode.java @@ -58,7 +58,7 @@ public final Object cachedBlock(final VirtualFrame frame, final boolean rcvr, fi } } - @Specialization(contains = "cachedBlock") + @Specialization(replaces = "cachedBlock") public final Object fallback(final VirtualFrame frame, final boolean rcvr, final SBlock arg, @Cached("createIndirect()") final IndirectCallNode callNode) { diff --git a/src/som/interpreter/nodes/specialized/IfTrueIfFalseMessageNode.java b/src/som/interpreter/nodes/specialized/IfTrueIfFalseMessageNode.java index 97eab0807..cd8f1af55 100644 --- a/src/som/interpreter/nodes/specialized/IfTrueIfFalseMessageNode.java +++ b/src/som/interpreter/nodes/specialized/IfTrueIfFalseMessageNode.java @@ -90,7 +90,7 @@ public final Object doIfTrueIfFalseWithInliningTwoBlocks(final VirtualFrame fram } } - @Specialization(contains = {"doIfTrueIfFalseWithInliningTwoBlocks"}) + @Specialization(replaces = {"doIfTrueIfFalseWithInliningTwoBlocks"}) public final Object doIfTrueIfFalse(final VirtualFrame frame, final boolean receiver, final SBlock trueBlock, final SBlock falseBlock) { CompilerAsserts.neverPartOfCompilation("IfTrueIfFalseMessageNode.10"); @@ -121,7 +121,7 @@ public final Object doIfTrueIfFalseWithInliningFalseValue(final VirtualFrame fra } } - @Specialization(contains = {"doIfTrueIfFalseWithInliningTrueValue"}) + @Specialization(replaces = {"doIfTrueIfFalseWithInliningTrueValue"}) public final Object doIfTrueIfFalseTrueValue(final VirtualFrame frame, final boolean receiver, final Object trueValue, final SBlock falseBlock) { if (condProf.profile(receiver)) { @@ -132,7 +132,7 @@ public final Object doIfTrueIfFalseTrueValue(final VirtualFrame frame, } } - @Specialization(contains = {"doIfTrueIfFalseWithInliningFalseValue"}) + @Specialization(replaces = {"doIfTrueIfFalseWithInliningFalseValue"}) public final Object doIfTrueIfFalseFalseValue(final VirtualFrame frame, final boolean receiver, final SBlock trueBlock, final Object falseValue) { if (condProf.profile(receiver)) { diff --git a/src/som/interpreter/nodes/specialized/whileloops/WhileCache.java b/src/som/interpreter/nodes/specialized/whileloops/WhileCache.java index 292190b6f..b152488da 100644 --- a/src/som/interpreter/nodes/specialized/whileloops/WhileCache.java +++ b/src/som/interpreter/nodes/specialized/whileloops/WhileCache.java @@ -56,7 +56,7 @@ private boolean obj2bool(final Object o) { throw new RuntimeException("should never get here"); } - @Specialization(contains = "doCached") + @Specialization(replaces = "doCached") public final Object doUncached(final VirtualFrame frame, final SBlock loopCondition, final SBlock loopBody) { CompilerAsserts.neverPartOfCompilation("WhileCache.GenericDispatch"); // no caching, direct invokes, no loop count reporting... diff --git a/src/som/interpreter/objectstorage/InitializerFieldWrite.java b/src/som/interpreter/objectstorage/InitializerFieldWrite.java index 6f8cc7c9d..1c8bcbd40 100644 --- a/src/som/interpreter/objectstorage/InitializerFieldWrite.java +++ b/src/som/interpreter/objectstorage/InitializerFieldWrite.java @@ -95,7 +95,7 @@ public final long longValueSet(final SImmutableObject rcvr, final long value, assumptions = {"isLatestLayout"}, guards = {"location != null", "cachedLayout == rcvr.getObjectLayout()"}, - contains = "longValueSet", + replaces = "longValueSet", limit = "LIMIT") public final long longValueSetOrUnset(final SImmutableObject rcvr, final long value, @Cached("rcvr.getObjectLayout()") final ObjectLayout cachedLayout, @@ -126,7 +126,7 @@ public final long longValueSet(final SMutableObject rcvr, final long value, assumptions = {"isLatestLayout"}, guards = {"location != null", "cachedLayout == rcvr.getObjectLayout()"}, - contains = "longValueSet", + replaces = "longValueSet", limit = "LIMIT") public final long longValueSetOrUnset(final SMutableObject rcvr, final long value, @Cached("rcvr.getObjectLayout()") final ObjectLayout cachedLayout, @@ -156,7 +156,7 @@ public final double doubleValueSet(final SMutableObject rcvr, final double value assumptions = {"isLatestLayout"}, guards = {"location != null", "cachedLayout == rcvr.getObjectLayout()"}, - contains = "doubleValueSet", + replaces = "doubleValueSet", limit = "LIMIT") public final double doubleValueSetOrUnset(final SMutableObject rcvr, final double value, @Cached("rcvr.getObjectLayout()") final ObjectLayout cachedLayout, @@ -186,7 +186,7 @@ public final double doubleValueSet(final SImmutableObject rcvr, final double val assumptions = {"isLatestLayout"}, guards = {"location != null", "cachedLayout == rcvr.getObjectLayout()"}, - contains = "doubleValueSet", + replaces = "doubleValueSet", limit = "LIMIT") public final double doubleValueSetOrUnset(final SImmutableObject rcvr, final double value, @Cached("rcvr.getObjectLayout()") final ObjectLayout cachedLayout, diff --git a/src/som/primitives/BlockPrims.java b/src/som/primitives/BlockPrims.java index 663d2503c..6cece9f8b 100644 --- a/src/som/primitives/BlockPrims.java +++ b/src/som/primitives/BlockPrims.java @@ -93,7 +93,7 @@ public final Object doCachedBlock(final VirtualFrame frame, return call.call(frame, new Object[] {receiver}); } - @Specialization(contains = "doCachedBlock") + @Specialization(replaces = "doCachedBlock") public final Object doGeneric(final VirtualFrame frame, final SBlock receiver, @Cached("create()") final IndirectCallNode call) { return receiver.getMethod().invoke(call, frame, new Object[] {receiver}); @@ -124,7 +124,7 @@ public final Object doCachedBlock(final VirtualFrame frame, return call.call(frame, new Object[] {receiver, arg}); } - @Specialization(contains = "doCachedBlock") + @Specialization(replaces = "doCachedBlock") public final Object doGeneric(final VirtualFrame frame, final SBlock receiver, final Object arg, @Cached("create()") final IndirectCallNode call) { @@ -156,7 +156,7 @@ public final Object doCachedBlock(final VirtualFrame frame, return call.call(frame, new Object[] {receiver, arg1, arg2}); } - @Specialization(contains = "doCachedBlock") + @Specialization(replaces = "doCachedBlock") public final Object doGeneric(final VirtualFrame frame, final SBlock receiver, final Object arg1, final Object arg2, @Cached("create()") final IndirectCallNode call) { diff --git a/src/som/primitives/ExceptionsPrims.java b/src/som/primitives/ExceptionsPrims.java index 17ff1ae7c..03c4c8395 100644 --- a/src/som/primitives/ExceptionsPrims.java +++ b/src/som/primitives/ExceptionsPrims.java @@ -63,7 +63,7 @@ public final Object doException(final VirtualFrame frame, final SBlock body, } } - @Specialization(contains = "doException") + @Specialization(replaces = "doException") public final Object doExceptionUncached(final VirtualFrame frame, final SBlock body, final SClass exceptionClass, final SBlock exceptionHandler) { try { diff --git a/src/som/primitives/actors/PromisePrims.java b/src/som/primitives/actors/PromisePrims.java index eab835e96..1b931c049 100644 --- a/src/som/primitives/actors/PromisePrims.java +++ b/src/som/primitives/actors/PromisePrims.java @@ -97,7 +97,7 @@ public final SPromise whenResolved(final SPromise promise, return whenResolved(promise, callback, blockCallTarget, registerNode); } - @Specialization(contains = "whenResolved") + @Specialization(replaces = "whenResolved") public final SPromise whenResolvedUncached(final SPromise promise, final SBlock callback) { return whenResolved(promise, callback, createReceived(callback), registerNode); } diff --git a/src/som/primitives/arrays/PutAllNode.java b/src/som/primitives/arrays/PutAllNode.java index 5a7b1c156..824e4dde0 100644 --- a/src/som/primitives/arrays/PutAllNode.java +++ b/src/som/primitives/arrays/PutAllNode.java @@ -52,7 +52,7 @@ public SMutableArray doPutNilInEmptyArray(final SMutableArray rcvr, final Object return rcvr; } - @Specialization(guards = {"valueIsNil(nil)"}, contains = {"doPutNilInEmptyArray"}) + @Specialization(guards = {"valueIsNil(nil)"}, replaces = {"doPutNilInEmptyArray"}) public SMutableArray doPutNilInOtherArray(final SMutableArray rcvr, final SObjectWithClass nil, final long length) { rcvr.transitionToEmpty(length); diff --git a/src/som/primitives/reflection/AbstractSymbolDispatch.java b/src/som/primitives/reflection/AbstractSymbolDispatch.java index d89ac3813..6cbefefc4 100644 --- a/src/som/primitives/reflection/AbstractSymbolDispatch.java +++ b/src/som/primitives/reflection/AbstractSymbolDispatch.java @@ -79,7 +79,7 @@ public Object doCached(final VirtualFrame frame, return realCachedSend.doPreEvaluated(frame, arguments); } - @Specialization(contains = "doCachedWithoutArgArr", guards = "argsArr == null") + @Specialization(replaces = "doCachedWithoutArgArr", guards = "argsArr == null") public Object doUncached(final VirtualFrame frame, final Object receiver, final SSymbol selector, final Object argsArr, @Cached("create()") final IndirectCallNode call) { @@ -95,7 +95,7 @@ public Object doUncached(final VirtualFrame frame, } } - @Specialization(contains = "doCached") + @Specialization(replaces = "doCached") public Object doUncached(final VirtualFrame frame, final Object receiver, final SSymbol selector, final SArray argsArr, @Cached("create()") final IndirectCallNode call,