Merge pull request gcc-mirror#106 from NinaRanns/P3290

P3290 - no cassert bit yet

Author: villevoutilainen

gcc/cp/contracts.h

@@ -103,7 +103,9 @@ enum constract_assertion_kind {
   CAK_INVALID = 0 ,
   CAK_PRE = 1 ,
   CAK_POST = 2 ,
-  CAK_ASSERT = 3
+  CAK_ASSERT = 3,
+  CAK_MANUAL = 4,
+  CAK_CASSERT = 5,
 };
 
 /* Per P2900R11.  */
@@ -118,6 +120,7 @@ enum contract_evaluation_semantic {
 };
 
 enum constract_detection_mode {
+  CDM_UNSPECIFIED = 0,
   CDM_PREDICATE_FALSE = 1,
   CDM_EVAL_EXCEPTION = 2
 };

libstdc++-v3/include/std/contracts

@@ -42,14 +42,48 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 namespace contracts
 {
+
+// From P3290
+  struct __location_info{
+    std::source_location _M_source_location;
+    explicit __location_info(std::source_location __location)
+    : _M_source_location(__location){}
+  };
+
+  [[noreturn]] void handle_enforced_contract_violation(
+      const char*,
+      const std::source_location &__location = std::source_location::current());
+
+  [[noreturn]] void handle_enforced_contract_violation(
+      const std::nothrow_t&,
+      const char*,
+      const std::source_location &__location = std::source_location::current()) noexcept;
+
+  void handle_observed_contract_violation(
+      const char*,
+      const std::source_location &__location = std::source_location::current());
+
+  void handle_observed_contract_violation(
+      const std::nothrow_t&,
+      const char*,
+      const std::source_location &__location = std::source_location::current()) noexcept;
+
+  [[noreturn]] void handle_quick_enforced_contract_violation(
+      const char*,
+      const std::source_location &__location = std::source_location::current()) noexcept;
+
+
   // From P2900R11
   enum class assertion_kind {
     pre = 1,
     post = 2,
-    assert = 3
+    assert = 3,
+    // From P3290
+    manual = 4,
+    cassert = 5
     /* to be extended with implementation−defined values and by future extensions */
-	/* Implementation−defined values should have a minimum value of 1000. */
-  };
+    /* Implementation−defined values should have a minimum value of 1000. */
+    };
 
   enum class evaluation_semantic {
       ignore = 1,
@@ -64,6 +98,8 @@ namespace contracts
   };
 
   enum class detection_mode  {
+  // From P3290
+    unspecified = 0,
     predicate_false = 1,
     evaluation_exception = 2
     /* to be extended with implementation−defined values and by future extensions
@@ -73,23 +109,57 @@ namespace contracts
   using __vendor_ext = void;
 
   class contract_violation {
-    int version;
+    int _M_version;
     __vendor_ext* _M_ext;
     const char* _M_comment;
     detection_mode _M_detection_mode;
     assertion_kind _M_assertion_kind;
     std::source_location _M_source_location;
     evaluation_semantic _M_evaluation_semantic;
+
+    contract_violation(evaluation_semantic __semantic,
+		       const std::source_location &__location,
+		       const char* __comment):
+      _M_version(0),
+      _M_ext(nullptr),
+      _M_comment(__comment),
+      _M_detection_mode(detection_mode::unspecified),
+      _M_assertion_kind(assertion_kind::manual),
+      _M_source_location(__location),
+      _M_evaluation_semantic(__semantic)
+    {
+
+    }
+
+    friend void handle_enforced_contract_violation(
+	const char*,
+	const std::source_location &);
+
+    friend void handle_enforced_contract_violation(
+	const std::nothrow_t&,
+	const char*,
+	const std::source_location &) noexcept;
+
+    friend void handle_observed_contract_violation(
+	const char*,
+	const std::source_location &);
+
+    friend void handle_observed_contract_violation(
+	const std::nothrow_t&,
+	const char*,
+	const std::source_location &) noexcept;
+
+    friend void handle_quick_enforced_contract_violation(
+	const char*,
+	const std::source_location &) noexcept;
+
   public:
     // cannot be copied or moved
 	contract_violation(const contract_violation&) = delete;
 
 	// cannot be assigned to
 	contract_violation& operator=(const contract_violation&) = delete;
 
-	/* see below */
-	~ contract_violation();
-
 	const char* comment() const noexcept { return _M_comment; }
 	detection_mode mode() const noexcept { return _M_detection_mode; }
 	std::exception_ptr evaluation_exception () const noexcept {
@@ -104,10 +174,11 @@ namespace contracts
 	assertion_kind kind() const noexcept { return _M_assertion_kind; }
 	std::source_location location() const noexcept { return _M_source_location; }
 	evaluation_semantic semantic() const noexcept { return _M_evaluation_semantic; }
-	};
+  };
 
   void invoke_default_contract_violation_handler(const contract_violation&) noexcept;
 
+
 } // namespace contracts
 
 _GLIBCXX_END_NAMESPACE_VERSION

libstdc++-v3/src/experimental/contract26.cc

