Tweak wording and classifications of analyzer diagnostics.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@86127 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Analysis/PathSensitive/BugType.h b/include/clang/Analysis/PathSensitive/BugType.h
index 46b3edd3172ecee7f75e9d83c43069547beefc3f..242b8e9afebe18aa16df7da2f17c044514ed5f47 100644 (file)
--- a/include/clang/Analysis/PathSensitive/BugType.h
+++ b/include/clang/Analysis/PathSensitive/BugType.h
@@ -64,10 +64,10 @@ protected:
   const std::string desc;
 public:
   BuiltinBug(GRExprEngine *eng, const char* n, const char* d)
-    : BugType(n, "Logic errors"), Eng(*eng), desc(d) {}
+    : BugType(n, "Logic error"), Eng(*eng), desc(d) {}
 
   BuiltinBug(GRExprEngine *eng, const char* n)
-    : BugType(n, "Logic errors"), Eng(*eng), desc(n) {}
+    : BugType(n, "Logic error"), Eng(*eng), desc(n) {}
 
   const std::string &getDescription() const { return desc; }
 

diff --git a/lib/Analysis/VLASizeChecker.cpp b/lib/Analysis/VLASizeChecker.cpp
index 76e4477449ed46792c181f3af5e53839ab9878b3..0e731902f4bb402dcb8fab0359962c5bd5d6f5a2 100644 (file)
--- a/lib/Analysis/VLASizeChecker.cpp
+++ b/lib/Analysis/VLASizeChecker.cpp
@@ -38,8 +38,8 @@ ExplodedNode *UndefSizedVLAChecker::CheckType(QualType T, ExplodedNode *Pred,
       if (ExplodedNode* N = Builder.generateNode(S, state, Pred)) {
         N->markAsSink();
         if (!BT)
-          BT = new BugType("Declare variable-length array (VLA) of undefined "
-                            "size", "Logic error");
+          BT = new BugType("Declared variable-length array (VLA) uses a garbage"
+                           " value as its size", "Logic error");
 
         EnhancedBugReport *R =
                           new EnhancedBugReport(*BT, BT->getName().c_str(), N);
@@ -81,7 +81,7 @@ ExplodedNode *ZeroSizedVLAChecker::CheckType(QualType T, ExplodedNode *Pred,
       if (ExplodedNode* N = Builder.generateNode(S, zeroState, Pred)) {
         N->markAsSink();
         if (!BT)
-          BT = new BugType("Declare variable-length array (VLA) of zero size",
+          BT = new BugType("Declared variable-length array (VLA) has zero size",
                             "Logic error");
 
         EnhancedBugReport *R =

diff --git a/test/Analysis/misc-ps.m b/test/Analysis/misc-ps.m
index 947b41ae794cc9fc62ad5f68999b899d3c020263..80e20c1ebb00cfa1dd51c1a8246deca43b75002a 100644 (file)
--- a/test/Analysis/misc-ps.m
+++ b/test/Analysis/misc-ps.m
@@ -121,12 +121,12 @@ void check_zero_sized_VLA(int x) {
   if (x)
     return;
 
-  int vla[x]; // expected-warning{{Declare variable-length array (VLA) of zero size}}
+  int vla[x]; // expected-warning{{Declared variable-length array (VLA) has zero size}}
 }
 
 void check_uninit_sized_VLA() {
   int x;
-  int vla[x]; // expected-warning{{Declare variable-length array (VLA) of undefined size}}
+  int vla[x]; // expected-warning{{Declared variable-length array (VLA) uses a garbage value as its size}}
 }
 
 // sizeof(void)