diff options
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 11 | ||||
| -rw-r--r-- | test/SemaObjCXX/overload.mm | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index 7244582829..8f653d1df0 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -200,9 +200,6 @@ bool StandardConversionSequence::isPointerConversionToBool() const { /// conversion is a conversion of a pointer to a void pointer. This is /// used as part of the ranking of standard conversion sequences (C++ /// 13.3.3.2p4). -/// -/// Note that we treat conversions of Objective-C pointers to -/// unqualified 'id' as having this same rank. bool StandardConversionSequence:: isPointerConversionToVoidPointer(ASTContext& Context) const { @@ -215,15 +212,9 @@ isPointerConversionToVoidPointer(ASTContext& Context) const { if (First == ICK_Array_To_Pointer) FromType = Context.getArrayDecayedType(FromType); - if (Second == ICK_Pointer_Conversion && FromType->isPointerType()) { + if (Second == ICK_Pointer_Conversion && FromType->isPointerType()) if (const PointerType* ToPtrType = ToType->getAs<PointerType>()) return ToPtrType->getPointeeType()->isVoidType(); - } else if (Second == ICK_Pointer_Conversion && - FromType->isObjCObjectPointerType()) { - if (const ObjCObjectPointerType *ToPtrType = - ToType->getAs<ObjCObjectPointerType>()) - return ToPtrType->isObjCIdType(); - } return false; } diff --git a/test/SemaObjCXX/overload.mm b/test/SemaObjCXX/overload.mm index f8c917cf2a..b824fa64b7 100644 --- a/test/SemaObjCXX/overload.mm +++ b/test/SemaObjCXX/overload.mm @@ -120,6 +120,6 @@ namespace test6 { void foo(A*) __attribute__((unavailable)); // expected-note {{explicitly made unavailable}} void test(B *b) { - foo(b); // expected-error {{call to unavailable function}} + foo(b); // expected-error {{call to 'foo' is ambiguous}} } } |