diff options
| author | David Blaikie <dblaikie@gmail.com> | 2012-11-08 00:41:20 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2012-11-08 00:41:20 +0000 |
| commit | a1edff0046f3549ad15ba1afdb35d091aa2ff811 (patch) | |
| tree | ee9ecc4f6ed883e302beaa5bacec19633c347f22 /clang/lib/Sema/SemaChecking.cpp | |
| parent | c56bd0837378f15bbc652288c347f1cdb2b5ce8e (diff) | |
| download | bcm5719-llvm-a1edff0046f3549ad15ba1afdb35d091aa2ff811.tar.gz bcm5719-llvm-a1edff0046f3549ad15ba1afdb35d091aa2ff811.zip | |
PR14284: crash on ext-valid returning NULL from a void function
llvm-svn: 167565
Diffstat (limited to 'clang/lib/Sema/SemaChecking.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaChecking.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index a434425db86..692a210ef30 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -4799,7 +4799,8 @@ void CheckImplicitConversion(Sema &S, Expr *E, QualType T, if ((E->isNullPointerConstant(S.Context, Expr::NPC_ValueDependentIsNotNull) == Expr::NPCK_GNUNull) && !Target->isAnyPointerType() - && !Target->isBlockPointerType() && !Target->isMemberPointerType()) { + && !Target->isBlockPointerType() && !Target->isMemberPointerType() + && Target->isScalarType()) { SourceLocation Loc = E->getSourceRange().getBegin(); if (Loc.isMacroID()) Loc = S.SourceMgr.getImmediateExpansionRange(Loc).first; |
