add test; fix bugs

Author: HerrCai0907

clang-tools-extra/clang-tidy/misc/ConstCorrectnessCheck.cpp

@@ -210,9 +210,10 @@ void ConstCorrectnessCheck::check(const MatchFinder::MatchResult &Result) {
     registerScope(LocalScope, Result.Context);
     if (ScopesCache[LocalScope]->isPointeeMutated(Variable))
       return;
-    auto Diag = diag(Variable->getBeginLoc(),
-                     "variable %0 of type %1 can be declared 'const'")
-                << Variable << VT;
+    auto Diag =
+        diag(Variable->getBeginLoc(),
+             "pointee of variable %0 of type %1 can be declared 'const'")
+        << Variable << VT;
     if (IsNormalVariableInTemplate)
       TemplateDiagnosticsCache.insert(Variable->getBeginLoc());
     if (!CanBeFixIt)
@@ -241,14 +242,16 @@ void ConstCorrectnessCheck::check(const MatchFinder::MatchResult &Result) {
     if (WarnPointersAsValues && !VT.isConstQualified())
       CheckValue();
     if (WarnPointersAsPointers) {
-      if (const auto *PT = dyn_cast<PointerType>(VT))
+      if (const auto *PT = dyn_cast<PointerType>(VT)) {
         if (!PT->getPointeeType().isConstQualified())
           CheckPointee();
-      if (const auto *AT = dyn_cast<ArrayType>(VT))
+      }
+      if (const auto *AT = dyn_cast<ArrayType>(VT)) {
         if (!AT->getElementType().isConstQualified()) {
           assert(AT->getElementType()->isPointerType());
           CheckPointee();
         }
+      }
     }
     return;
   }

clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-allowed-types.cpp

@@ -3,7 +3,8 @@
 // RUN:     misc-const-correctness.AllowedTypes: '[Pp]ointer$;[Pp]tr$;[Rr]ef(erence)?$;qualified::Type;::fully::QualifiedType;ConstTemplate', \
 // RUN:     misc-const-correctness.TransformPointersAsValues: true, \
 // RUN:     misc-const-correctness.TransformReferences: true, \
-// RUN:     misc-const-correctness.WarnPointersAsValues: true } \
+// RUN:     misc-const-correctness.WarnPointersAsValues: true, \
+// RUN:     misc-const-correctness.WarnPointersAsPointers: false } \
 // RUN:   }" -- -fno-delayed-template-parsing
 
 struct SmartPointer {

clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-pointer-as-pointers-values.cpp

@@ -0,0 +1,19 @@
+// RUN: %check_clang_tidy %s misc-const-correctness %t \
+// RUN: -config='{CheckOptions: {\
+// RUN:   misc-const-correctness.AnalyzeValues: false,\
+// RUN:   misc-const-correctness.AnalyzeReferences: false,\
+// RUN:   misc-const-correctness.AnalyzePointers: true,\
+// RUN:   misc-const-correctness.WarnPointersAsValues: true,\
+// RUN:   misc-const-correctness.WarnPointersAsPointers: true,\
+// RUN:   misc-const-correctness.TransformPointersAsValues: true,\
+// RUN:   misc-const-correctness.TransformPointersAsPointers: true\
+// RUN: }}' \
+// RUN: -- -fno-delayed-template-parsing
+
+void pointee_to_const() {
+  int a[] = {1, 2};
+  int *p_local0 = &a[0];
+  // CHECK-MESSAGES: [[@LINE-1]]:3: warning: pointee of variable 'p_local0' of type 'int *' can be declared 'const'
+  // CHECK-MESSAGES: [[@LINE-2]]:3: warning: variable 'p_local0' of type 'int *' can be declared 'const'
+  // CHECK-FIXES: int  const*const p_local0 = &a[0];
+}

clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-pointer-as-pointers.cpp

@@ -13,15 +13,15 @@
 void pointee_to_const() {
   int a[] = {1, 2};
   int *p_local0 = &a[0];
-  // CHECK-MESSAGES: [[@LINE-1]]:3: warning: variable 'p_local0' of type 'int *' can be declared 'const'
+  // CHECK-MESSAGES: [[@LINE-1]]:3: warning: pointee of variable 'p_local0' of type 'int *' can be declared 'const'
   // CHECK-FIXES: int  const*p_local0
   p_local0 = &a[1];
 }
 
 void array_of_pointer_to_const() {
   int a[] = {1, 2};
   int *p_local0[1] = {&a[0]};
-  // CHECK-MESSAGES: [[@LINE-1]]:3: warning: variable 'p_local0' of type 'int *[1]' can be declared 'const'
+  // CHECK-MESSAGES: [[@LINE-1]]:3: warning: pointee of variable 'p_local0' of type 'int *[1]' can be declared 'const'
   // CHECK-FIXES: int  const*p_local0[1]
   p_local0[0] = &a[1];
 }
@@ -30,7 +30,7 @@ template<class T>
 void template_fn() {
   T a[] = {1, 2};
   T *p_local0 = &a[0];
-  // CHECK-MESSAGES: [[@LINE-1]]:3: warning: variable 'p_local0' of type 'char *' can be declared 'const'
+  // CHECK-MESSAGES: [[@LINE-1]]:3: warning: pointee of variable 'p_local0' of type 'char *' can be declared 'const'
   // CHECK-FIXES: T  const*p_local0
   p_local0 = &a[1];
 }

clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-pointer-as-values.cpp

@@ -2,6 +2,7 @@
 // RUN: -config='{CheckOptions: \
 // RUN:  {misc-const-correctness.AnalyzeValues: true,\
 // RUN:   misc-const-correctness.WarnPointersAsValues: true,\
+// RUN:   misc-const-correctness.WarnPointersAsPointers: false,\
 // RUN:   misc-const-correctness.TransformPointersAsValues: true}}' \
 // RUN: -- -fno-delayed-template-parsing
 

clang-tools-extra/test/clang-tidy/checkers/misc/const-correctness-transform-pointer-as-values.cpp

@@ -2,6 +2,7 @@
 // RUN: -config='{CheckOptions: \
 // RUN:  {misc-const-correctness.AnalyzeValues: true,\
 // RUN:   misc-const-correctness.WarnPointersAsValues: true, \
+// RUN:   misc-const-correctness.WarnPointersAsPointers: false, \
 // RUN:   misc-const-correctness.TransformPointersAsValues: true}\
 // RUN:  }' -- -fno-delayed-template-parsing