diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 932ffb440f..4775798d62 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -4270,6 +4270,8 @@ void Parser::ParseFunctionDeclarator(Declarator &D,
                       D.getDeclSpec().getStorageClassSpec()
                         != DeclSpec::SCS_typedef &&
                       !D.getDeclSpec().isFriendSpecified());
+      for (unsigned i = 0, e = D.getNumTypeObjects(); Delayed && i != e; ++i)
+        Delayed &= D.getTypeObject(i).Kind == DeclaratorChunk::Paren;
       ESpecType = tryParseExceptionSpecification(Delayed,
                                                  ESpecRange,
                                                  DynamicExceptions,
diff --git a/test/CXX/class/class.mem/p2.cpp b/test/CXX/class/class.mem/p2.cpp
index 3e957df69d..bf7b3d49c9 100644
--- a/test/CXX/class/class.mem/p2.cpp
+++ b/test/CXX/class/class.mem/p2.cpp
@@ -60,8 +60,16 @@ namespace test3 {
 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()), "");
 }