@@ -51,8 +51,14 @@ void __handle_contract_violation(const std::contracts::contract_violation &viola
      case std::contracts::assertion_kind::assert:
        std::cerr << " assert";
        break;
+     case std::contracts::assertion_kind::cassert:
+       std::cerr << " cassert";
+       break;
+     case std::contracts::assertion_kind::manual:
+       std::cerr << " manual";
+       break;
      default:
-       std::cerr << " unknown" << (int) violation.semantic();
+       std::cerr << " unknown: " << (int) violation.kind();
    }
    delimiter = ", ";
 
@@ -66,7 +72,7 @@ void __handle_contract_violation(const std::contracts::contract_violation &viola
       std::cerr << " observe";
       break;
     default:
-      std::cerr << " unknown" << (int) violation.semantic();
+      std::cerr << " unknown: " << (int) violation.semantic();
   }
   delimiter = ", ";
 
@@ -79,8 +85,11 @@ void __handle_contract_violation(const std::contracts::contract_violation &viola
     case std::contracts::detection_mode::evaluation_exception:
       std::cerr << " evaluation_exception";
       break;
+    case std::contracts::detection_mode::unspecified:
+      std::cerr << " unspecified";
+      break;
     default:
-      std::cerr << "unknown";
+      std::cerr << " unknown: " << (int) violation.mode();
   }
   delimiter = ", ";
 
@@ -111,6 +120,12 @@ void __handle_contract_violation(const std::contracts::contract_violation &viola
 #endif
 }
 
+__attribute__ ((weak)) void
+handle_contract_violation (const std::contracts::contract_violation &violation)
+{
+  return __handle_contract_violation(violation);
+}
+
 namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
@@ -120,18 +135,58 @@ namespace contracts
 
 void invoke_default_contract_violation_handler(const std::contracts::contract_violation& violation) noexcept
 {
-  return __handle_contract_violation(violation);
+  __handle_contract_violation(violation);
 }
 
+// From P3290
+[[noreturn]] void handle_enforced_contract_violation(
+      const char* __comment,
+      const std::source_location &__location)
+{
+  contract_violation __violation{evaluation_semantic::enforce, __location, __comment};
+  handle_contract_violation(__violation);
+  std::terminate();
 }
+
+[[noreturn]] void handle_enforced_contract_violation(
+    const std::nothrow_t&,
+    const char* __comment,
+    const std::source_location &__location) noexcept
+{
+  contract_violation __violation{evaluation_semantic::enforce, __location, __comment};
+  handle_contract_violation(__violation);
+  std::terminate();
 }
 
-__attribute__ ((weak)) void
-handle_contract_violation (const std::contracts::contract_violation &violation)
+
+void handle_observed_contract_violation(
+      const char* __comment,
+      const std::source_location &__location)
 {
-  return __handle_contract_violation(violation);
+  contract_violation __violation{evaluation_semantic::observe, __location, __comment};
+  handle_contract_violation(__violation);
 }
 
+void handle_observed_contract_violation(
+    const std::nothrow_t&,
+    const char* __comment,
+    const std::source_location &__location) noexcept
+{
+  contract_violation __violation{evaluation_semantic::observe, __location, __comment};
+  handle_contract_violation(__violation);
+}
+
+[[noreturn]] void handle_quick_enforced_contract_violation(
+    const char*,
+    const std::source_location &) noexcept
+{
+  std::terminate();
+}
+
+}
+}
+
+
 #if _GLIBCXX_INLINE_VERSION
 // The compiler expects the contract_violation class to be in an unversioned
 // namespace, so provide a forwarding function with the expected symbol name.

libstdc++-v3/testsuite/18_support/contracts/handle_enforced_contract_violation.cc

@@ -0,0 +1,39 @@
+// Copyright (C) 2025 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=observe" }
+// { dg-do run { target c++2a } }
+
+#include <contracts>
+#include <exception>
+#include <cstdlib>
+
+void my_term()
+{
+  std::exit(0);
+}
+
+
+int main()
+{
+  std::set_terminate (my_term);
+
+  std::contracts::handle_quick_enforced_contract_violation("test comment");
+  // We should not get here
+  return 1;
+}
+

libstdc++-v3/testsuite/18_support/contracts/handle_enforced_contract_violation2.cc

@@ -0,0 +1,47 @@
+// Copyright (C) 2025 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-g0 -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=observe" }
+// { dg-do run { target c++2a } }
+
+#include <contracts>
+#include <exception>
+#include <testsuite_hooks.h>
+
+struct MyException{};
+
+void handle_contract_violation(const std::contracts::contract_violation& v)
+{
+  invoke_default_contract_violation_handler(v);
+  throw MyException{};
+}
+
+
+int main()
+{
+  bool exception_thrown = false;
+  try {
+      std::contracts::handle_enforced_contract_violation("test comment");
+  }
+  catch(MyException)
+  {
+      exception_thrown = true;
+  }
+  VERIFY( exception_thrown == true);
+}
+// { dg-output "contract violation in function int main.* at .*:38: test comment.*" }
+// { dg-output "assertion_kind: manual, semantic: enforce, mode: unspecified, terminating: yes" }