--- Merging r127460 into '.':

U    test/SemaCXX/return.cpp
U    lib/Sema/SemaType.cpp

llvm-svn: 127606

Author: isanbard

clang/lib/Sema/SemaType.cpp

@@ -1729,6 +1729,7 @@ TypeSourceInfo *Sema::GetTypeForDeclarator(Declarator &D, Scope *S,
       // cv-qualifiers on return types are pointless except when the type is a
       // class type in C++.
       if (isa<PointerType>(T) && T.getLocalCVRQualifiers() &&
+          (D.getName().getKind() != UnqualifiedId::IK_ConversionFunctionId) &&
           (!getLangOptions().CPlusPlus || !T->isDependentType())) {
         assert(chunkIndex + 1 < e && "No DeclaratorChunk for the return type?");
         DeclaratorChunk ReturnTypeChunk = D.getTypeObject(chunkIndex + 1);

clang/test/SemaCXX/return.cpp

@@ -49,3 +49,7 @@ namespace PR9328 {
     const PCHAR GetName() { return 0; } // expected-warning{{'const' type qualifier on return type has no effect}}
   };
 }
+
+class foo  {
+  operator int * const ();
+};