[GR-17457] Re-enable ECJ compilation of org.truffleruby as linter

PullRequest: truffleruby/4113
oracle · Jan 15, 2024 · 65e954b · 65e954b
2 parents ce11ae4 + 53898f5
commit 65e954b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -287,7 +287,6 @@
             "checkstyle": "org.truffleruby",
             "workingSets": "TruffleRuby",
             "findbugsIgnoresGenerated": True,
-            "forceJavac": True, # GR-51148 We need to force javac to silence a ECJ warning in generated code
             "license": [
                 "EPL-2.0",          # JRuby (we're choosing EPL out of EPL,GPL,LGPL)
                 "BSD-new",          # Rubinius

diff --git a/src/main/java/org/truffleruby/core/hash/library/CompactHashStore.java b/src/main/java/org/truffleruby/core/hash/library/CompactHashStore.java
@@ -217,7 +217,7 @@ Object delete(RubyHash hash, Object key,
     Object deleteLast(RubyHash hash, Object key,
             @Cached @Shared HashingNodes.ToHash hashFunction,
             @Cached @Shared GetIndexPosFromKeyPosNode getIndexPosFromKeyPosNode,
-            @Cached @Exclusive InlinedLoopConditionProfile nonNullKeyNotYetFound,
+            @Cached @Shared InlinedLoopConditionProfile nonNullKeyNotYetFound,
             @Bind("$node") Node node) {
         assert hash.size > 0;
         int keyPos = firstNonNullKeyPosFromEnd(nonNullKeyNotYetFound, node);
@@ -238,7 +238,7 @@ Object deleteLast(RubyHash hash, Object key,
     RubyArray shift(RubyHash hash,
             @Cached @Shared HashingNodes.ToHash hashFunction,
             @Cached @Shared GetIndexPosFromKeyPosNode getIndexPosFromKeyPosNode,
-            @Cached @Exclusive InlinedLoopConditionProfile nonNullKeyNotYetFound,
+            @Cached @Shared InlinedLoopConditionProfile nonNullKeyNotYetFound,
             @Bind("$node") Node node) {
         assert hash.size > 0;
         int keyPos = firstNonNullKeyPosFromBeginning(nonNullKeyNotYetFound, node);

diff --git a/src/main/java/org/truffleruby/parser/RubyDeferredWarnings.java b/src/main/java/org/truffleruby/parser/RubyDeferredWarnings.java
@@ -71,6 +71,7 @@ public String getWarningMessage() {
             return buffer.toString();
         }
 
+        @Override
         public String toString() {
             return "WarningMessage(" +
                     "message = '" + message + "'" +
@@ -117,6 +118,7 @@ public void warning(String fileName, int lineNumber, String message) {
                         message));
     }
 
+    @Override
     public String toString() {
         var strings = new ArrayList<String>();
 

diff --git a/src/main/java/org/truffleruby/parser/YARPTranslator.java b/src/main/java/org/truffleruby/parser/YARPTranslator.java
@@ -853,6 +853,7 @@ public RubyNode visitCallOrWriteNode(Nodes.CallOrWriteNode node) {
         return assignPositionAndFlags(node, rubyNode);
     }
 
+    @Override
     public RubyNode visitCallTargetNode(Nodes.CallTargetNode node) {
         // extra argument should be added before node translation
         // to trigger correctly replacement with inlined nodes (e.g. InlinedIndexSetNodeGen)
@@ -1990,6 +1991,7 @@ public RubyNode visitIndexOrWriteNode(Nodes.IndexOrWriteNode node) {
         return assignPositionAndFlags(node, rubyNode);
     }
 
+    @Override
     public RubyNode visitIndexTargetNode(Nodes.IndexTargetNode node) {
         // extra argument should be added before node translation
         // to trigger correctly replacement with inlined nodes (e.g. InlinedIndexSetNodeGen)