r191279 - Hopefully unbreak bots which are seeing an assert in this test. Temporary, real

[Richard Smith]

Author: rsmith
Date: Tue Sep 24 00:07:58 2013
New Revision: 191279

URL: http://llvm.org/viewvc/llvm-project?rev=191279&view=rev
Log:
Hopefully unbreak bots which are seeing an assert in this test. Temporary, real
fix to come once I've tracked down the problem (which is pre-existing and not
related to the change which introduced this test).

Modified:
    cfe/trunk/test/CXX/temp/temp.decls/temp.class.spec/p8-1y.cpp

Modified: cfe/trunk/test/CXX/temp/temp.decls/temp.class.spec/p8-1y.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/temp/temp.decls/temp.class.spec/p8-1y.cpp?rev=191279&r1=191278&r2=191279&view=diff
==============================================================================
--- cfe/trunk/test/CXX/temp/temp.decls/temp.class.spec/p8-1y.cpp (original)
+++ cfe/trunk/test/CXX/temp/temp.decls/temp.class.spec/p8-1y.cpp Tue Sep 24 00:07:58 2013
@@ -26,4 +26,10 @@ template<typename Outer> struct X {
 };
 template<typename Outer> template<typename Inner> int X<Outer>::y<Outer>; // expected-warning {{can not be deduced}} expected-note {{'Inner'}}
 template<typename Outer> template<typename Inner> int X<Outer>::y<Inner>; // expected-error {{does not specialize}}
-template<> template<typename Inner> int X<int>::y<Inner>; // expected-error {{does not specialize}}
+
+// FIXME: Merging this with the above class causes an assertion failure when
+// instantiating one of the bogus partial specializations.
+template<typename Outer> struct Y {
+  template<typename Inner> static int y;
+};
+template<> template<typename Inner> int Y<int>::y<Inner>; // expected-error {{does not specialize}}