Fixed #654: noexcept expression in primary template.

InsightsHelpers.cpp

@@ -1495,28 +1495,39 @@ std::string GetName(const VarDecl& VD)
 }
 //-----------------------------------------------------------------------------
 
-static bool EvaluateAsBoolenCondition(const Expr& expr, const Decl& decl)
+static std::optional<bool> EvaluateAsBoolenCondition(const Expr& expr, const Decl& decl)
 {
     bool r{false};
 
-    const bool res = expr.EvaluateAsBooleanCondition(r, decl.getASTContext());
-    assert(res);
+    if(expr.EvaluateAsBooleanCondition(r, decl.getASTContext())) {
+        return {r};
+    }
 
-    return r;
+    return std::nullopt;
 }
 //-----------------------------------------------------------------------------
 
 const std::string GetNoExcept(const FunctionDecl& decl)
 {
     const auto* func = decl.getType()->castAs<FunctionProtoType>();
 
-    if(func and func->hasNoexceptExceptionSpec()) {
+    if(func and func->hasNoexceptExceptionSpec() and not isUnresolvedExceptionSpec(func->getExceptionSpecType())) {
         std::string ret{kwSpaceNoexcept};
 
         if(const auto* expr = func->getNoexceptExpr()) {
-            const auto value = EvaluateAsBoolenCondition(*expr, decl);
+            ret += "("sv;
+
+            if(const auto value = EvaluateAsBoolenCondition(*expr, decl); value) {
+                ret += details::ConvertToBoolString(*value);
+            } else {
+                OutputFormatHelper ofm{};
+                CodeGenerator      cg{ofm};
+                cg.InsertArg(expr);
+
+                ret += ofm.GetString();
+            }
 
-            ret += StrCat("("sv, details::ConvertToBoolString(value), ")"sv);
+            ret += ")"sv;
         }
 
         return ret;

tests/Issue654.cpp

@@ -0,0 +1,4 @@
+template<bool B>
+void f() noexcept(B)
+{
+}

tests/Issue654.expect

@@ -0,0 +1,4 @@
+template<bool B>
+void f() noexcept(B)
+{
+}