Test commit - minor terminology change to my recent patch suggested by John McCall

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

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 1d0b97654c64c8b9fdeb8ad46ef2068ad50a41da..0a93276981a5f4bdd60601c654382ae919516bd1 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1839,8 +1839,8 @@ def ext_typecheck_convert_incompatible_pointer : ExtWarn<
   "incompatible pointer types %2 %1, expected %0">;
 def ext_typecheck_convert_discards_qualifiers : ExtWarn<
   "%2 %1 discards qualifiers, expected %0">;
-def err_multi_pointer_qualifier_mismatch : Error<
-  "%2, %0 and %1 have different qualifiers in a multi-level pointer chain">;
+def err_nested_pointer_qualifier_mismatch : Error<
+  "%2, %0 and %1 have different qualifiers in nested pointer types">;
 def warn_incompatible_vectors : Warning<
   "incompatible vector types %2 %1, expected %0">,
   InGroup<VectorConversions>, DefaultIgnore;

diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 84d4c598b2c1427f4c52b044eab612269d2a46e5..bfef9a3985e3eaa06978b57fb36948653ad661ee 100644 (file)
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -3486,11 +3486,11 @@ public:
     /// c/v/r qualifiers, which we accept as an extension.
     CompatiblePointerDiscardsQualifiers,
     
-    /// IncompatibleMultiPointerQualifiers - The assignment is between two
-    /// multi-level pointer types, and the qualifiers other than the first two
+    /// IncompatibleNestedPointerQualifiers - The assignment is between two
+    /// nested pointer types, and the qualifiers other than the first two
     /// levels differ e.g. char ** -> const char **. We disallow this.
     /// FIXME: GCC only warns for this - should we do the same?
-    IncompatibleMultiPointerQualifiers,
+    IncompatibleNestedPointerQualifiers,
 
     /// IncompatibleVectors - The assignment is between two vector types that
     /// have the same size, which we accept as an extension.

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index a09f6a9005e4a504bc55bcea2aec6384d0230d4d..887a4c4af49cf1c626f8f534f6b7e012b7e20a90 100644 (file)
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -3762,7 +3762,7 @@ Sema::CheckPointerTypesForAssignment(QualType lhsType, QualType rhsType) {
       } while (lhptee->isPointerType() && rhptee->isPointerType());
       
       if (lhptee.getUnqualifiedType() == rhptee.getUnqualifiedType())
-        return IncompatibleMultiPointerQualifiers;
+        return IncompatibleNestedPointerQualifiers;
     }
     
     // General pointer incompatibility takes priority over qualifiers.
@@ -6241,8 +6241,8 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy,
       return false;
     DiagKind = diag::ext_typecheck_convert_discards_qualifiers;
     break;
-  case IncompatibleMultiPointerQualifiers:
-    DiagKind = diag::err_multi_pointer_qualifier_mismatch;
+  case IncompatibleNestedPointerQualifiers:
+    DiagKind = diag::err_nested_pointer_qualifier_mismatch;
     break;
   case IntToBlockPointer:
     DiagKind = diag::err_int_to_block_pointer;