Skip to content

GH-146475: Strip CFI directives from JIT stencils to allow using Apple LLVM 21 #148364

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

Closed
savannahostrowski wants to merge 10 commits into from
+9 −1
Closed

GH-146475: Strip CFI directives from JIT stencils to allow using Apple LLVM 21 #148364

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6480297
Strip CFI directives in JIT stencils
savannahostrowski Apr 10, 2026
244480a
Clean up comment
savannahostrowski Apr 10, 2026
d84337a
Clean up comment
savannahostrowski Apr 10, 2026
e29673e
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 10, 2026
2a3ff7f
Merge branch 'main' into fix-apple-llvm
savannahostrowski Apr 10, 2026
00dfe93
Blurb
savannahostrowski Apr 10, 2026
55069d8
oooo there is a flag
savannahostrowski Apr 10, 2026
3e7cf60
Make comment more concise
savannahostrowski Apr 10, 2026
f110a95
Appease linter
savannahostrowski Apr 10, 2026
4e2a5d3
Just kidding, the flag breaks x86 linux
savannahostrowski Apr 10, 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
Strip CFI directives in JIT stencils
  • Loading branch information
@savannahostrowski
savannahostrowski committed Apr 10, 2026
commit 6480297f86369fcfd811af1f4b6ae6f4a74b24cf
10 changes: 9 additions & 1 deletion Tools/jit/_optimizers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,15 @@ def _preprocess(self, text: str) -> str:
# references to a local _JIT_CONTINUE label (which we will add later):
continue_symbol = rf"\b{re.escape(self.symbol_prefix)}_JIT_CONTINUE\b"
continue_label = f"{self.label_prefix}_JIT_CONTINUE"
return re.sub(continue_symbol, continue_label, text)
text = re.sub(continue_symbol, continue_label, text)
# Strip CFI directives. JIT stencils are compiled with
# -fno-asynchronous-unwind-tables and don't use DWARF CFI unwind
# tables (.eh_frame).
# The optimizer's dead code elimination can remove blocks containing
# .cfi_endproc while keeping the corresponding .cfi_startproc,
# producing unbalanced CFI frames that some assemblers reject:
text = re.sub(r"^\s*\.cfi_\w+[^\n]*$", "", text, flags=re.MULTILINE)
return text

def _parse_instruction(self, line: str) -> Instruction:
target = None
Expand Down