Skip to content
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

Jump to bottom

Display warning and outputs Failures #262

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Display warning and outputs Failures #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ba9018f
avoid exceptions when running unit checker benchmarks
txiang61 Jan 8, 2020
63c732c
Merge remote-tracking branch 'opprop/master' into unit-benchmark
txiang61 Mar 22, 2020
e4b4213
Do not turn errors into warnings and output warnings from javac
txiang61 Mar 25, 2020
d7cadef
revert unrelated changes
txiang61 Mar 25, 2020
d210933
revert unrelated changes
txiang61 Mar 25, 2020
b823ab5
Merge branch 'display_warning' of https://github.com/txiang61/checker…
txiang61 Mar 25, 2020
4ce6043
add subtype constraint in Inference type Hierarchy
txiang61 Mar 25, 2020
b5f31c7
revert unrelated changes
txiang61 Mar 27, 2020
eabbb0a
Merge remote-tracking branch 'opprop/master' into display_warning
txiang61 May 28, 2020
d9b89c9
fix conflicting annos
txiang61 May 28, 2020
a7793d4
remove .project file
txiang61 May 28, 2020
198a153
Merge branch 'master' into display_warning
Ao-senXiong Apr 18, 2024
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
6 changes: 5 additions & 1 deletion src/checkers/inference/InferenceMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ private void startCheckerFramework() {
"-Xmaxwarns", "1000",
"-Xmaxerrs", "1000",
"-XDignore.symbol.file",
"-Awarns"));
"-source", "8",
"-target", "8"));

if (SystemUtil.jreVersion == 8) {
checkerFrameworkArgs.addAll(Arrays.asList("-source", "8", "-target", "8"));
Expand Down Expand Up @@ -484,6 +485,9 @@ public void handleCompilerResult(boolean success, String javacOutStr) {
logger.severe("Error return code from javac! Quitting.");
logger.info(javacOutStr);
System.exit(1);
} else if (!javacOutStr.isEmpty()) {
logger.severe("Warning output from javac.");
logger.info(javacOutStr);
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/checkers/inference/VariableAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,10 @@ private Slot addPrimaryVariable(AnnotatedTypeMirror atm, final Tree tree) {
if ((variable instanceof VariableSlot) && ((VariableSlot) variable).getLocation() == null) {
((VariableSlot) variable).setLocation(treeToLocation(tree));
}
if (variable instanceof ConstantSlot) {
atm.removeAnnotation(((ConstantSlot) variable).getValue());
}
atm.replaceAnnotation(slotManager.getAnnotation(variable));
} else {
AnnotationLocation location = treeToLocation(tree);
variable = replaceOrCreateEquivalentVarAnno(atm, tree, location);
Expand All @@ -521,10 +525,8 @@ private Slot addPrimaryVariable(AnnotatedTypeMirror atm, final Tree tree) {

treeToVarAnnoPair.put(tree, varATMPair);
}

atm.removeAnnotationInHierarchy(realTop);
atm.replaceAnnotation(slotManager.getAnnotation(variable));

return variable;
}

Expand Down
Loading