[llvm-branch-commits] [cfe-branch] r127606 - in /cfe/branches/release_29: ./ lib/Sema/SemaType.cpp test/SemaCXX/return.cpp test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Mon Mar 14 14:56:23 2011
New Revision: 127606

URL: http://llvm.org/viewvc/llvm-project?rev=127606&view=rev
Log:
--- Merging r127460 into '.':
U    test/SemaCXX/return.cpp
U    lib/Sema/SemaType.cpp


Modified:
    cfe/branches/release_29/   (props changed)
    cfe/branches/release_29/lib/Sema/SemaType.cpp
    cfe/branches/release_29/test/SemaCXX/return.cpp
    cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 14:56:23 2011
@@ -1 +1,2 @@
+/cfe/trunk:127460
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_29/lib/Sema/SemaType.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/Sema/SemaType.cpp?rev=127606&r1=127605&r2=127606&view=diff
==============================================================================
--- cfe/branches/release_29/lib/Sema/SemaType.cpp (original)
+++ cfe/branches/release_29/lib/Sema/SemaType.cpp Mon Mar 14 14:56:23 2011
@@ -1729,6 +1729,7 @@
       // 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);

Modified: cfe/branches/release_29/test/SemaCXX/return.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/test/SemaCXX/return.cpp?rev=127606&r1=127605&r2=127606&view=diff
==============================================================================
--- cfe/branches/release_29/test/SemaCXX/return.cpp (original)
+++ cfe/branches/release_29/test/SemaCXX/return.cpp Mon Mar 14 14:56:23 2011
@@ -49,3 +49,7 @@
     const PCHAR GetName() { return 0; } // expected-warning{{'const' type qualifier on return type has no effect}}
   };
 }
+
+class foo  {
+  operator int * const ();
+};

Propchange: cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 14:56:23 2011
@@ -1 +1 @@
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127460