Skip to content

Mark earlyCWD (OpenBSD-only) constinit and fix some comments/style. #1396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grynspan merged 1 commit into from
Nov 6, 2025
Merged

Mark earlyCWD (OpenBSD-only) constinit and fix some comments/style. #1396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Sources/_TestingInternals/ExecutablePath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2024 Apple Inc. and the Swift project authors
// Copyright (c) 2025 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See https://swift.org/LICENSE.txt for license information
Expand All @@ -13,7 +13,8 @@
#include <atomic>

#if defined(__OpenBSD__)
static std::atomic<const char *> earlyCWD { nullptr };
/// Storage for ``swt_getEarlyCWD()``.
static constinit std::atomic<const char *> earlyCWD { nullptr };

/// At process start (before `main()` is called), capture the current working
/// directory.
Expand All @@ -22,7 +23,7 @@ static std::atomic<const char *> earlyCWD { nullptr };
/// possible) resolve the executable path when the first argument is a relative
/// path (which can occur when manually invoking the test executable.)
__attribute__((__constructor__(101), __used__))
static void swt_captureEarlyCWD(void) {
static void captureEarlyCWD(void) {
static char buffer[PATH_MAX * 2];
if (getcwd(buffer, sizeof(buffer))) {
earlyCWD.store(buffer);
Expand Down
Loading