Don't assume that all conversions to a void pointer are converting

from a PointerType. Fixes PR5756.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91253 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index e498c71b9ba71ea69b4f2b20e752f0a4c625e068..2f6300d5bcb6ff53cb995fa0617a684dccaf9e40 100644 (file)
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -1723,26 +1723,31 @@ Sema::CompareStandardConversionSequences(const StandardConversionSequence& SCS1,
     if (SCS2.First == ICK_Array_To_Pointer)
       FromType2 = Context.getArrayDecayedType(FromType2);
 
-    QualType FromPointee1
-      = FromType1->getAs<PointerType>()->getPointeeType().getUnqualifiedType();
-    QualType FromPointee2
-      = FromType2->getAs<PointerType>()->getPointeeType().getUnqualifiedType();
-
-    if (IsDerivedFrom(FromPointee2, FromPointee1))
-      return ImplicitConversionSequence::Better;
-    else if (IsDerivedFrom(FromPointee1, FromPointee2))
-      return ImplicitConversionSequence::Worse;
-
-    // Objective-C++: If one interface is more specific than the
-    // other, it is the better one.
-    const ObjCInterfaceType* FromIface1 = FromPointee1->getAs<ObjCInterfaceType>();
-    const ObjCInterfaceType* FromIface2 = FromPointee2->getAs<ObjCInterfaceType>();
-    if (FromIface1 && FromIface1) {
-      if (Context.canAssignObjCInterfaces(FromIface2, FromIface1))
-        return ImplicitConversionSequence::Better;
-      else if (Context.canAssignObjCInterfaces(FromIface1, FromIface2))
-        return ImplicitConversionSequence::Worse;
-    }
+    if (const PointerType *FromPointer1 = FromType1->getAs<PointerType>())
+      if (const PointerType *FromPointer2 = FromType2->getAs<PointerType>()) {
+        QualType FromPointee1
+          = FromPointer1->getPointeeType().getUnqualifiedType();
+        QualType FromPointee2
+          = FromPointer2->getPointeeType().getUnqualifiedType();
+
+        if (IsDerivedFrom(FromPointee2, FromPointee1))
+          return ImplicitConversionSequence::Better;
+        else if (IsDerivedFrom(FromPointee1, FromPointee2))
+          return ImplicitConversionSequence::Worse;
+        
+        // Objective-C++: If one interface is more specific than the
+        // other, it is the better one.
+        const ObjCInterfaceType* FromIface1 
+          = FromPointee1->getAs<ObjCInterfaceType>();
+        const ObjCInterfaceType* FromIface2
+          = FromPointee2->getAs<ObjCInterfaceType>();
+        if (FromIface1 && FromIface1) {
+          if (Context.canAssignObjCInterfaces(FromIface2, FromIface1))
+            return ImplicitConversionSequence::Better;
+          else if (Context.canAssignObjCInterfaces(FromIface1, FromIface2))
+            return ImplicitConversionSequence::Worse;
+        }
+      }
   }
 
   // Compare based on qualification conversions (C++ 13.3.3.2p3,

diff --git a/test/SemaCXX/overload-call.cpp b/test/SemaCXX/overload-call.cpp
index 0936b947c4cad5096d7377ed54a8b93a4fb1423d..5d2718208f2bce06f7c664d01dcb76530f12c392 100644 (file)
--- a/test/SemaCXX/overload-call.cpp
+++ b/test/SemaCXX/overload-call.cpp
@@ -291,3 +291,13 @@ void f(SR) { }
 void g(opt o) {
   f(o);
 }
+
+
+namespace PR5756 {
+  int &a(void*, int);
+  float &a(void*, float);
+  void b() { 
+    int &ir = a(0,0);
+    (void)ir;
+  }
+}