This revision was automatically updated to reflect the committed changes.
Closed by commit rL363510: [analyzer] Track indices of arrays (authored by
Szelethus, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D63080?vs=204888&id=204947#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D63080/new/
https://reviews.llvm.org/D63080
Files:
cfe/trunk/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
cfe/trunk/test/Analysis/diagnostics/track_subexpressions.cpp
Index: cfe/trunk/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
===================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
+++ cfe/trunk/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
@@ -1740,6 +1740,10 @@
if (const Expr *Receiver = NilReceiverBRVisitor::getNilReceiver(Inner,
LVNode))
trackExpressionValue(LVNode, Receiver, report, EnableNullFPSuppression);
+ if (const auto *Arr = dyn_cast<ArraySubscriptExpr>(Inner))
+ trackExpressionValue(
+ LVNode, Arr->getIdx(), report, EnableNullFPSuppression);
+
// See if the expression we're interested refers to a variable.
// If so, we can track both its contents and constraints on its value.
if (ExplodedGraph::isInterestingLValueExpr(Inner)) {
Index: cfe/trunk/test/Analysis/diagnostics/track_subexpressions.cpp
===================================================================
--- cfe/trunk/test/Analysis/diagnostics/track_subexpressions.cpp
+++ cfe/trunk/test/Analysis/diagnostics/track_subexpressions.cpp
@@ -17,3 +17,28 @@
(void)(TCP_MAXWIN << shift_amount); // expected-warning{{The result of the
left shift is undefined due to shifting by '255', which is greater or equal to
the width of type 'int'}}
// expected-note@-1{{The result of the
left shift is undefined due to shifting by '255', which is greater or equal to
the width of type 'int'}}
}
+
+namespace array_index_tracking {
+void consume(int);
+
+int getIndex(int x) {
+ int a;
+ if (x > 0)
+ a = 3;
+ else
+ a = 2;
+ return a;
+}
+
+int getInt();
+
+void testArrayIndexTracking() {
+ int arr[10];
+
+ for (int i = 0; i < 3; ++i)
+ arr[i] = 0;
+ int x = getInt();
+ int n = getIndex(x);
+ consume(arr[n]);
+}
+} // end of namespace array_index_tracking
Index: cfe/trunk/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
===================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
+++ cfe/trunk/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp
@@ -1740,6 +1740,10 @@
if (const Expr *Receiver = NilReceiverBRVisitor::getNilReceiver(Inner, LVNode))
trackExpressionValue(LVNode, Receiver, report, EnableNullFPSuppression);
+ if (const auto *Arr = dyn_cast<ArraySubscriptExpr>(Inner))
+ trackExpressionValue(
+ LVNode, Arr->getIdx(), report, EnableNullFPSuppression);
+
// See if the expression we're interested refers to a variable.
// If so, we can track both its contents and constraints on its value.
if (ExplodedGraph::isInterestingLValueExpr(Inner)) {
Index: cfe/trunk/test/Analysis/diagnostics/track_subexpressions.cpp
===================================================================
--- cfe/trunk/test/Analysis/diagnostics/track_subexpressions.cpp
+++ cfe/trunk/test/Analysis/diagnostics/track_subexpressions.cpp
@@ -17,3 +17,28 @@
(void)(TCP_MAXWIN << shift_amount); // expected-warning{{The result of the left shift is undefined due to shifting by '255', which is greater or equal to the width of type 'int'}}
// expected-note@-1{{The result of the left shift is undefined due to shifting by '255', which is greater or equal to the width of type 'int'}}
}
+
+namespace array_index_tracking {
+void consume(int);
+
+int getIndex(int x) {
+ int a;
+ if (x > 0)
+ a = 3;
+ else
+ a = 2;
+ return a;
+}
+
+int getInt();
+
+void testArrayIndexTracking() {
+ int arr[10];
+
+ for (int i = 0; i < 3; ++i)
+ arr[i] = 0;
+ int x = getInt();
+ int n = getIndex(x);
+ consume(arr[n]);
+}
+} // end of namespace array_index_tracking
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
