replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

llvm-svn: 86442
This commit is contained in:
Alexis Hunt 2009-11-08 07:46:34 +00:00
parent 4100db6174
commit 6f3de50ca7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -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;

6
clang/lib/Sema/Sema.h
View File

@ -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.

6
clang/lib/Sema/SemaExpr.cpp
View File

@ -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;