maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

PR39809: (const void*)0 is not a null pointer constant in C. 

llvm-svn: 347730
This commit is contained in:
Richard Smith 2018-11-28 06:25:06 +00:00
parent 02a84c8d0c
commit dab73ce1dc
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/AST/Expr.cpp
View File

@ -3441,20 +3441,20 @@ Expr::isNullPointerConstant(ASTContext &Ctx,
// Check that it is a cast to void*.
if (const PointerType *PT = CE->getType()->getAs<PointerType>()) {
QualType Pointee = PT->getPointeeType();
Qualifiers Qs = Pointee.getQualifiers();
// Only (void*)0 or equivalent are treated as nullptr. If pointee type
// has non-default address space it is not treated as nullptr.
// (__generic void*)0 in OpenCL 2.0 should not be treated as nullptr
// since it cannot be assigned to a pointer to constant address space.
bool PointeeHasDefaultAS =
Pointee.getAddressSpace() == LangAS::Default ||
(Ctx.getLangOpts().OpenCLVersion >= 200 &&
if ((Ctx.getLangOpts().OpenCLVersion >= 200 &&
Pointee.getAddressSpace() == LangAS::opencl_generic) ||
(Ctx.getLangOpts().OpenCL &&
Ctx.getLangOpts().OpenCLVersion < 200 &&
Pointee.getAddressSpace() == LangAS::opencl_private);
Pointee.getAddressSpace() == LangAS::opencl_private))
Qs.removeAddressSpace();
if (PointeeHasDefaultAS && Pointee->isVoidType() && // to void*
CE->getSubExpr()->getType()->isIntegerType()) // from int.
if (Pointee->isVoidType() && Qs.empty() && // to void*
CE->getSubExpr()->getType()->isIntegerType()) // from int
return CE->getSubExpr()->isNullPointerConstant(Ctx, NPC);
}
}

7
clang/test/Sema/conditional.c
View File

@ -12,3 +12,10 @@ int _php_stream_free1() {
int _php_stream_free2() {
return (1 ? _efree(0) : free(0)); // expected-error {{returning 'void' from a function with incompatible result type 'int'}}
}
void pr39809() {
_Generic(0 ? (int const *)0 : (void *)0, int const *: (void)0);
_Generic(0 ? (int const *)0 : (void *)1, void const *: (void)0);
_Generic(0 ? (int volatile*)0 : (void const*)1, void volatile const*: (void)0);
_Generic(0 ? (int volatile*)0 : (void const*)0, void volatile const*: (void)0);
}