Skip to content

Commit 781af9e

Browse files
msimacekmsimacek
committed
Fix warnings
1 parent b49b7bc commit 781af9e

File tree

3 files changed

+53
-47
lines changed

3 files changed

+53
-47
lines changed

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/DynamicObjectNativeWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,7 @@ static int doFLineno(PFrame object, @SuppressWarnings("unused") PythonNativeWrap
12501250
}
12511251
}
12521252

1253-
@Specialization(guards = "isGenericCase(object, key)", limit = "1")
1253+
@Specialization(guards = "isGenericCase(key)", limit = "1")
12541254
static Object doGeneric(@SuppressWarnings("unused") Object object, DynamicObjectNativeWrapper nativeWrapper, String key, Object value,
12551255
@CachedLanguage PythonLanguage lang,
12561256
@CachedLibrary("nativeWrapper.createNativeMemberStore(lang)") HashingStorageLibrary lib) throws UnknownIdentifierException {
@@ -1274,7 +1274,7 @@ protected static boolean eq(NativeMember expected, String actual) {
12741274
return expected.getMemberName().equals(actual);
12751275
}
12761276

1277-
protected static boolean isGenericCase(Object object, String key) {
1277+
protected static boolean isGenericCase(String key) {
12781278
return !(OB_TYPE.getMemberName().equals(key) ||
12791279
OB_REFCNT.getMemberName().equals(key) ||
12801280
TP_FLAGS.getMemberName().equals(key) ||

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/MemoryViewBuiltins.java

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
import com.oracle.graal.python.builtins.objects.PEllipsis;
6868
import com.oracle.graal.python.builtins.objects.PNone;
6969
import com.oracle.graal.python.builtins.objects.PNotImplemented;
70-
import com.oracle.graal.python.builtins.objects.bytes.BytesBuiltins;
7170
import com.oracle.graal.python.builtins.objects.bytes.BytesBuiltins.ExpectIntNode;
7271
import com.oracle.graal.python.builtins.objects.bytes.BytesBuiltins.SepExpectByteNode;
7372
import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
@@ -88,7 +87,6 @@
8887
import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
8988
import com.oracle.graal.python.nodes.function.builtins.PythonTernaryClinicBuiltinNode;
9089
import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
91-
import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentCastNode;
9290
import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
9391
import com.oracle.graal.python.nodes.subscript.SliceLiteralNode;
9492
import com.oracle.graal.python.runtime.AsyncHandler;
@@ -179,7 +177,7 @@ public void postInitialize(PythonCore core) {
179177

180178
@Builtin(name = __GETITEM__, minNumOfPositionalArgs = 2)
181179
@GenerateNodeFactory
182-
static abstract class GetItemNode extends PythonBinaryBuiltinNode {
180+
abstract static class GetItemNode extends PythonBinaryBuiltinNode {
183181

184182
@Specialization(guards = {"!isPSlice(index)", "!isEllipsis(index)"})
185183
Object getitem(VirtualFrame frame, PMemoryView self, Object index,
@@ -230,7 +228,7 @@ Object getitemEllipsis(PMemoryView self, @SuppressWarnings("unused") PEllipsis e
230228

231229
@Builtin(name = __SETITEM__, minNumOfPositionalArgs = 3)
232230
@GenerateNodeFactory
233-
public static abstract class SetItemNode extends PythonTernaryBuiltinNode {
231+
public abstract static class SetItemNode extends PythonTernaryBuiltinNode {
234232
@Specialization(guards = {"!isPSlice(index)", "!isEllipsis(index)"})
235233
Object setitem(VirtualFrame frame, PMemoryView self, Object index, Object object,
236234
@Cached MemoryViewNodes.PointerLookupNode pointerFromIndexNode,
@@ -296,7 +294,7 @@ private void checkReadonly(PMemoryView self) {
296294

297295
@Builtin(name = __EQ__, minNumOfPositionalArgs = 2)
298296
@GenerateNodeFactory
299-
public static abstract class EqNode extends PythonBinaryBuiltinNode {
297+
public abstract static class EqNode extends PythonBinaryBuiltinNode {
300298
@Child private CExtNodes.PCallCapiFunction callCapiFunction;
301299

302300
@Specialization
@@ -358,7 +356,9 @@ static Object eq(Object self, Object other) {
358356

359357
private boolean recursive(PythonObjectLibrary lib, PMemoryView self, PMemoryView other,
360358
MemoryViewNodes.ReadItemAtNode readSelf, MemoryViewNodes.ReadItemAtNode readOther,
361-
int dim, int ndim, Object selfPtr, int selfOffset, Object otherPtr, int otherOffset) {
359+
int dim, int ndim, Object selfPtr, int initialSelfOffset, Object otherPtr, int initialOtherOffset) {
360+
int selfOffset = initialSelfOffset;
361+
int otherOffset = initialOtherOffset;
362362
for (int i = 0; i < self.getBufferShape()[dim]; i++) {
363363
Object selfXPtr = selfPtr;
364364
int selfXOffset = selfOffset;
@@ -400,7 +400,7 @@ private CExtNodes.PCallCapiFunction getCallCapiFunction() {
400400

401401
@Builtin(name = __DELITEM__, minNumOfPositionalArgs = 1)
402402
@GenerateNodeFactory
403-
public static abstract class DelItemNode extends PythonUnaryBuiltinNode {
403+
public abstract static class DelItemNode extends PythonUnaryBuiltinNode {
404404
@Specialization
405405
Object error(@SuppressWarnings("unused") PMemoryView self) {
406406
throw raise(TypeError, ErrorMessages.CANNOT_DELETE_MEMORY);
@@ -409,7 +409,7 @@ Object error(@SuppressWarnings("unused") PMemoryView self) {
409409

410410
@Builtin(name = "tolist", minNumOfPositionalArgs = 1)
411411
@GenerateNodeFactory
412-
public static abstract class ToListNode extends PythonUnaryBuiltinNode {
412+
public abstract static class ToListNode extends PythonUnaryBuiltinNode {
413413
@Child private CExtNodes.PCallCapiFunction callCapiFunction;
414414

415415
@Specialization(guards = {"self.getDimensions() == cachedDimensions", "cachedDimensions < 8"})
@@ -441,7 +441,8 @@ private PList recursiveBoundary(PMemoryView self, MemoryViewNodes.ReadItemAtNode
441441
return recursive(self, readItemAtNode, dim, ndim, ptr, offset);
442442
}
443443

444-
private PList recursive(PMemoryView self, MemoryViewNodes.ReadItemAtNode readItemAtNode, int dim, int ndim, Object ptr, int offset) {
444+
private PList recursive(PMemoryView self, MemoryViewNodes.ReadItemAtNode readItemAtNode, int dim, int ndim, Object ptr, int initialOffset) {
445+
int offset = initialOffset;
445446
Object[] objects = new Object[self.getBufferShape()[dim]];
446447
for (int i = 0; i < self.getBufferShape()[dim]; i++) {
447448
Object xptr = ptr;
@@ -472,7 +473,7 @@ private CExtNodes.PCallCapiFunction getCallCapiFunction() {
472473
@Builtin(name = "tobytes", minNumOfPositionalArgs = 1, parameterNames = {"$self", "order"})
473474
@ArgumentClinic(name = "order", conversion = ArgumentClinic.ClinicConversion.String, defaultValue = "\"C\"", useDefaultForNone = true)
474475
@GenerateNodeFactory
475-
public static abstract class ToBytesNode extends PythonBinaryClinicBuiltinNode {
476+
public abstract static class ToBytesNode extends PythonBinaryClinicBuiltinNode {
476477
@Child private MemoryViewNodes.ToJavaBytesNode toJavaBytesNode;
477478
@Child private MemoryViewNodes.ToJavaBytesFortranOrderNode toJavaBytesFortranOrderNode;
478479

@@ -548,7 +549,7 @@ protected ArgumentClinicProvider getArgumentClinic() {
548549

549550
@Builtin(name = "toreadonly", minNumOfPositionalArgs = 1)
550551
@GenerateNodeFactory
551-
public static abstract class ToReadonlyNode extends PythonUnaryBuiltinNode {
552+
public abstract static class ToReadonlyNode extends PythonUnaryBuiltinNode {
552553
@Specialization
553554
PMemoryView toreadonly(PMemoryView self,
554555
@Cached MemoryViewNodes.GetBufferReferences getQueue) {
@@ -562,7 +563,7 @@ PMemoryView toreadonly(PMemoryView self,
562563
@Builtin(name = "cast", minNumOfPositionalArgs = 2, parameterNames = {"$self", "format", "shape"})
563564
@ArgumentClinic(name = "format", conversion = ArgumentClinic.ClinicConversion.String)
564565
@GenerateNodeFactory
565-
public static abstract class CastNode extends PythonTernaryClinicBuiltinNode {
566+
public abstract static class CastNode extends PythonTernaryClinicBuiltinNode {
566567

567568
@Specialization
568569
PMemoryView cast(PMemoryView self, String formatString, @SuppressWarnings("unused") PNone none,
@@ -663,7 +664,7 @@ protected ArgumentClinicProvider getArgumentClinic() {
663664

664665
@Builtin(name = __LEN__, minNumOfPositionalArgs = 1)
665666
@GenerateNodeFactory
666-
public static abstract class LenNode extends PythonUnaryBuiltinNode {
667+
public abstract static class LenNode extends PythonUnaryBuiltinNode {
667668
@Specialization
668669
int len(PMemoryView self,
669670
@Cached ConditionProfile zeroDimProfile) {
@@ -674,7 +675,7 @@ int len(PMemoryView self,
674675

675676
@Builtin(name = __REPR__, minNumOfPositionalArgs = 1)
676677
@GenerateNodeFactory
677-
public static abstract class ReprNode extends PythonUnaryBuiltinNode {
678+
public abstract static class ReprNode extends PythonUnaryBuiltinNode {
678679
@Specialization
679680
@TruffleBoundary
680681
static String repr(PMemoryView self) {
@@ -688,7 +689,7 @@ static String repr(PMemoryView self) {
688689

689690
@Builtin(name = __HASH__, minNumOfPositionalArgs = 1)
690691
@GenerateNodeFactory
691-
public static abstract class HashNode extends PythonUnaryBuiltinNode {
692+
public abstract static class HashNode extends PythonUnaryBuiltinNode {
692693
@Specialization
693694
int hash(PMemoryView self,
694695
@Cached ConditionProfile cachedProfile,
@@ -716,7 +717,7 @@ private static int hashArray(byte[] array) {
716717

717718
@Builtin(name = __ENTER__, minNumOfPositionalArgs = 1)
718719
@GenerateNodeFactory
719-
public static abstract class EnterNode extends PythonUnaryBuiltinNode {
720+
public abstract static class EnterNode extends PythonUnaryBuiltinNode {
720721
@Specialization
721722
Object enter(PMemoryView self) {
722723
self.checkReleased(this);
@@ -726,7 +727,7 @@ Object enter(PMemoryView self) {
726727

727728
@Builtin(name = __EXIT__, minNumOfPositionalArgs = 4)
728729
@GenerateNodeFactory
729-
public static abstract class ExitNode extends PythonQuaternaryBuiltinNode {
730+
public abstract static class ExitNode extends PythonQuaternaryBuiltinNode {
730731
@Specialization
731732
@SuppressWarnings("unused")
732733
static Object exit(VirtualFrame frame, PMemoryView self, Object type, Object val, Object tb,
@@ -738,7 +739,7 @@ static Object exit(VirtualFrame frame, PMemoryView self, Object type, Object val
738739

739740
@Builtin(name = "release", minNumOfPositionalArgs = 1)
740741
@GenerateNodeFactory
741-
public static abstract class ReleaseNode extends PythonUnaryBuiltinNode {
742+
public abstract static class ReleaseNode extends PythonUnaryBuiltinNode {
742743
public abstract Object execute(VirtualFrame frame, PMemoryView self);
743744

744745
@Specialization(guards = "self.getReference() == null")
@@ -793,7 +794,7 @@ private void checkExports(PMemoryView self) {
793794

794795
@Builtin(name = "itemsize", minNumOfPositionalArgs = 1, isGetter = true)
795796
@GenerateNodeFactory
796-
public static abstract class ItemSizeNode extends PythonUnaryBuiltinNode {
797+
public abstract static class ItemSizeNode extends PythonUnaryBuiltinNode {
797798
@Specialization
798799
int get(PMemoryView self) {
799800
self.checkReleased(this);
@@ -803,7 +804,7 @@ int get(PMemoryView self) {
803804

804805
@Builtin(name = "nbytes", minNumOfPositionalArgs = 1, isGetter = true)
805806
@GenerateNodeFactory
806-
public static abstract class NBytesNode extends PythonUnaryBuiltinNode {
807+
public abstract static class NBytesNode extends PythonUnaryBuiltinNode {
807808
@Specialization
808809
int get(PMemoryView self) {
809810
self.checkReleased(this);
@@ -813,7 +814,7 @@ int get(PMemoryView self) {
813814

814815
@Builtin(name = "obj", minNumOfPositionalArgs = 1, isGetter = true)
815816
@GenerateNodeFactory
816-
public static abstract class ObjNode extends PythonUnaryBuiltinNode {
817+
public abstract static class ObjNode extends PythonUnaryBuiltinNode {
817818
@Specialization
818819
Object get(PMemoryView self) {
819820
self.checkReleased(this);
@@ -823,7 +824,7 @@ Object get(PMemoryView self) {
823824

824825
@Builtin(name = "format", minNumOfPositionalArgs = 1, isGetter = true)
825826
@GenerateNodeFactory
826-
public static abstract class FormatNode extends PythonUnaryBuiltinNode {
827+
public abstract static class FormatNode extends PythonUnaryBuiltinNode {
827828
@Specialization
828829
Object get(PMemoryView self) {
829830
self.checkReleased(this);
@@ -833,7 +834,7 @@ Object get(PMemoryView self) {
833834

834835
@Builtin(name = "shape", minNumOfPositionalArgs = 1, isGetter = true)
835836
@GenerateNodeFactory
836-
public static abstract class ShapeNode extends PythonUnaryBuiltinNode {
837+
public abstract static class ShapeNode extends PythonUnaryBuiltinNode {
837838
@Specialization
838839
Object get(PMemoryView self,
839840
@Cached ConditionProfile nullProfile) {
@@ -847,7 +848,7 @@ Object get(PMemoryView self,
847848

848849
@Builtin(name = "strides", minNumOfPositionalArgs = 1, isGetter = true)
849850
@GenerateNodeFactory
850-
public static abstract class StridesNode extends PythonUnaryBuiltinNode {
851+
public abstract static class StridesNode extends PythonUnaryBuiltinNode {
851852
@Specialization
852853
Object get(PMemoryView self,
853854
@Cached ConditionProfile nullProfile) {
@@ -861,7 +862,7 @@ Object get(PMemoryView self,
861862

862863
@Builtin(name = "suboffsets", minNumOfPositionalArgs = 1, isGetter = true)
863864
@GenerateNodeFactory
864-
public static abstract class SuboffsetsNode extends PythonUnaryBuiltinNode {
865+
public abstract static class SuboffsetsNode extends PythonUnaryBuiltinNode {
865866
@Specialization
866867
Object get(PMemoryView self,
867868
@Cached ConditionProfile nullProfile) {
@@ -875,7 +876,7 @@ Object get(PMemoryView self,
875876

876877
@Builtin(name = "readonly", minNumOfPositionalArgs = 1, isGetter = true)
877878
@GenerateNodeFactory
878-
public static abstract class ReadonlyNode extends PythonUnaryBuiltinNode {
879+
public abstract static class ReadonlyNode extends PythonUnaryBuiltinNode {
879880
@Specialization
880881
boolean get(PMemoryView self) {
881882
self.checkReleased(this);
@@ -885,7 +886,7 @@ boolean get(PMemoryView self) {
885886

886887
@Builtin(name = "ndim", minNumOfPositionalArgs = 1, isGetter = true)
887888
@GenerateNodeFactory
888-
public static abstract class NDimNode extends PythonUnaryBuiltinNode {
889+
public abstract static class NDimNode extends PythonUnaryBuiltinNode {
889890
@Specialization
890891
int get(PMemoryView self) {
891892
self.checkReleased(this);
@@ -895,7 +896,7 @@ int get(PMemoryView self) {
895896

896897
@Builtin(name = "c_contiguous", minNumOfPositionalArgs = 1, isGetter = true)
897898
@GenerateNodeFactory
898-
public static abstract class CContiguousNode extends PythonUnaryBuiltinNode {
899+
public abstract static class CContiguousNode extends PythonUnaryBuiltinNode {
899900
@Specialization
900901
boolean get(PMemoryView self) {
901902
self.checkReleased(this);
@@ -905,7 +906,7 @@ boolean get(PMemoryView self) {
905906

906907
@Builtin(name = "f_contiguous", minNumOfPositionalArgs = 1, isGetter = true)
907908
@GenerateNodeFactory
908-
public static abstract class FContiguousNode extends PythonUnaryBuiltinNode {
909+
public abstract static class FContiguousNode extends PythonUnaryBuiltinNode {
909910
@Specialization
910911
boolean get(PMemoryView self) {
911912
self.checkReleased(this);
@@ -915,7 +916,7 @@ boolean get(PMemoryView self) {
915916

916917
@Builtin(name = "contiguous", minNumOfPositionalArgs = 1, isGetter = true)
917918
@GenerateNodeFactory
918-
public static abstract class ContiguousNode extends PythonUnaryBuiltinNode {
919+
public abstract static class ContiguousNode extends PythonUnaryBuiltinNode {
919920
@Specialization
920921
boolean get(PMemoryView self) {
921922
self.checkReleased(this);

0 commit comments

Comments
 (0)