[lldb] Change directory creation logic in framework-header-fix #158355
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's possible for this logic to fail if the build system runs this script in parallel. One instance could create the directory in between another instance's checking of its existence and attempt at creation. Instead, always try to create it and ignore any FileExistsErrors. rdar://160120161
|
@llvm/pr-subscribers-lldb Author: Alex Langford (bulbazord) ChangesIt's possible for this logic to fail if the build system runs this script in parallel. One instance could create the directory in between another instance's checking of its existence and attempt at creation. Instead, always try to create it and ignore any FileExistsErrors. rdar://160120161 Full diff: https://github.com/llvm/llvm-project/pull/158355.diff 1 Files Affected:
diff --git a/lldb/scripts/framework-header-fix.py b/lldb/scripts/framework-header-fix.py
index 36c5c67c59d36..3447dfc29a761 100755
--- a/lldb/scripts/framework-header-fix.py
+++ b/lldb/scripts/framework-header-fix.py
@@ -115,8 +115,10 @@ def main():
unifdef_guards = ["-U" + guard for guard in args.unifdef_guards]
# Create the framework's header dir if it doesn't already exist
- if not os.path.exists(os.path.dirname(output_file_path)):
+ try:
os.makedirs(os.path.dirname(output_file_path))
+ except FileExistsError:
+ pass
if framework_version == "lldb_main":
modify_main_includes(input_file_path, output_file_path)
|
adrian-prantl
approved these changes
Sep 12, 2025
|
Test failures look unrelated. |
|
Why don't we ensure the build system creates the directory instead? |
kastiglione
pushed a commit
to swiftlang/llvm-project
that referenced
this pull request
Sep 17, 2025
…158355) It's possible for this logic to fail if the build system runs this script in parallel. One instance could create the directory in between another instance's checking of its existence and attempt at creation. Instead, always try to create it and ignore any FileExistsErrors. rdar://160120161 (cherry picked from commit 120d747)
kastiglione
pushed a commit
to swiftlang/llvm-project
that referenced
this pull request
Sep 17, 2025
…158355) It's possible for this logic to fail if the build system runs this script in parallel. One instance could create the directory in between another instance's checking of its existence and attempt at creation. Instead, always try to create it and ignore any FileExistsErrors. rdar://160120161 (cherry picked from commit 120d747)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It's possible for this logic to fail if the build system runs this script in parallel. One instance could create the directory in between another instance's checking of its existence and attempt at creation.
Instead, always try to create it and ignore any FileExistsErrors.
rdar://160120161