Skip to content

[GR-10470] Unify and simplify checkstyle definitions. #4187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 8, 2022
Merged

[GR-10470] Unify and simplify checkstyle definitions. #4187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11517e5
fix issue with SpeculationGroupReason id allocation
dougxc Jan 4, 2022
12525bb
[GR-36140] Fix issue with SpeculationGroupReason id allocation.
dougxc Jan 8, 2022
b2bacda
Unify and simplify checkstyle definitions
Jan 7, 2022
d63c695
Remove unnecessary Checkstyle comments
Jan 8, 2022
8f45204
Remove unnecessary @formatter comments
Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...iler.serviceprovider/src/org/graalvm/compiler/serviceprovider/SpeculationReasonGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,15 @@ public final class SpeculationReasonGroup {
private static final AtomicInteger nextId = new AtomicInteger(1);

/**
* Creates speculation group whose context will always match {@code signature}.
* Creates a speculation group whose context will always match {@code signature}.
*
* This constructor is deleted in libgraal to ensure group ids are allocated during build time.
* Without this invariant, it would possible for 2 different groups to have the same id if the
* groups are allocated in different libgraal isolates (since static variables are
* isolate-local).
*/
public SpeculationReasonGroup(String name, Class<?>... signature) {
this.id = nextId.get();
this.id = nextId.getAndIncrement();
this.name = name;
this.signature = signature;
for (Class<?> c : signature) {
Expand Down
36 changes: 16 additions & 20 deletions substratevm/mx.substratevm/suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,9 +387,8 @@
"dependencies": [
"com.oracle.svm.common",
],
"checkstyle": "com.oracle.graal.pointsto",
"checkstyle": "com.oracle.svm.core",
"javaCompliance": "11+",
"checkstyleVersion" : "8.36.1",
"annotationProcessors": [
"compiler:GRAAL_PROCESSOR",
],
Expand Down Expand Up @@ -647,8 +646,7 @@
"requires" : [
"jdk.management",
],
"checkstyle": "com.oracle.svm.driver",
"checkstyleVersion" : "8.36.1",
"checkstyle": "com.oracle.svm.hosted",
"workingSets": "SVM",
"annotationProcessors": [
"compiler:GRAAL_PROCESSOR",
Expand Down Expand Up @@ -772,7 +770,7 @@
"subDir": "src",
"sourceDirs" : ["src"],
"dependencies" : ["com.oracle.svm.core"],
"checkstyle" : "com.oracle.svm.truffle",
"checkstyle" : "com.oracle.svm.hosted",
"javaCompliance": "11+",
"annotationProcessors" : [
"compiler:GRAAL_PROCESSOR",
Expand Down Expand Up @@ -852,7 +850,7 @@
"requires" : [
"jdk.unsupported",
],
"checkstyle": "com.oracle.svm.truffle",
"checkstyle": "com.oracle.svm.core",
"javaCompliance": "11+",
"annotationProcessors": [
"compiler:GRAAL_PROCESSOR",
Expand All @@ -866,7 +864,7 @@
"dependencies": [
"com.oracle.svm.core",
],
"checkstyle": "com.oracle.svm.truffle",
"checkstyle": "com.oracle.svm.core",
"javaCompliance": "11+",
"annotationProcessors": [
"compiler:GRAAL_PROCESSOR",
Expand All @@ -883,9 +881,8 @@
"requires" : [
"jdk.unsupported",
],
"checkstyle": "com.oracle.svm.truffle",
"checkstyle": "com.oracle.svm.hosted",
"javaCompliance": "11+",
"checkstyleVersion" : "8.36.1",
"annotationProcessors": [
"compiler:GRAAL_PROCESSOR",
],
Expand All @@ -901,7 +898,7 @@
"requires": [
"jdk.unsupported", # workaround to make TRUFFLE_DSL_PROCESSOR work with ECJ
],
"checkstyle": "com.oracle.svm.truffle",
"checkstyle": "com.oracle.svm.hosted",
"javaCompliance": "11+",
"annotationProcessors": [
"truffle:TRUFFLE_DSL_PROCESSOR",
Expand All @@ -916,7 +913,7 @@
"com.oracle.svm.truffle.nfi",
"com.oracle.svm.core.posix",
],
"checkstyle": "com.oracle.svm.truffle",
"checkstyle": "com.oracle.svm.hosted",
"javaCompliance": "11+",
"annotationProcessors": [
"truffle:TRUFFLE_DSL_PROCESSOR",
Expand All @@ -931,7 +928,7 @@
"com.oracle.svm.truffle.nfi",
"com.oracle.svm.core.windows",
],
"checkstyle": "com.oracle.svm.truffle",
"checkstyle": "com.oracle.svm.hosted",
"javaCompliance": "11+",
"annotationProcessors": [
"truffle:TRUFFLE_DSL_PROCESSOR",
Expand All @@ -945,7 +942,7 @@
"generatedDependencies": [
"com.oracle.svm.graal",
],
"checkstyle": "com.oracle.svm.truffle",
"checkstyle": "com.oracle.svm.core",
"javaCompliance": "11+",
"annotationProcessors": [
"compiler:GRAAL_PROCESSOR",
Expand All @@ -964,8 +961,7 @@
"sdk:GRAAL_SDK",
"com.oracle.svm.hosted",
],
"checkstyle": "org.graalvm.polyglot.nativeapi",
"checkstyleVersion" : "8.36.1",
"checkstyle": "com.oracle.svm.core",
"javaCompliance": "11+",
"annotationProcessors" : [
"compiler:GRAAL_PROCESSOR",
Expand Down Expand Up @@ -1003,7 +999,7 @@
"dependencies": [
"com.oracle.svm.core",
],
"checkstyle": "com.oracle.svm.driver",
"checkstyle": "com.oracle.svm.hosted",
"workingSets": "SVM",
"annotationProcessors": [
],
Expand All @@ -1019,7 +1015,7 @@
"dependencies": [
"com.oracle.svm.jni",
],
"checkstyle": "com.oracle.svm.driver",
"checkstyle": "com.oracle.svm.hosted",
"workingSets": "SVM",
"annotationProcessors": [
"compiler:GRAAL_PROCESSOR",
Expand All @@ -1039,7 +1035,7 @@
"com.oracle.svm.configure",
"com.oracle.svm.driver",
],
"checkstyle": "com.oracle.svm.driver",
"checkstyle": "com.oracle.svm.hosted",
"workingSets": "SVM",
"annotationProcessors": [
"compiler:GRAAL_PROCESSOR",
Expand All @@ -1057,7 +1053,7 @@
"dependencies": [
"JVMTI_AGENT_BASE",
],
"checkstyle": "com.oracle.svm.driver",
"checkstyle": "com.oracle.svm.hosted",
"workingSets": "SVM",
"annotationProcessors": [
"compiler:GRAAL_PROCESSOR",
Expand All @@ -1075,7 +1071,7 @@
"requires" : [
"jdk.unsupported",
],
"checkstyle" : "com.oracle.svm.truffle",
"checkstyle" : "com.oracle.svm.hosted",
"workingSets": "SVM",
"annotationProcessors": [
"compiler:GRAAL_PROCESSOR",
Expand Down
Loading