diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -7437,9 +7437,19 @@ Expr *Arg = TheCall->getArg(ArgNum); QualType ArgType = Arg->getType(); - if ((ExpectedType->isVoidPointerType() && !ArgType->isPointerType()) || - (!ExpectedType->isVoidPointerType() && - ArgType.getCanonicalType() != ExpectedType)) + // Checks to see if the argument type is valid. + bool IsValidType = true; + if (ExpectedType->isVoidPointerType() && !ArgType->isPointerType()) + IsValidType = false; + else if (!ExpectedType->isVoidPointerType()) { + if ((ArgType.isRestrictQualified() || ArgType.isVolatileQualified()) && + ArgType.getCanonicalType().getUnqualifiedType() == ExpectedType) + IsValidType = true; + else if (ArgType.getCanonicalType() != ExpectedType) + IsValidType = false; + } + + if (!IsValidType) return Diag(Arg->getBeginLoc(), diag::err_typecheck_convert_incompatible) << ArgType << ExpectedType << 1 << 0 << 0; diff --git a/clang/test/Sema/ppc-pair-mma-types.c b/clang/test/Sema/ppc-pair-mma-types.c --- a/clang/test/Sema/ppc-pair-mma-types.c +++ b/clang/test/Sema/ppc-pair-mma-types.c @@ -335,3 +335,23 @@ __vector_pair vp = __builtin_vsx_lxvp(ll, v); // expected-error {{passing '__vector int' (vector of 4 'int' values) to parameter of incompatible type 'const __vector_pair *'}} __builtin_vsx_stxvp(vp, ll, s); // expected-error {{passing 'unsigned short' to parameter of incompatible type 'const __vector_pair *'}} } + +void testRestrictQualifiedPointer1(int *__restrict acc) { + vector float arr[4]; + __builtin_mma_disassemble_acc((void*)arr, acc); // expected-error {{passing 'int *restrict' to parameter of incompatible type '__vector_quad *'}} +} + +void testRestrictQualifiedPointer2(__vector_quad *__restrict acc) { + vector float arr[4]; + __builtin_mma_disassemble_acc((void*)arr, acc); +} + +void VolatileQualifiedPointer1(int *__volatile acc) { + vector float arr[4]; + __builtin_mma_disassemble_acc((void*)arr, acc); // expected-error {{passing 'int *volatile' to parameter of incompatible type '__vector_quad *'}} +} + +void testVolatileQualifiedPointer2(__vector_quad *__volatile acc) { + vector float arr[4]; + __builtin_mma_disassemble_acc((void*)arr, acc); +}