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 1d0b976..0a93276 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1839,8 +1839,8 @@
"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 84d4c59..bfef9a3 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -3486,11 +3486,11 @@
/// 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 a09f6a9..887a4c4 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -3762,7 +3762,7 @@
} 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 @@
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;