Merge commit '8d9ddd4f509c' from llvm.org/main into next

Author: git apple-llvm automerger

clang/lib/CodeGen/CGDebugInfo.cpp

@@ -4888,7 +4888,7 @@ struct ReconstitutableType : public RecursiveASTVisitor<ReconstitutableType> {
   bool VisitFunctionProtoType(FunctionProtoType *FT) {
     // noexcept is not encoded in DWARF, so the reversi
     Reconstitutable &= !isNoexceptExceptionSpec(FT->getExceptionSpecType());
-    return !Reconstitutable;
+    return Reconstitutable;
   }
   bool TraverseRecordType(RecordType *RT) {
     // Unnamed classes/lambdas can't be reconstituted due to a lack of column

clang/test/CodeGenCXX/debug-info-simple-template-names.cpp

@@ -55,6 +55,8 @@ void f() {
   } unnamed_struct;
   f1<decltype(unnamed_struct)>();
   // CHECK: !DISubprogram(name: "f1<(unnamed struct at {{.*}}debug-info-simple-template-names.cpp:[[# @LINE - 3]]:3)>",
+  f1<void (decltype(unnamed_struct))>();
+  // CHECK: !DISubprogram(name: "f1<void ((unnamed struct at {{.*}}CodeGenCXX/debug-info-simple-template-names.cpp:[[# @LINE - 5]]:3))>",
   enum {} unnamed_enum;
   f1<decltype(unnamed_enum)>();
   // CHECK: !DISubprogram(name: "f1<(unnamed enum at {{.*}}debug-info-simple-template-names.cpp:[[# @LINE - 2]]:3)>",