diff options
author | robot-contrib <robot-contrib@yandex-team.com> | 2025-03-01 14:20:24 +0300 |
---|---|---|
committer | robot-contrib <robot-contrib@yandex-team.com> | 2025-03-01 14:37:19 +0300 |
commit | 8b739d2ab4331d499f54de87def577f77db0680a (patch) | |
tree | 480b39a70e79e04489b7b1443ca4ca853c2700ee | |
parent | b6f28af0f0ec544d7907d58182c786caa126794b (diff) | |
download | ydb-8b739d2ab4331d499f54de87def577f77db0680a.tar.gz |
Update contrib/libs/cxxsupp/libcxxrt to 2024-10-30
commit_hash:d8e11401f68bd6640a08eadd50fbd49e0042050f
-rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/.yandex_meta/override.nix | 6 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/exception.cc | 26 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/ya.make | 4 |
3 files changed, 21 insertions, 15 deletions
diff --git a/contrib/libs/cxxsupp/libcxxrt/.yandex_meta/override.nix b/contrib/libs/cxxsupp/libcxxrt/.yandex_meta/override.nix index c7e6589089..3f5adb26a2 100644 --- a/contrib/libs/cxxsupp/libcxxrt/.yandex_meta/override.nix +++ b/contrib/libs/cxxsupp/libcxxrt/.yandex_meta/override.nix @@ -1,12 +1,12 @@ pkgs: attrs: with pkgs; rec { - version = "2024-10-22"; - revision = "5bf955548df364bc6efe4add80947b8689c74e2a"; + version = "2024-10-30"; + revision = "6f2fdfebcd6291d763de8b17740d636f01761890"; src = fetchFromGitHub { owner = "libcxxrt"; repo = "libcxxrt"; rev = "${revision}"; - hash = "sha256-YxMYouW/swdDP/YtNGFlFpBFIc5Pl08mCIl07V3OsCE="; + hash = "sha256-iUuIhwFg1Ys9DDoyDFTjEIlCVDdA1TACwtYXSRr5+2g="; }; nativeBuildInputs = [ cmake ]; diff --git a/contrib/libs/cxxsupp/libcxxrt/exception.cc b/contrib/libs/cxxsupp/libcxxrt/exception.cc index 93aafd1168..49dbeff5d8 100644 --- a/contrib/libs/cxxsupp/libcxxrt/exception.cc +++ b/contrib/libs/cxxsupp/libcxxrt/exception.cc @@ -215,7 +215,7 @@ static_assert(offsetof(__cxa_dependent_exception, unwindHeader) == namespace std { - void unexpected(); + [[noreturn]] void unexpected(); class exception { public: @@ -1615,28 +1615,34 @@ namespace std if (0 != info && 0 != info->terminateHandler) { info->terminateHandler(); - // Should not be reached - a terminate handler is not expected to - // return. - abort(); } - terminateHandler.load()(); + else + { + terminateHandler.load()(); + } + // Should not be reached - a terminate handler is not expected + // to return. + abort(); } /** * Called when an unexpected exception is encountered (i.e. an exception * violates an exception specification). This calls abort() unless a * custom handler has been set.. */ - void unexpected() + [[noreturn]] void unexpected() { static __cxa_thread_info *info = thread_info(); if (0 != info && 0 != info->unexpectedHandler) { info->unexpectedHandler(); - // Should not be reached - a terminate handler is not expected to - // return. - abort(); } - unexpectedHandler.load()(); + else + { + unexpectedHandler.load()(); + } + // Should not be reached - a unexpected handler is not expected + // to return. + abort(); } /** * Returns whether there are any exceptions currently being thrown that diff --git a/contrib/libs/cxxsupp/libcxxrt/ya.make b/contrib/libs/cxxsupp/libcxxrt/ya.make index 0c0299ba8b..91cf9c40d6 100644 --- a/contrib/libs/cxxsupp/libcxxrt/ya.make +++ b/contrib/libs/cxxsupp/libcxxrt/ya.make @@ -11,9 +11,9 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(2024-10-22) +VERSION(2024-10-30) -ORIGINAL_SOURCE(https://github.com/libcxxrt/libcxxrt/archive/5bf955548df364bc6efe4add80947b8689c74e2a.tar.gz) +ORIGINAL_SOURCE(https://github.com/libcxxrt/libcxxrt/archive/6f2fdfebcd6291d763de8b17740d636f01761890.tar.gz) PEERDIR( contrib/libs/libunwind |