diff options
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 1 | ||||
| -rw-r--r-- | test/SemaCXX/nullptr.cpp | 19 |
2 files changed, 18 insertions, 2 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index af00464859..af0456bf36 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -190,6 +190,7 @@ bool StandardConversionSequence::isPointerConversionToBool() const { (getFromType()->isPointerType() || getFromType()->isObjCObjectPointerType() || getFromType()->isBlockPointerType() || + getFromType()->isNullPtrType() || First == ICK_Array_To_Pointer || First == ICK_Function_To_Pointer)) return true; diff --git a/test/SemaCXX/nullptr.cpp b/test/SemaCXX/nullptr.cpp index cc75eab30b..0a0d098e36 100644 --- a/test/SemaCXX/nullptr.cpp +++ b/test/SemaCXX/nullptr.cpp @@ -1,8 +1,7 @@ // RUN: %clang_cc1 -fsyntax-only -verify -std=c++0x -ffreestanding %s #include <stdint.h> -// Don't have decltype yet. -typedef __typeof__(nullptr) nullptr_t; +typedef decltype(nullptr) nullptr_t; struct A {}; @@ -69,3 +68,19 @@ template <int *PI, void (*PF)(), int A::*PM, void (A::*PMF)()> struct T {}; typedef T<nullptr, nullptr, nullptr, nullptr> NT; + +namespace test1 { +template<typename T, typename U> struct is_same { + static const bool value = false; +}; + +template<typename T> struct is_same<T, T> { + static const bool value = true; +}; + +void *g(void*); +bool g(bool); + +// Test that we prefer g(void*) over g(bool). +static_assert(is_same<decltype(g(nullptr)), void*>::value, ""); +} |