Skip to content

gh-146475: Block Apple LLVM 21 from passing JIT tool version check #146478

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

Open
ashutoshk314 wants to merge 2 commits into
base: main
Choose a base branch
from
+3 −1
Open

gh-146475: Block Apple LLVM 21 from passing JIT tool version check #146478

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f29015e
gh-146475: Block Apple LLVM 21 from passing JIT tool version check
ashutosh314 Mar 26, 2026
ac68191
gh-146475: Add NEWS entry
ashutosh314 Mar 26, 2026
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
Next Next commit
gh-146475: Block Apple LLVM 21 from passing JIT tool version check
  • Loading branch information
@ashutosh314
ashutosh314 committed Mar 26, 2026
commit f29015ef58468113da03affe8a5c1f6f8bfedf1d
2 changes: 1 addition & 1 deletion Tools/jit/_llvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ async def _check_tool_version(
name: str, llvm_version: str, *, echo: bool = False
) -> bool:
output = await _run(name, ["--version"], echo=echo)
_llvm_version_pattern = re.compile(rf"version\s+{llvm_version}\.\d+\.\d+\S*\s+")
_llvm_version_pattern = re.compile(rf"(?<!Apple )LLVM version\s+{llvm_version}\.\d+\.\d+\S*\s+")
Comment thread
savannahostrowski marked this conversation as resolved.
Copy link
Copy Markdown
Contributor

@diegorusso diegorusso Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On my mac I had to add LLVM and clang to match the string. Can you please check?

Suggested change
_llvm_version_pattern = re.compile(rf"(?<!Apple )LLVM version\s+{llvm_version}\.\d+\.\d+\S*\s+")
_llvm_version_pattern = re.compile(rf"(?<!Apple )(LLVM|clang) version\s+{llvm_version}\.\d+\.\d+\S*\s+")

Copy link
Copy Markdown
Contributor

@diegorusso diegorusso Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

$ /Library/Developer/CommandLineTools/usr/bin/llvm-objdump --version
Apple LLVM version 21.0.0
  Optimized build.
...

$ /Library/Developer/CommandLineTools/usr/bin/clang --version
Apple clang version 21.0.0 (clang-2100.0.123.102)
Target: arm64-apple-darwin25.4.0
...

Copy link
Copy Markdown
Member

@savannahostrowski savannahostrowski Apr 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I'm on MacOS as well and checked that we do need clang in the regex.

return bool(output and _llvm_version_pattern.search(output))


Expand Down
Loading