Skip to content

Commit 65e954b

Browse files
committed
[GR-17457] Re-enable ECJ compilation of org.truffleruby as linter
PullRequest: truffleruby/4113
2 parents ce11ae4 + 53898f5 commit 65e954b

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

mx.truffleruby/suite.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@
287287
"checkstyle": "org.truffleruby",
288288
"workingSets": "TruffleRuby",
289289
"findbugsIgnoresGenerated": True,
290-
"forceJavac": True, # GR-51148 We need to force javac to silence a ECJ warning in generated code
291290
"license": [
292291
"EPL-2.0", # JRuby (we're choosing EPL out of EPL,GPL,LGPL)
293292
"BSD-new", # Rubinius

src/main/java/org/truffleruby/core/hash/library/CompactHashStore.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ Object delete(RubyHash hash, Object key,
217217
Object deleteLast(RubyHash hash, Object key,
218218
@Cached @Shared HashingNodes.ToHash hashFunction,
219219
@Cached @Shared GetIndexPosFromKeyPosNode getIndexPosFromKeyPosNode,
220-
@Cached @Exclusive InlinedLoopConditionProfile nonNullKeyNotYetFound,
220+
@Cached @Shared InlinedLoopConditionProfile nonNullKeyNotYetFound,
221221
@Bind("$node") Node node) {
222222
assert hash.size > 0;
223223
int keyPos = firstNonNullKeyPosFromEnd(nonNullKeyNotYetFound, node);
@@ -238,7 +238,7 @@ Object deleteLast(RubyHash hash, Object key,
238238
RubyArray shift(RubyHash hash,
239239
@Cached @Shared HashingNodes.ToHash hashFunction,
240240
@Cached @Shared GetIndexPosFromKeyPosNode getIndexPosFromKeyPosNode,
241-
@Cached @Exclusive InlinedLoopConditionProfile nonNullKeyNotYetFound,
241+
@Cached @Shared InlinedLoopConditionProfile nonNullKeyNotYetFound,
242242
@Bind("$node") Node node) {
243243
assert hash.size > 0;
244244
int keyPos = firstNonNullKeyPosFromBeginning(nonNullKeyNotYetFound, node);

src/main/java/org/truffleruby/parser/RubyDeferredWarnings.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public String getWarningMessage() {
7171
return buffer.toString();
7272
}
7373

74+
@Override
7475
public String toString() {
7576
return "WarningMessage(" +
7677
"message = '" + message + "'" +
@@ -117,6 +118,7 @@ public void warning(String fileName, int lineNumber, String message) {
117118
message));
118119
}
119120

121+
@Override
120122
public String toString() {
121123
var strings = new ArrayList<String>();
122124

src/main/java/org/truffleruby/parser/YARPTranslator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,7 @@ public RubyNode visitCallOrWriteNode(Nodes.CallOrWriteNode node) {
853853
return assignPositionAndFlags(node, rubyNode);
854854
}
855855

856+
@Override
856857
public RubyNode visitCallTargetNode(Nodes.CallTargetNode node) {
857858
// extra argument should be added before node translation
858859
// to trigger correctly replacement with inlined nodes (e.g. InlinedIndexSetNodeGen)
@@ -1990,6 +1991,7 @@ public RubyNode visitIndexOrWriteNode(Nodes.IndexOrWriteNode node) {
19901991
return assignPositionAndFlags(node, rubyNode);
19911992
}
19921993

1994+
@Override
19931995
public RubyNode visitIndexTargetNode(Nodes.IndexTargetNode node) {
19941996
// extra argument should be added before node translation
19951997
// to trigger correctly replacement with inlined nodes (e.g. InlinedIndexSetNodeGen)

0 commit comments

Comments
 (0)