diff options
author | Fariborz Jahanian <fjahanian@apple.com> | 2009-10-01 22:10:15 +0000 |
---|---|---|
committer | Fariborz Jahanian <fjahanian@apple.com> | 2009-10-01 22:10:15 +0000 |
commit | a0f91ad59c4be3bc6425d74da768e51a603c43a9 (patch) | |
tree | 8eef4d5f4315795f16487f91fb70fca624a8f391 /clang/lib/Sema/SemaOverload.cpp | |
parent | 70cb67fcf4afa1cf285dabf394f52031814142be (diff) | |
download | bcm5719-llvm-a0f91ad59c4be3bc6425d74da768e51a603c43a9.tar.gz bcm5719-llvm-a0f91ad59c4be3bc6425d74da768e51a603c43a9.zip |
enumerator value of 0 is not a null pointer constant for
deciding const of null pointer conversion. Fixes PR5086.
llvm-svn: 83217
Diffstat (limited to 'clang/lib/Sema/SemaOverload.cpp')
-rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index 18614f78709..433ca79b48f 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -887,6 +887,9 @@ static bool isNullPointerConstantForConversion(Expr *Expr, Expr->getType()->isIntegralType()) return !InOverloadResolution; + if (Expr->getType()->isEnumeralType()) + return !InOverloadResolution; + return Expr->isNullPointerConstant(Context, InOverloadResolution? Expr::NPC_ValueDependentIsNotNull : Expr::NPC_ValueDependentIsNull); |