replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refixed pr5086 by letting Expr::isNullPointerConstant 

handle checking for a null pointer for a zero-valued
enumerator; moving the test case from CodeGen to Sema.

llvm-svn: 83350
This commit is contained in:
Fariborz Jahanian 2009-10-06 00:09:31 +00:00
parent bb802206d2
commit 333bb733a5
4 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1674,7 +1674,8 @@ bool Expr::isNullPointerConstant(ASTContext &Ctx,
return true;
// This expression must be an integer type.
if (!getType()->isIntegerType())
if (!getType()->isIntegerType() ||
(Ctx.getLangOptions().CPlusPlus && getType()->isEnumeralType()))
return false;
// If we have an integer constant expression, we need to *evaluate* it and

3
clang/lib/Sema/SemaOverload.cpp
View File

@ -887,9 +887,6 @@ 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);

21
clang/test/CodeGenCXX/PR5086-ambig-resolution-enum.cpp
View File

@ -1,21 +0,0 @@
// 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

13
clang/test/SemaCXX/PR5086-ambig-resolution-enum.cpp Normal file
View File

@ -0,0 +1,13 @@
// RUN: clang-cc -fsyntax-only -verify %s -std=c++0x
class C {
public:
enum E { e1=0 };
const char * fun1(int , enum E) const;
int fun1(unsigned, const char *) const;
};
void foo(const C& rc) {
enum {BUFLEN = 128 };
const char *p = rc.fun1(BUFLEN - 2, C::e1);
}