Skip to content

Commit 3b7e4a2

Browse files
woesswoess
committed
Fix "unused" compiler warnings.
1 parent bd8ec2f commit 3b7e4a2

File tree

7 files changed

+26
-33
lines changed

7 files changed

+26
-33
lines changed

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/DynamicObjectNodesTest.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ private DynamicObject.SetPropertyFlagsNode createSetPropertyFlagsNode() {
217217
};
218218
}
219219

220-
private DynamicObject.SetPropertyFlagsNode createSetPropertyFlagsNodeForKey(Object k) {
220+
private DynamicObject.SetPropertyFlagsNode createSetPropertyFlagsNodeForKey(@SuppressWarnings("unused") Object k) {
221221
return switch (run) {
222222
case CACHED -> DynamicObject.SetPropertyFlagsNode.create();
223223
case UNCACHED -> DynamicObject.SetPropertyFlagsNode.getUncached();
@@ -231,7 +231,7 @@ private DynamicObject.GetPropertyFlagsNode createGetPropertyFlagsNode() {
231231
};
232232
}
233233

234-
private DynamicObject.GetPropertyFlagsNode createGetPropertyFlagsNodeForKey(Object k) {
234+
private DynamicObject.GetPropertyFlagsNode createGetPropertyFlagsNodeForKey(@SuppressWarnings("unused") Object k) {
235235
return switch (run) {
236236
case CACHED -> DynamicObject.GetPropertyFlagsNode.create();
237237
case UNCACHED -> DynamicObject.GetPropertyFlagsNode.getUncached();
@@ -245,7 +245,7 @@ private DynamicObject.GetPropertyNode createGetPropertyNode() {
245245
};
246246
}
247247

248-
private DynamicObject.GetPropertyNode createGetPropertyNodeForKey(Object k) {
248+
private DynamicObject.GetPropertyNode createGetPropertyNodeForKey(@SuppressWarnings("unused") Object k) {
249249
return switch (run) {
250250
case CACHED -> DynamicObject.GetPropertyNode.create();
251251
case UNCACHED -> DynamicObject.GetPropertyNode.getUncached();
@@ -561,9 +561,7 @@ public void testShapeFlags() {
561561

562562
DynamicObject.SetDynamicTypeNode setDynamicTypeNode = createSetDynamicTypeNode();
563563
DynamicObject.GetShapeFlagsNode getShapeFlagsNode = createGetShapeFlagsNode();
564-
DynamicObject.HasShapeFlagsNode hasShapeFlagsNode = createHasShapeFlagsNode();
565564
DynamicObject.SetShapeFlagsNode setShapeFlagsNode = createSetShapeFlagsNode();
566-
DynamicObject.AddShapeFlagsNode addShapeFlagsNode = createAddShapeFlagsNode();
567565
DynamicObject.MarkSharedNode markSharedNode = createMarkSharedNode();
568566

569567
DynamicObject o1 = createEmpty();

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/GR42603.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@
4747
import java.util.concurrent.Executors;
4848
import java.util.concurrent.Future;
4949

50-
import com.oracle.truffle.api.object.Shape;
5150
import org.graalvm.polyglot.Context;
5251
import org.graalvm.polyglot.Engine;
5352
import org.junit.Test;
54-
55-
import com.oracle.truffle.api.object.test.ObjectModelRegressionTest.TestDynamicObject;
5653
import org.junit.runner.RunWith;
5754
import org.junit.runners.Parameterized;
5855
import org.junit.runners.Parameterized.Parameters;
5956

57+
import com.oracle.truffle.api.object.Shape;
58+
import com.oracle.truffle.api.object.test.ObjectModelRegressionTest.TestDynamicObject;
59+
6060
@RunWith(Parameterized.class)
6161
public class GR42603 extends ParametrizedDynamicObjectTest {
6262

@@ -84,11 +84,11 @@ private void testConcurrentReplaceProperty() throws Throwable {
8484
for (int i = 0; i < 2; i++) {
8585
int iFixed = i;
8686
futures.add(executorService.submit(() -> {
87-
try (Context context = Context.newBuilder().engine(engine).build()) {
87+
try (Context ctx = Context.newBuilder().engine(engine).build()) {
8888
TestDynamicObject object = newEmptyObject(rootShape);
8989
uncachedLibrary().put(object, "propertyBefore", newEmptyObject(rootShape));
9090
boolean assignObject = iFixed == 0;
91-
Object hostNullValue = context.asValue(null);
91+
Object hostNullValue = ctx.asValue(null);
9292
uncachedLibrary().put(object, "offendingProperty", assignObject ? object : hostNullValue);
9393
freezeObject(object);
9494

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/GR52036.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@
4848
import static org.junit.Assert.assertTrue;
4949
import static org.junit.Assume.assumeTrue;
5050

51+
import java.util.List;
52+
5153
import org.graalvm.polyglot.Context;
5254
import org.graalvm.polyglot.Engine;
5355
import org.junit.Test;
54-
55-
import com.oracle.truffle.api.object.DynamicObject;
56-
import com.oracle.truffle.api.object.Shape;
5756
import org.junit.runner.RunWith;
5857
import org.junit.runners.Parameterized;
5958
import org.junit.runners.Parameterized.Parameters;
6059

61-
import java.util.List;
60+
import com.oracle.truffle.api.object.DynamicObject;
61+
import com.oracle.truffle.api.object.Shape;
6262

6363
@RunWith(Parameterized.class)
6464
public class GR52036 extends ParametrizedDynamicObjectTest {
@@ -91,7 +91,7 @@ protected ObjType2(Shape shape) {
9191
}
9292

9393
Shape initialShape = Shape.newBuilder().build();
94-
try (Engine engine = Engine.create(); Context context = Context.newBuilder().engine(engine).build()) {
94+
try (Engine engine = Engine.create(); Context ctx = Context.newBuilder().engine(engine).build()) {
9595
var o1 = new ObjType1(initialShape);
9696
var o2 = new ObjType1(initialShape);
9797

‎truffle/src/com.oracle.truffle.api.object.test/src/com/oracle/truffle/api/object/test/ParametrizedDynamicObjectTest.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ protected final DynamicObjectLibraryWrapper uncachedLibrary() {
9797

9898
protected abstract static class DynamicObjectLibraryWrapper {
9999

100-
public boolean accepts(Object receiver) {
100+
public boolean accepts(@SuppressWarnings("unused") Object receiver) {
101101
return true;
102102
}
103103

@@ -331,7 +331,7 @@ static class NodesFakeDynamicObjectLibrary extends DynamicObjectLibraryWrapper {
331331
getPropertyArrayNode = DynamicObject.GetPropertyArrayNode.create();
332332
}
333333

334-
NodesFakeDynamicObjectLibrary(String uncached) {
334+
NodesFakeDynamicObjectLibrary(@SuppressWarnings("unused") String uncached) {
335335
getNode = DynamicObject.GetNode.getUncached();
336336
putNode = DynamicObject.PutNode.getUncached();
337337
removeKeyNode = DynamicObject.RemoveKeyNode.getUncached();
@@ -350,11 +350,6 @@ static class NodesFakeDynamicObjectLibrary extends DynamicObjectLibraryWrapper {
350350
getPropertyArrayNode = DynamicObject.GetPropertyArrayNode.getUncached();
351351
}
352352

353-
@Override
354-
public boolean accepts(Object receiver) {
355-
return true;
356-
}
357-
358353
@Override
359354
public Shape getShape(DynamicObject object) {
360355
return object.getShape();

‎truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/DynamicObject.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969
import com.oracle.truffle.api.nodes.ExplodeLoop;
7070
import com.oracle.truffle.api.nodes.Node;
7171
import com.oracle.truffle.api.nodes.UnexpectedResultException;
72+
import com.oracle.truffle.api.object.DynamicObjectLibraryImpl.RemovePlan;
7273
import com.oracle.truffle.api.object.DynamicObjectFactory.GetNodeGen;
7374
import com.oracle.truffle.api.object.DynamicObjectFactory.PutNodeGen;
74-
import com.oracle.truffle.api.object.DynamicObjectLibraryImpl.RemovePlan;
7575

7676
import sun.misc.Unsafe;
7777

@@ -946,8 +946,8 @@ public static CopyPropertiesNode getUncached() {
946946
@ExplodeLoop
947947
@Specialization(guards = "shape == cachedShape", limit = "SHAPE_CACHE_LIMIT")
948948
static void doCached(DynamicObject from, DynamicObject to,
949-
@Bind("from.getShape()") Shape shape,
950-
@Cached("shape") Shape cachedShape,
949+
@Bind("from.getShape()") @SuppressWarnings("unused") Shape shape,
950+
@Cached("shape") @SuppressWarnings("unused") Shape cachedShape,
951951
@Cached(value = "createPropertyGetters(cachedShape)", dimensions = 1) PropertyGetter[] getters,
952952
@Cached DynamicObject.PutNode putNode) {
953953
for (int i = 0; i < getters.length; i++) {
@@ -2175,10 +2175,10 @@ public static GetPropertyNode getUncached() {
21752175
public abstract Property execute(DynamicObject receiver, Object key);
21762176

21772177
@Specialization(guards = {"shape == cachedShape", "key == cachedKey"}, limit = "SHAPE_CACHE_LIMIT")
2178-
static Property doCached(DynamicObject receiver, Object key,
2179-
@Bind("receiver.getShape()") Shape shape,
2180-
@Cached("shape") Shape cachedShape,
2181-
@Cached("key") Object cachedKey,
2178+
static Property doCached(@SuppressWarnings("unused") DynamicObject receiver, @SuppressWarnings("unused") Object key,
2179+
@Bind("receiver.getShape()") @SuppressWarnings("unused") Shape shape,
2180+
@Cached("shape") @SuppressWarnings("unused") Shape cachedShape,
2181+
@Cached("key") @SuppressWarnings("unused") Object cachedKey,
21822182
@Cached("cachedShape.getProperty(cachedKey)") Property cachedProperty) {
21832183
return cachedProperty;
21842184
}

‎truffle/src/com.oracle.truffle.api.object/src/com/oracle/truffle/api/object/Location.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
*/
4141
package com.oracle.truffle.api.object;
4242

43+
import java.util.Objects;
44+
4345
import com.oracle.truffle.api.Assumption;
4446
import com.oracle.truffle.api.CompilerDirectives;
4547
import com.oracle.truffle.api.nodes.UnexpectedResultException;
4648

47-
import java.util.Objects;
48-
4949
/**
5050
* Property location.
5151
*
@@ -162,7 +162,7 @@ protected double getDouble(DynamicObject store, boolean guard) throws Unexpected
162162
* @throws FinalLocationException for effectively final fields
163163
* @since 0.8 or earlier
164164
*/
165-
@SuppressWarnings("deprecation")
165+
@SuppressWarnings({"unused", "deprecation"})
166166
@Deprecated(since = "22.2")
167167
public void set(DynamicObject store, Object value, Shape shape) throws IncompatibleLocationException, FinalLocationException {
168168
try {

‎truffle/src/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLObject.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ Object readMember(String name,
224224
@ExportMessage
225225
void writeMember(String name, Object value,
226226
@Cached @Shared("fromJavaStringNode") TruffleString.FromJavaStringNode fromJavaStringNode,
227-
@Cached DynamicObject.PutNode putNode) throws UnknownIdentifierException {
227+
@Cached DynamicObject.PutNode putNode) {
228228
putNode.put(this, fromJavaStringNode.execute(name, SLLanguage.STRING_ENCODING), value);
229229
}
230230
}

0 commit comments

Comments
 (0)