[GR-18411] Fix linter warnings

andrykonchin · andrykonchin · commit 954bfcf39e0e · 2024-06-26T09:44:58.000Z
PullRequest: truffleruby/4304
diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -20,7 +20,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "ee0e5b66ae9bc3ac9f2fddab7484a0dea5ae514e",
+                "version": "01f3be02bb8e99e910959c1f266a69f651b5dc08",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -29,7 +29,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "ee0e5b66ae9bc3ac9f2fddab7484a0dea5ae514e",
+                "version": "01f3be02bb8e99e910959c1f266a69f651b5dc08",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
diff --git a/src/main/java/org/truffleruby/cext/CExtNodes.java b/src/main/java/org/truffleruby/cext/CExtNodes.java
@@ -1050,7 +1050,6 @@ Object rbConstSet(RubyModule module, Object name, Object value,
     }
 
     @Primitive(name = "rb_gv_get")
-    @ReportPolymorphism
     public abstract static class RbGvGetNode extends PrimitiveArrayArgumentsNode {
         @Specialization
         Object rbGvGet(VirtualFrame frame, String name,
@@ -1075,6 +1074,7 @@ Object rbGvGet(VirtualFrame frame, String name,
     }
 
 
+    @ReportPolymorphism
     @GenerateInline
     @GenerateCached(false)
     public abstract static class RbGvGetInnerNode extends RubyBaseNode {
diff --git a/src/main/java/org/truffleruby/core/array/ArrayNodes.java b/src/main/java/org/truffleruby/core/array/ArrayNodes.java
@@ -1156,7 +1156,7 @@ RubyArray initializeSizeTooBig(RubyArray array, long size, NotProvided fillingVa
         @Specialization(guards = "size >= 0")
         RubyArray initializeWithSizeNoValue(RubyArray array, int size, NotProvided fillingValue, Nil block,
                 @Cached @Shared IsSharedNode isSharedNode,
-                @CachedLibrary(limit = "2") @Exclusive ArrayStoreLibrary stores) {
+                @CachedLibrary(limit = "storageStrategyLimit()") @Exclusive ArrayStoreLibrary stores) {
             final Object store;
             if (isSharedNode.execute(this, array)) {
                 store = new SharedArrayStorage(new Object[size]);
@@ -1206,7 +1206,7 @@ RubyArray initializeSizeOther(RubyArray array, Object size, Object fillingValue,
         @Specialization(guards = "size >= 0")
         static Object initializeBlock(RubyArray array, int size, Object unusedFillingValue, RubyProc block,
                 @Cached ArrayBuilderNode arrayBuilder,
-                @CachedLibrary(limit = "2") @Exclusive ArrayStoreLibrary stores,
+                @CachedLibrary(limit = "storageStrategyLimit()") @Exclusive ArrayStoreLibrary stores,
                 // @Exclusive to fix truffle-interpreted-performance warning
                 @Cached @Exclusive IsSharedNode isSharedNode,
                 @Cached @Exclusive LoopConditionProfile loopProfile,
@@ -1806,7 +1806,6 @@ public void accept(Node node, CallBlockNode yieldNode, RubyArray array, Object s
     @NodeChild(value = "array", type = RubyNode.class)
     @NodeChild(value = "other", type = RubyBaseNodeWithExecute.class)
     @ImportStatic(ArrayGuards.class)
-    @ReportPolymorphism
     public abstract static class ReplaceNode extends CoreMethodNode {
 
         @NeverDefault
@@ -1821,7 +1820,7 @@ RubyArray replace(RubyArray array, Object otherObject,
                 @Cached ToAryNode toAryNode,
                 @Cached ArrayCopyOnWriteNode cowNode,
                 @Cached IsSharedNode isSharedNode,
-                @CachedLibrary(limit = "2") ArrayStoreLibrary stores) {
+                @CachedLibrary(limit = "storageStrategyLimit()") ArrayStoreLibrary stores) {
             final var other = toAryNode.execute(this, otherObject);
             final int size = other.size;
             Object store = cowNode.execute(other, 0, size);
@@ -2222,7 +2221,7 @@ RubyArray stealStorageNoOp(RubyArray array, RubyArray other) {
 
         @Specialization(guards = "array != other")
         static RubyArray stealStorage(RubyArray array, RubyArray other,
-                @CachedLibrary(limit = "2") ArrayStoreLibrary stores,
+                @CachedLibrary(limit = "storageStrategyLimit()") ArrayStoreLibrary stores,
                 @Cached PropagateSharingNode propagateSharingNode,
                 @Bind("this") Node node) {
             propagateSharingNode.execute(node, array, other);
diff --git a/src/main/java/org/truffleruby/core/binding/BindingNodes.java b/src/main/java/org/truffleruby/core/binding/BindingNodes.java
@@ -299,7 +299,6 @@ static Object localVariableGetLastLine(Node node, RubyBinding binding, String na
         }
     }
 
-    @ReportPolymorphism
     @CoreMethod(names = "local_variable_set", required = 2)
     public abstract static class BindingLocalVariableSetNode extends CoreMethodArrayArgumentsNode {
 
@@ -313,6 +312,7 @@ Object localVariableSet(RubyBinding binding, Object nameObject, Object value,
     }
 
 
+    @ReportPolymorphism
     @GenerateUncached
     @ImportStatic({ BindingNodes.class, FindDeclarationVariableNodes.class })
     @GenerateCached(false)
diff --git a/src/main/java/org/truffleruby/language/RubyBaseRootNode.java b/src/main/java/org/truffleruby/language/RubyBaseRootNode.java
@@ -11,7 +11,6 @@
 
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.FrameDescriptor;
-import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
 import org.truffleruby.RubyContext;
@@ -42,7 +41,7 @@ public boolean isInternal() {
     }
 
     @Override
-    public boolean isCaptureFramesForTrace(Node currentNode) {
+    public boolean isCaptureFramesForTrace(boolean compiledFrame) {
         return false;
     }
 
diff --git a/src/yarp/java/org/prism/AbstractNodeVisitor.java b/src/yarp/java/org/prism/AbstractNodeVisitor.java
@@ -1,10 +1,10 @@
-/******************************************************************************/
+/* ****************************************************************************/
 /* This file is generated by the templates/template.rb script and should not  */
 /* be modified manually. See                                                  */
 /* templates/java/org/prism/AbstractNodeVisitor.java.erb                      */
 /* if you are looking to modify the                                           */
 /* template                                                                   */
-/******************************************************************************/
+/* ****************************************************************************/
 
 package org.prism;
 
diff --git a/src/yarp/java/org/prism/Nodes.java b/src/yarp/java/org/prism/Nodes.java
@@ -1,10 +1,10 @@
-/******************************************************************************/
+/* ****************************************************************************/
 /* This file is generated by the templates/template.rb script and should not  */
 /* be modified manually. See                                                  */
 /* templates/java/org/prism/Nodes.java.erb                                    */
 /* if you are looking to modify the                                           */
 /* template                                                                   */
-/******************************************************************************/
+/* ****************************************************************************/
 
 package org.prism;
 

Original file line number	Diff line number	Diff line change
`@@ -1050,7 +1050,6 @@ Object rbConstSet(RubyModule module, Object name, Object value,`
`1050`	`1050`	`}`
`1051`	`1051`
`1052`	`1052`	`@Primitive(name = "rb_gv_get")`
`1053`		`- @ReportPolymorphism`
`1054`	`1053`	`public abstract static class RbGvGetNode extends PrimitiveArrayArgumentsNode {`
`1055`	`1054`	`@Specialization`
`1056`	`1055`	`Object rbGvGet(VirtualFrame frame, String name,`
`@@ -1075,6 +1074,7 @@ Object rbGvGet(VirtualFrame frame, String name,`
`1075`	`1074`	`}`
`1076`	`1075`
`1077`	`1076`
	`1077`	`+ @ReportPolymorphism`
`1078`	`1078`	`@GenerateInline`
`1079`	`1079`	`@GenerateCached(false)`
`1080`	`1080`	`public abstract static class RbGvGetInnerNode extends RubyBaseNode {`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,6 @@ static Object localVariableGetLastLine(Node node, RubyBinding binding, String na`
`299`	`299`	`}`
`300`	`300`	`}`
`301`	`301`
`302`		`- @ReportPolymorphism`
`303`	`302`	`@CoreMethod(names = "local_variable_set", required = 2)`
`304`	`303`	`public abstract static class BindingLocalVariableSetNode extends CoreMethodArrayArgumentsNode {`
`305`	`304`
`@@ -313,6 +312,7 @@ Object localVariableSet(RubyBinding binding, Object nameObject, Object value,`
`313`	`312`	`}`
`314`	`313`
`315`	`314`
	`315`	`+ @ReportPolymorphism`
`316`	`316`	`@GenerateUncached`
`317`	`317`	`@ImportStatic({ BindingNodes.class, FindDeclarationVariableNodes.class })`
`318`	`318`	`@GenerateCached(false)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`import com.oracle.truffle.api.TruffleLanguage;`
`13`	`13`	`import com.oracle.truffle.api.frame.FrameDescriptor;`
`14`		`-import com.oracle.truffle.api.nodes.Node;`
`15`	`14`	`import com.oracle.truffle.api.nodes.RootNode;`
`16`	`15`	`import com.oracle.truffle.api.source.SourceSection;`
`17`	`16`	`import org.truffleruby.RubyContext;`
`@@ -42,7 +41,7 @@ public boolean isInternal() {`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`@Override`
`45`		`- public boolean isCaptureFramesForTrace(Node currentNode) {`
	`44`	`+ public boolean isCaptureFramesForTrace(boolean compiledFrame) {`
`46`	`45`	`return false;`
`47`	`46`	`}`
`48`	`47`