1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
Description: Build correctly since caseTree.getExpression() is deprecated
Hack to use the newer getExpressions() to prevent a Warning that becomes an
Error thanks to -Werror. This file was removed in upstream 3.7.1 and therefore
this patch should no longer be needed once that version or higher is in Debian.
Author: Olek Wojnar <olek@debian.org>
Forwarded: not-needed
Last-Update: 2023-06-20
--- a/dataflow/src/main/java/org/checkerframework/dataflow/cfg/CFGBuilder.java
+++ b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/CFGBuilder.java
@@ -3339,7 +3339,7 @@
Integer defaultIndex = null;
for (int i = 0; i < cases; ++i) {
CaseTree caseTree = switchTree.getCases().get(i);
- if (caseTree.getExpression() == null) {
+ if (caseTree.getExpressions().isEmpty()) {
defaultIndex = i;
} else {
buildCase(caseTree, i);
@@ -3361,9 +3361,9 @@
final Label nextBodyL = caseBodyLabels[index + 1];
final Label nextCaseL = new Label();
- ExpressionTree exprTree = tree.getExpression();
- if (exprTree != null) {
- Node expr = scan(exprTree, p);
+ List<? extends ExpressionTree> exprTree = tree.getExpressions();
+ if (!exprTree.isEmpty()) {
+ Node expr = scan(exprTree.get(0), p);
CaseNode test = new CaseNode(tree, switchExpr, expr, env.getTypeUtils());
extendWithNode(test);
extendWithExtendedNode(new ConditionalJump(thisBodyL, nextCaseL));
|
