[llvm-branch-commits] [cfe-branch] r156701 - in /cfe/branches/release_31: ./ test/CXX/class/class.mem/p2.cpp test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Sat May 12 01:53:18 2012
New Revision: 156701

URL: http://llvm.org/viewvc/llvm-project?rev=156701&view=rev
Log:
Merging r155426:
------------------------------------------------------------------------
r155426 | rsmith | 2012-04-23 22:48:42 -0700 (Mon, 23 Apr 2012) | 3 lines

Don't try to delay parsing the exception specification for a data member of a
class; we would never actually parse it and attach it to the type.

------------------------------------------------------------------------

Modified:
    cfe/branches/release_31/   (props changed)
    cfe/branches/release_31/test/CXX/class/class.mem/p2.cpp
    cfe/branches/release_31/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 12 01:53:18 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:155076,155218,155278-155279,155289,155293,155342,155356,155424,155534-155535,155576,155608,155670,155728,155788,155803,155823,155860,155910,155975,156031,156047,156322
+/cfe/trunk:155076,155218,155278-155279,155289,155293,155342,155356,155424,155426,155534-155535,155576,155608,155670,155728,155788,155803,155823,155860,155910,155975,156031,156047,156322
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_31/test/CXX/class/class.mem/p2.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_31/test/CXX/class/class.mem/p2.cpp?rev=156701&r1=156700&r2=156701&view=diff
==============================================================================
--- cfe/branches/release_31/test/CXX/class/class.mem/p2.cpp (original)
+++ cfe/branches/release_31/test/CXX/class/class.mem/p2.cpp Sat May 12 01:53:18 2012
@@ -60,8 +60,16 @@
 namespace PR12629 {
   struct S {
     static int (f)() throw();
-    static int ((((((g))))() throw(int)));
+    static int ((((((g))))() throw(U)));
+    int (*h)() noexcept(false);
+    static int (&i)() noexcept(true);
+    static int (*j)() throw(U); // expected-error {{type name}} \
+    // expected-error {{expected ')'}} expected-note {{to match}}
+
+    struct U {};
   };
   static_assert(noexcept(S::f()), "");
   static_assert(!noexcept(S::g()), "");
+  static_assert(!noexcept(S().h()), "");
+  static_assert(noexcept(S::i()), "");
 }

Propchange: cfe/branches/release_31/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 12 01:53:18 2012
@@ -1,2 +1,2 @@
 /cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,155076,155218,155278-155279,155289,155293,155342,155356,155424,155534-155535,155576,155608,155670,155728,155788,155803,155823,155860,155910,155975,156031,156047
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,155076,155218,155278-155279,155289,155293,155342,155356,155424,155426,155534-155535,155576,155608,155670,155728,155788,155803,155823,155860,155910,155975,156031,156047