[llvm-branch-commits] [cfe-branch] r118538 - in /cfe/branches/Apple/whitney: lib/Sema/SemaTemplateDeduction.cpp test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.call/p3.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Nov  9 11:30:29 2010
New Revision: 118538

URL: http://llvm.org/viewvc/llvm-project?rev=118538&view=rev
Log:
Merge r117983:
--
Author: Douglas Gregor <dgregor at apple.com>
Date:   Tue Nov 2 00:02:34 2010 +0000

    When performing template argument deduction against a template-id,
    only keep deduction results for successful deductions, so that they
    can be compared against each other. Fixes PR8462, from Richard Smith!

Modified:
    cfe/branches/Apple/whitney/lib/Sema/SemaTemplateDeduction.cpp
    cfe/branches/Apple/whitney/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.call/p3.cpp

Modified: cfe/branches/Apple/whitney/lib/Sema/SemaTemplateDeduction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Sema/SemaTemplateDeduction.cpp?rev=118538&r1=118537&r2=118538&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Sema/SemaTemplateDeduction.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Sema/SemaTemplateDeduction.cpp Tue Nov  9 11:30:29 2010
@@ -721,6 +721,8 @@
           llvm::SmallVector<const RecordType *, 8> ToVisit;
           ToVisit.push_back(RecordT);
           bool Successful = false;
+          llvm::SmallVectorImpl<DeducedTemplateArgument> DeducedOrig(0);
+          DeducedOrig = Deduced;
           while (!ToVisit.empty()) {
             // Retrieve the next class in the inheritance hierarchy.
             const RecordType *NextT = ToVisit.back();
@@ -738,9 +740,14 @@
                                           QualType(NextT, 0), Info, Deduced);
 
               // If template argument deduction for this base was successful,
-              // note that we had some success.
-              if (BaseResult == Sema::TDK_Success)
+              // note that we had some success. Otherwise, ignore any deductions
+              // from this base class.
+              if (BaseResult == Sema::TDK_Success) {
                 Successful = true;
+                DeducedOrig = Deduced;
+              }
+              else
+                Deduced = DeducedOrig;
             }
 
             // Visit base classes

Modified: cfe/branches/Apple/whitney/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.call/p3.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.call/p3.cpp?rev=118538&r1=118537&r2=118538&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.call/p3.cpp (original)
+++ cfe/branches/Apple/whitney/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.call/p3.cpp Tue Nov  9 11:30:29 2010
@@ -101,3 +101,25 @@
   C<int, 1> *ci3c = f4c(&g);
   int       *ip1 = f4c(&f);
 }
+
+// PR8462
+namespace N {
+  struct T0;
+  struct T1;
+
+  template<typename X, typename Y> struct B {};
+
+  struct J : B<T0,T0> {};
+  struct K : B<T1,T1> {};
+
+  struct D : J, K {};
+
+  template<typename X, typename Y> void F(B<Y,X>);
+
+  void test()
+  {
+    D d; 
+    N::F<T0>(d); // Fails
+    N::F<T1>(d); // OK
+  }
+}