MTC updated this revision to Diff 123783.
MTC added a comment.
Herald added subscribers: a.sidorin, rnkovacs.
Update diff, use the SourceLocation of the first element of the entered block
as the argument of `PathDiagnosticLocation`.
https://reviews.llvm.org/D37187
Files:
lib/StaticAnalyzer/Core/PathDiagnostic.cpp
test/Analysis/loop-widening-notes.cpp
Index: test/Analysis/loop-widening-notes.cpp
===================================================================
--- /dev/null
+++ test/Analysis/loop-widening-notes.cpp
@@ -0,0 +1,72 @@
+// RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha -analyzer-max-loop 2
-analyzer-config widen-loops=true -analyzer-output=text -verify %s
+
+int *p_a;
+int bar();
+int flag_a;
+int test_for_bug_25609() {
+ if (p_a == 0) // expected-note {{Assuming 'p_a' is equal to null}}
+ // expected-note@-1 {{Taking true branch}}
+ bar();
+ for (int i = 0; // expected-note {{Loop condition is true. Entering loop
body}}
+ // expected-note@-1 {{Loop condition is false. Execution
continues on line 16}}
+ ++i, // expected-note {{Value assigned to 'p_a'}}
+ i < flag_a;
+ ++i) {}
+
+ *p_a = 25609; // no-crash expected-warning {{Dereference of null pointer
(loaded from variable 'p_a')}}
+ // expected-note@-1 {{Dereference of null pointer (loaded from
variable 'p_a')}}
+ return *p_a;
+}
+
+int flag_b;
+int while_analyzer_output() {
+ flag_b = 100;
+ int num = 10;
+ while (flag_b-- > 0) { // expected-note {{Loop condition is true. Entering
loop body}}
+ // expected-note@-1 {{Value assigned to 'num'}}
+ // expected-note@-2 {{Loop condition is false.
Execution continues on line 30}}
+ num = flag_b;
+ }
+ if (num < 0) // expected-note {{Assuming 'num' is >= 0}}
+ // expected-note@-1 {{Taking false branch}}
+ flag_b = 0;
+ else if (num >= 1) // expected-note {{Assuming 'num' is < 1}}
+ // expected-note@-1 {{Taking false branch}}
+ flag_b = 50;
+ else
+ flag_b = 100;
+ return flag_b / num; // no-crash expected-warning {{Division by zero}}
+ // expected-note@-1 {{Division by zero}}
+}
+
+int flag_c;
+int do_while_analyzer_output() {
+ int num = 10;
+ do { // expected-note {{Loop condition is true. Execution continues on
line 47}}
+ // expected-note@-1 {{Loop condition is false. Exiting loop}}
+ num--;
+ } while (flag_c-- > 0); //expected-note {{Value assigned to 'num'}}
+ int local = 0;
+ if (num == 0) // expected-note {{Assuming 'num' is equal to 0}}
+ // expected-note@-1 {{Taking true branch}}
+ local = 10 / num; // no-crash expected-warning {{Division by zero}}
+ // expected-note@-1 {{Division by zero}}
+ return local;
+}
+
+int flag_d;
+int test_for_loop() {
+ int num = 10;
+ for (int i = 0; // expected-note {{Loop condition is true. Entering loop
body}}
+ // expected-note@-1 {{Loop condition is false. Execution
continues on line 67}}
+ new int(10), // expected-note {{Value assigned to 'num'}}
+ i < flag_d;
+ ++i) {
+ ++num;
+ }
+ if (num == 0) // expected-note {{Assuming 'num' is equal to 0}}
+ // expected-note@-1 {{Taking true branch}}
+ flag_d += 10;
+ return flag_d / num; // no-crash expected-warning {{Division by zero}}
+ // expected-note@-1 {{Division by zero}}
+}
Index: lib/StaticAnalyzer/Core/PathDiagnostic.cpp
===================================================================
--- lib/StaticAnalyzer/Core/PathDiagnostic.cpp
+++ lib/StaticAnalyzer/Core/PathDiagnostic.cpp
@@ -690,6 +690,17 @@
return getLocationForCaller(CEE->getCalleeContext(),
CEE->getLocationContext(),
SMng);
+ } else if (Optional<BlockEntrance> BE = P.getAs<BlockEntrance>()) {
+ CFGElement BlockFront = BE->getBlock()->front();
+ if (BlockFront.getKind() == CFGElement::Kind::Statement) {
+ return PathDiagnosticLocation(
+ BlockFront.getAs<CFGStmt>()->getStmt()->getLocStart(), SMng);
+ } else if (BlockFront.getKind() == CFGElement::Kind::NewAllocator) {
+ return PathDiagnosticLocation(BlockFront.getAs<CFGNewAllocator>()
+ ->getAllocatorExpr()
+ ->getLocStart(),
+ SMng);
+ }
} else {
llvm_unreachable("Unexpected ProgramPoint");
}
Index: test/Analysis/loop-widening-notes.cpp
===================================================================
--- /dev/null
+++ test/Analysis/loop-widening-notes.cpp
@@ -0,0 +1,72 @@
+// RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha -analyzer-max-loop 2 -analyzer-config widen-loops=true -analyzer-output=text -verify %s
+
+int *p_a;
+int bar();
+int flag_a;
+int test_for_bug_25609() {
+ if (p_a == 0) // expected-note {{Assuming 'p_a' is equal to null}}
+ // expected-note@-1 {{Taking true branch}}
+ bar();
+ for (int i = 0; // expected-note {{Loop condition is true. Entering loop body}}
+ // expected-note@-1 {{Loop condition is false. Execution continues on line 16}}
+ ++i, // expected-note {{Value assigned to 'p_a'}}
+ i < flag_a;
+ ++i) {}
+
+ *p_a = 25609; // no-crash expected-warning {{Dereference of null pointer (loaded from variable 'p_a')}}
+ // expected-note@-1 {{Dereference of null pointer (loaded from variable 'p_a')}}
+ return *p_a;
+}
+
+int flag_b;
+int while_analyzer_output() {
+ flag_b = 100;
+ int num = 10;
+ while (flag_b-- > 0) { // expected-note {{Loop condition is true. Entering loop body}}
+ // expected-note@-1 {{Value assigned to 'num'}}
+ // expected-note@-2 {{Loop condition is false. Execution continues on line 30}}
+ num = flag_b;
+ }
+ if (num < 0) // expected-note {{Assuming 'num' is >= 0}}
+ // expected-note@-1 {{Taking false branch}}
+ flag_b = 0;
+ else if (num >= 1) // expected-note {{Assuming 'num' is < 1}}
+ // expected-note@-1 {{Taking false branch}}
+ flag_b = 50;
+ else
+ flag_b = 100;
+ return flag_b / num; // no-crash expected-warning {{Division by zero}}
+ // expected-note@-1 {{Division by zero}}
+}
+
+int flag_c;
+int do_while_analyzer_output() {
+ int num = 10;
+ do { // expected-note {{Loop condition is true. Execution continues on line 47}}
+ // expected-note@-1 {{Loop condition is false. Exiting loop}}
+ num--;
+ } while (flag_c-- > 0); //expected-note {{Value assigned to 'num'}}
+ int local = 0;
+ if (num == 0) // expected-note {{Assuming 'num' is equal to 0}}
+ // expected-note@-1 {{Taking true branch}}
+ local = 10 / num; // no-crash expected-warning {{Division by zero}}
+ // expected-note@-1 {{Division by zero}}
+ return local;
+}
+
+int flag_d;
+int test_for_loop() {
+ int num = 10;
+ for (int i = 0; // expected-note {{Loop condition is true. Entering loop body}}
+ // expected-note@-1 {{Loop condition is false. Execution continues on line 67}}
+ new int(10), // expected-note {{Value assigned to 'num'}}
+ i < flag_d;
+ ++i) {
+ ++num;
+ }
+ if (num == 0) // expected-note {{Assuming 'num' is equal to 0}}
+ // expected-note@-1 {{Taking true branch}}
+ flag_d += 10;
+ return flag_d / num; // no-crash expected-warning {{Division by zero}}
+ // expected-note@-1 {{Division by zero}}
+}
Index: lib/StaticAnalyzer/Core/PathDiagnostic.cpp
===================================================================
--- lib/StaticAnalyzer/Core/PathDiagnostic.cpp
+++ lib/StaticAnalyzer/Core/PathDiagnostic.cpp
@@ -690,6 +690,17 @@
return getLocationForCaller(CEE->getCalleeContext(),
CEE->getLocationContext(),
SMng);
+ } else if (Optional<BlockEntrance> BE = P.getAs<BlockEntrance>()) {
+ CFGElement BlockFront = BE->getBlock()->front();
+ if (BlockFront.getKind() == CFGElement::Kind::Statement) {
+ return PathDiagnosticLocation(
+ BlockFront.getAs<CFGStmt>()->getStmt()->getLocStart(), SMng);
+ } else if (BlockFront.getKind() == CFGElement::Kind::NewAllocator) {
+ return PathDiagnosticLocation(BlockFront.getAs<CFGNewAllocator>()
+ ->getAllocatorExpr()
+ ->getLocStart(),
+ SMng);
+ }
} else {
llvm_unreachable("Unexpected ProgramPoint");
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
