Review feedback: Check for no-prototype. Simplify test.

Author: Doug Wyatt

clang/lib/Sema/SemaFunctionEffects.cpp

@@ -996,10 +996,10 @@ class Analyzer {
         // will be traversed as part of the function -- unless we capture it
         // here and have TraverseStmt skip it.
         if (TypeSourceInfo *TSI = FD->getTypeSourceInfo()) {
-          FunctionProtoTypeLoc TL =
-              TSI->getTypeLoc().getAs<FunctionProtoTypeLoc>();
-          if (const FunctionProtoType *FPT = TL.getTypePtr())
-            NoexceptExpr = FPT->getNoexceptExpr();
+          if (FunctionProtoTypeLoc TL =
+                  TSI->getTypeLoc().getAs<FunctionProtoTypeLoc>())
+            if (const FunctionProtoType *FPT = TL.getTypePtr())
+              NoexceptExpr = FPT->getNoexceptExpr();
         }
       }
 

clang/test/Sema/attr-nonblocking-constraints.cpp

@@ -422,7 +422,6 @@ class expected {
 
   // This is a deliberate corruption of the real implementation for simplicity.
   constexpr expected(const expected&)
-    noexcept(is_copy_constructible_v<_Tp> && is_copy_constructible_v<_Err>)
     requires(is_copy_constructible_v<_Tp> && is_copy_constructible_v<_Err>)
   = default;
 };
@@ -435,9 +434,12 @@ void test() [[clang::nonblocking]]
 
 } // namespace ExpectedTest
 
-// Make sure that simple type traits don't cause violations.
+// Make sure a function call in a noexcept() clause is ignored.
+constexpr bool foo() [[clang::nonblocking(false)]] { return true; }
+void nb27() noexcept(foo()) [[clang::nonblocking]] {}
 
-void nb27() [[clang::nonblocking]] {
+// Make sure that simple type traits don't cause violations.
+void nb28() [[clang::nonblocking]] {
 	bool x = __is_constructible(int, const int&);
 }