Skip to content

Commit 2a27162

Browse files
robot-pigletblinkov
authored andcommitted
Update contrib/libs/cxxsupp/libcxxrt to 2024-10-30
commit_hash:d8e11401f68bd6640a08eadd50fbd49e0042050f
1 parent 1cf3fd3 commit 2a27162

File tree

3 files changed

+21
-15
lines changed

3 files changed

+21
-15
lines changed

contrib/libs/cxxsupp/libcxxrt/.yandex_meta/override.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
pkgs: attrs: with pkgs; rec {
2-
version = "2024-10-22";
3-
revision = "5bf955548df364bc6efe4add80947b8689c74e2a";
2+
version = "2024-10-30";
3+
revision = "6f2fdfebcd6291d763de8b17740d636f01761890";
44

55
src = fetchFromGitHub {
66
owner = "libcxxrt";
77
repo = "libcxxrt";
88
rev = "${revision}";
9-
hash = "sha256-YxMYouW/swdDP/YtNGFlFpBFIc5Pl08mCIl07V3OsCE=";
9+
hash = "sha256-iUuIhwFg1Ys9DDoyDFTjEIlCVDdA1TACwtYXSRr5+2g=";
1010
};
1111

1212
nativeBuildInputs = [ cmake ];

contrib/libs/cxxsupp/libcxxrt/exception.cc

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ static_assert(offsetof(__cxa_dependent_exception, unwindHeader) ==
215215

216216
namespace std
217217
{
218-
void unexpected();
218+
[[noreturn]] void unexpected();
219219
class exception
220220
{
221221
public:
@@ -1615,28 +1615,34 @@ namespace std
16151615
if (0 != info && 0 != info->terminateHandler)
16161616
{
16171617
info->terminateHandler();
1618-
// Should not be reached - a terminate handler is not expected to
1619-
// return.
1620-
abort();
16211618
}
1622-
terminateHandler.load()();
1619+
else
1620+
{
1621+
terminateHandler.load()();
1622+
}
1623+
// Should not be reached - a terminate handler is not expected
1624+
// to return.
1625+
abort();
16231626
}
16241627
/**
16251628
* Called when an unexpected exception is encountered (i.e. an exception
16261629
* violates an exception specification). This calls abort() unless a
16271630
* custom handler has been set..
16281631
*/
1629-
void unexpected()
1632+
[[noreturn]] void unexpected()
16301633
{
16311634
static __cxa_thread_info *info = thread_info();
16321635
if (0 != info && 0 != info->unexpectedHandler)
16331636
{
16341637
info->unexpectedHandler();
1635-
// Should not be reached - a terminate handler is not expected to
1636-
// return.
1637-
abort();
16381638
}
1639-
unexpectedHandler.load()();
1639+
else
1640+
{
1641+
unexpectedHandler.load()();
1642+
}
1643+
// Should not be reached - a unexpected handler is not expected
1644+
// to return.
1645+
abort();
16401646
}
16411647
/**
16421648
* Returns whether there are any exceptions currently being thrown that

contrib/libs/cxxsupp/libcxxrt/ya.make

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ LICENSE(
1111

1212
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
1313

14-
VERSION(2024-10-22)
14+
VERSION(2024-10-30)
1515

16-
ORIGINAL_SOURCE(https://github.com/libcxxrt/libcxxrt/archive/5bf955548df364bc6efe4add80947b8689c74e2a.tar.gz)
16+
ORIGINAL_SOURCE(https://github.com/libcxxrt/libcxxrt/archive/6f2fdfebcd6291d763de8b17740d636f01761890.tar.gz)
1717

1818
PEERDIR(
1919
contrib/libs/libunwind

0 commit comments

Comments
 (0)