Skip to content

Commit 59b5d42

Browse files
DSouzaMchumer
DSouzaM
and
chumer
committed
Resolve DSL warnings/errors in Truffle & Languages code
Co-authored-by: Christian Humer <[email protected]>
1 parent 08f3087 commit 59b5d42

File tree

62 files changed

+501
-499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+501
-499
lines changed

‎espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ abstract static class ReadMember {
174174
@Specialization(guards = "language.isShared()")
175175
static Object doShared(Klass receiver, String member,
176176
@CachedLibrary("receiver") InteropLibrary lib,
177-
@Bind("$node") Node node,
177+
@Bind Node node,
178178
@Cached @Shared InlinedBranchProfile error,
179179
@Bind("getLang(lib)") @SuppressWarnings("unused") EspressoLanguage language) throws UnknownIdentifierException {
180180
return readMember(receiver, member, LookupFieldNodeGen.getUncached(), LookupDeclaredMethodNodeGen.getUncached(), node, error, lib, language);
@@ -184,7 +184,7 @@ static Object doShared(Klass receiver, String member,
184184
static Object readMember(Klass receiver, String member,
185185
@Shared("lookupField") @Cached LookupFieldNode lookupFieldNode,
186186
@Shared("lookupMethod") @Cached LookupDeclaredMethod lookupMethod,
187-
@Bind("$node") Node node,
187+
@Bind Node node,
188188
@Cached @Shared InlinedBranchProfile error,
189189
@CachedLibrary("receiver") InteropLibrary lib,
190190
@Bind("getLang(lib)") @SuppressWarnings("unused") EspressoLanguage language) throws UnknownIdentifierException {
@@ -261,7 +261,7 @@ abstract static class WriteMember {
261261
// Specialization prevents caching a node that would leak the context
262262
@Specialization(guards = "language.isShared()")
263263
static void doShared(Klass receiver, String member, Object value,
264-
@Bind("$node") Node node,
264+
@Bind Node node,
265265
@Cached @Shared InlinedBranchProfile error,
266266
@CachedLibrary("receiver") @SuppressWarnings("unused") InteropLibrary lib,
267267
@Bind("getLang(lib)") @SuppressWarnings("unused") EspressoLanguage language) throws UnknownIdentifierException, UnsupportedTypeException {
@@ -272,7 +272,7 @@ static void doShared(Klass receiver, String member, Object value,
272272
static void writeMember(Klass receiver, String member, Object value,
273273
@Shared("lookupField") @Cached LookupFieldNode lookupFieldNode,
274274
@Exclusive @Cached ToEspressoNode.DynamicToEspresso toEspressoNode,
275-
@Bind("$node") Node node,
275+
@Bind Node node,
276276
@Cached @Shared InlinedBranchProfile error) throws UnknownIdentifierException, UnsupportedTypeException {
277277
Field field = lookupFieldNode.execute(receiver, member, true);
278278
// Can only write to non-final fields.
@@ -397,7 +397,7 @@ abstract static class Instantiate {
397397
@Specialization(guards = "language.isShared()")
398398
static Object doShared(Klass receiver, Object[] args,
399399
@CachedLibrary("receiver") @SuppressWarnings("unused") InteropLibrary receiverInterop,
400-
@Bind("$node") Node node,
400+
@Bind Node node,
401401
@Bind("getLang(receiverInterop)") @SuppressWarnings("unused") EspressoLanguage language) throws UnsupportedMessageException, UnsupportedTypeException, ArityException {
402402
if (receiver.isPrimitive()) {
403403
return doPrimitive(receiver, args);
@@ -480,7 +480,7 @@ static StaticObject doReferenceArray(Klass receiver, Object[] arguments,
480480

481481
@Specialization(guards = "isMultidimensionalArray(receiver)")
482482
static StaticObject doMultidimensionalArray(Klass receiver, Object[] arguments,
483-
@Bind("$node") Node node,
483+
@Bind Node node,
484484
@Cached InlinedBranchProfile error,
485485
@Cached ToPrimitive.ToInt toInt) throws ArityException, UnsupportedTypeException {
486486
ArrayKlass arrayKlass = (ArrayKlass) receiver;
@@ -502,7 +502,7 @@ static StaticObject doMultidimensionalArray(Klass receiver, Object[] arguments,
502502

503503
@Specialization(guards = "isObjectKlass(receiver)")
504504
static Object doObject(Klass receiver, Object[] arguments,
505-
@Bind("$node") Node node,
505+
@Bind Node node,
506506
@Cached InlinedBranchProfile error,
507507
@CachedLibrary("receiver") InteropLibrary receiverInterop,
508508
@Cached InteropLookupAndInvoke.NonVirtual lookupAndInvoke) throws UnsupportedTypeException, ArityException, UnsupportedMessageException {

‎espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/interop/ToEspressoNode.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public static boolean isStaticObject(Object value) {
160160

161161
@Specialization
162162
public static Object doStaticObject(StaticObject value, EspressoType targetType,
163-
@Bind("$node") Node node,
163+
@Bind Node node,
164164
@Cached InstanceOf.Dynamic instanceOf,
165165
@Cached InlinedBranchProfile error) throws UnsupportedTypeException {
166166
assert !value.isForeignObject();
@@ -177,7 +177,7 @@ public static Object doStaticObject(StaticObject value, EspressoType targetType,
177177
"!isStaticObject(value)"
178178
})
179179
public static Object doForeignNull(Object value, @SuppressWarnings("unused") EspressoType targetType,
180-
@Bind("$node") Node node,
180+
@Bind Node node,
181181
@SuppressWarnings("unused") @CachedLibrary(limit = "LIMIT") InteropLibrary interop,
182182
@Cached InlinedBranchProfile error) throws UnsupportedTypeException {
183183
if (targetType.getRawType().isPrimitive()) {
@@ -193,7 +193,7 @@ public static Object doForeignNull(Object value, @SuppressWarnings("unused") Esp
193193
"!isStaticObject(value)"
194194
})
195195
public static Object doMappedInterface(Object value, EspressoType targetType,
196-
@Bind("$node") Node node,
196+
@Bind Node node,
197197
@Cached LookupProxyKlassNode lookupProxyKlassNode,
198198
@Cached ProxyInstantiateNode proxyInstantiateNode,
199199
@CachedLibrary(limit = "LIMIT") InteropLibrary interop,
@@ -217,7 +217,7 @@ public static Object doMappedInterface(Object value, EspressoType targetType,
217217
"!isStaticObject(value)"
218218
})
219219
public static Object doArray(Object value, ArrayKlass targetType,
220-
@Bind("$node") Node node,
220+
@Bind Node node,
221221
@SuppressWarnings("unused") @CachedLibrary(limit = "LIMIT") InteropLibrary interop,
222222
@Cached InlinedBranchProfile error) throws UnsupportedTypeException {
223223
Meta meta = EspressoContext.get(node).getMeta();
@@ -239,7 +239,7 @@ public static Object doArray(Object value, ArrayKlass targetType,
239239
"!isStaticObject(value)"
240240
})
241241
public static Object doTypeConverter(Object value, EspressoType targetType,
242-
@Bind("$node") Node node,
242+
@Bind Node node,
243243
@Cached LookupTypeConverterNode lookupTypeConverter,
244244
@CachedLibrary(limit = "LIMIT") InteropLibrary interop,
245245
@Cached InlinedBranchProfile error) throws UnsupportedTypeException {
@@ -269,7 +269,7 @@ public static Object doTypeConverter(Object value, EspressoType targetType,
269269
"!isStaticObject(value)"
270270
})
271271
public static Object doInternalTypeConverter(Object value, EspressoType targetType,
272-
@Bind("$node") Node node,
272+
@Bind Node node,
273273
@Cached ToReference.DynamicToReference converterToEspresso,
274274
@Cached LookupInternalTypeConverterNode lookupInternalTypeConverter,
275275
@CachedLibrary(limit = "LIMIT") InteropLibrary interop,
@@ -296,7 +296,7 @@ public static Object doInternalTypeConverter(Object value, EspressoType targetTy
296296
"!isStaticObject(value)"
297297
})
298298
public static Object doBuiltinCollectionMapped(Object value, EspressoType targetType,
299-
@Bind("$node") Node node,
299+
@Bind Node node,
300300
@Cached LookupProxyKlassNode lookupProxyKlassNode,
301301
@Cached ProxyInstantiateNode proxyInstantiateNode,
302302
@CachedLibrary(limit = "LIMIT") InteropLibrary interop,
@@ -325,7 +325,7 @@ public static Object doBuiltinCollectionMapped(Object value, EspressoType target
325325
"!isInternalTypeConverterEnabled(targetType)",
326326
})
327327
public static Object doGeneric(Object value, EspressoType targetType,
328-
@Bind("$node") Node node,
328+
@Bind Node node,
329329
@CachedLibrary(limit = "LIMIT") InteropLibrary interop,
330330
@Cached LookupTypeConverterNode lookupTypeConverterNode,
331331
@Cached LookupInternalTypeConverterNode lookupInternalTypeConverterNode,

‎espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/interop/ToReference.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public StaticObject doForeignNull(Object value, @SuppressWarnings("unused") Espr
346346
"!isStaticObject(value)"
347347
})
348348
public static StaticObject doMappedInterface(Object value, EspressoType targetType,
349-
@Bind("$node") Node node,
349+
@Bind Node node,
350350
@Cached LookupProxyKlassNode lookupProxyKlassNode,
351351
@Cached ProxyInstantiateNode proxyInstantiateNode,
352352
@CachedLibrary(limit = "LIMIT") @Exclusive InteropLibrary interop,
@@ -387,7 +387,7 @@ public StaticObject doArray(Object value, @SuppressWarnings("unused") ArrayKlass
387387
"!isStaticObject(value)"
388388
})
389389
public static StaticObject doTypeConverter(Object value, EspressoType targetType,
390-
@Bind("$node") Node node,
390+
@Bind Node node,
391391
@Cached @Exclusive LookupTypeConverterNode lookupTypeConverterNode,
392392
@Cached @Shared InlinedBranchProfile errorProfile,
393393
@CachedLibrary(limit = "LIMIT") @Exclusive InteropLibrary interop) throws UnsupportedTypeException {
@@ -422,7 +422,7 @@ public static StaticObject doTypeConverter(Object value, EspressoType targetType
422422
"!isStaticObject(value)"
423423
})
424424
public static StaticObject doInternalTypeConverter(Object value, EspressoType targetType,
425-
@Bind("$node") Node node,
425+
@Bind Node node,
426426
@Cached @Exclusive LookupInternalTypeConverterNode lookupInternalTypeConverterNode,
427427
@Cached @Exclusive ToReference.DynamicToReference converterToEspresso,
428428
@Cached @Shared InlinedBranchProfile errorProfile,
@@ -449,7 +449,7 @@ public static StaticObject doInternalTypeConverter(Object value, EspressoType ta
449449
"!isStaticObject(value)"
450450
})
451451
public static StaticObject doBuiltinTypeConverter(Object value, EspressoType targetType,
452-
@Bind("$node") Node node,
452+
@Bind Node node,
453453
@Cached @Exclusive LookupProxyKlassNode lookupProxyKlassNode,
454454
@Cached @Exclusive ProxyInstantiateNode proxyInstantiatorNode,
455455
@CachedLibrary(limit = "LIMIT") @Exclusive InteropLibrary interop,
@@ -479,7 +479,7 @@ public static StaticObject doBuiltinTypeConverter(Object value, EspressoType tar
479479
"!isTypeMappingEnabled(targetType)"
480480
})
481481
public static StaticObject doGeneric(Object value, EspressoType targetType,
482-
@Bind("$node") Node node,
482+
@Bind Node node,
483483
@CachedLibrary(limit = "LIMIT") InteropLibrary interop,
484484
@Cached LookupTypeConverterNode lookupTypeConverterNode,
485485
@Cached LookupInternalTypeConverterNode lookupInternalTypeConverterNode,
@@ -1194,7 +1194,7 @@ StaticObject doForeignString(Object value,
11941194
"!isBoxedPrimitive(value)"
11951195
})
11961196
static StaticObject doForeignException(Object value,
1197-
@Bind("$node") Node node,
1197+
@Bind Node node,
11981198
@Bind("get(node)") EspressoContext context,
11991199
@Shared("value") @CachedLibrary(limit = "LIMIT") InteropLibrary interop,
12001200
@Cached LookupProxyKlassNode lookupProxyKlassNode,
@@ -2590,7 +2590,7 @@ public StaticObject doEspresso(StaticObject value) throws UnsupportedTypeExcepti
25902590
"!isStaticObject(value)"
25912591
})
25922592
static StaticObject doForeignWrapper(Object value,
2593-
@Bind("$node") Node node,
2593+
@Bind Node node,
25942594
@Shared("value") @CachedLibrary(limit = "LIMIT") InteropLibrary interop,
25952595
@Bind("get(node)") EspressoContext context,
25962596
@Bind("targetType") EspressoType target,

0 commit comments

Comments
 (0)