enumerator value of 0 is not a null pointer constant for

deciding const of null pointer conversion. Fixes PR5086.

llvm-svn: 83217
This commit is contained in:
Fariborz Jahanian 2009-10-01 22:10:15 +00:00
parent 70cb67fcf4
commit a0f91ad59c
2 changed files with 24 additions and 0 deletions

View File

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

View File

@ -0,0 +1,21 @@
// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s &&
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s &&
// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s &&
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s &&
// RUN: true
class UnicodeString {
public:
enum EInvariant { kInvariant };
int extract(int targetCapacity, enum EInvariant inv) const;
int extract(unsigned targetLength, const char *codepage) const;
};
void foo(const UnicodeString& id) {
enum {BUFLEN = 128 };
id.extract(BUFLEN - 2, UnicodeString::kInvariant);
}
// CHECK-LP64: call __ZNK13UnicodeString7extractEiNS_10EInvariantE
// CHECK-LP32: call L__ZNK13UnicodeString7extractEiNS_10EInvariantE