Repository navigation
Conversation
LLVM's RISC-V backend expects a `cf-branch-label-scheme` module flag whenever `cf-protection-branch` is set, and crashes without one. Emit it with `unlabeled`, which is the only scheme LLVM implements. The Zicfiss shadow stack is enabled per function through the `hw-shadow-stack` attribute rather than by the module flag, so add that for `-Zcf-protection=return` and `full`. Both match what Clang does for `-fcf-protection` on RISC-V.
Collaborator
Collaborator
|
Thanks for the pull request, and welcome! The Rust Project has assigned @JonathanBrouwer (or someone else) to review your changes, you should hear from them (or someone else) within the next two weeks. Please see the contribution instructions and our LLM policy for more information. Why was this reviewer chosen?The reviewer was selected based on:
|
This branch has not been deployed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
-Zcf-protection=branch(orfull) currently crashes rustc when targeting RISC-V:LLVM's RISC-V backend expects a
cf-branch-label-schememodule flag whenevercf-protection-branchis set, and segfaults inRISCVAsmPrinter::emitNoteGnuPropertywithout it. Clang always emits the two together.-Zcf-protection=returndoesn't crash, but it also doesn't do anything: the Zicfiss shadow stack is enabled per function through thehw-shadow-stackattribute, and thecf-protection-returnmodule flag only sets the bit in.note.gnu.property.This PR emits the label scheme flag on RISC-V and adds
hw-shadow-stackforreturn/full, matching what Clang does for-fcf-protection. Other targets are unaffected.The label scheme is always
unlabeled. An earlier version of this had a-Zcf-branch-label-scheme=unlabeled|func-sigoption to mirror Clang's-mcf-branch-label-scheme, but I dropped it sincefunc-sigisn't implemented in LLVM yet (the backend errors out with "the complete func-sig label scheme feature is not implemented yet", see llvm/llvm-project#111661), so the only non-default value couldn't compile anything. Clang recently madeunlabeledits default as well (llvm/llvm-project#223297). The option can be added later if LLVM grows support.With LLVM 22 the new module flag is just ignored, so there's no version check.
Dynamically linked code also needs a landing-pad-aware PLT from lld (llvm/llvm-project#145461). That's not in LLVM 23 and will be a separate backport.
This also fixes a sentence in the sanitizer docs that said ShadowCallStack uses the Zicfiss
sspregister when available. It always usesgp; the hardware shadow stack only comes fromhw-shadow-stack.Tracking issue: #93754