From: Anders Carlsson Date: Fri, 5 Nov 2010 00:12:09 +0000 (+0000) Subject: Implement [over.ics.rank]p4: A conversion that does not convert an std::nullptr_t... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8df0b634ee5ca8573852fdc96252b8bba5a10db;p=clang Implement [over.ics.rank]p4: A conversion that does not convert an std::nullptr_t to bool is better than one than does. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@118269 91177308-0d34-0410-b5e6-96231b3b80d8 --- 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 -// Don't have decltype yet. -typedef __typeof__(nullptr) nullptr_t; +typedef decltype(nullptr) nullptr_t; struct A {}; @@ -69,3 +68,19 @@ template struct T {}; typedef T NT; + +namespace test1 { +template struct is_same { + static const bool value = false; +}; + +template struct is_same { + static const bool value = true; +}; + +void *g(void*); +bool g(bool); + +// Test that we prefer g(void*) over g(bool). +static_assert(is_same::value, ""); +}