Skip to content

Conversation

xdoardo
Copy link
Collaborator

@xdoardo xdoardo commented Aug 25, 2025

This is mostly a git am of this commit on top of our beta branch, with minor changes. Depends on this PR being merged first.

Note that since now (cf. 1.72) memmove and memcpy are part of the BuilderMethods trait, the PreserveCheriTags parameters have leaked into GCC as well. Curiously, Cranelift does not complain about it as there are no implementations of BuilderMethods in rustc_codegen_cranelift.

About CI

This is also a test of the CI set up in the other PR. I think it doesn't make a lot of sense to have it fail at the "check commit" step: perhaps this check could be skipped if the branch the PR comes from is not at distance >1 from the target branch?

@xdoardo xdoardo requested a review from seharris August 25, 2025 13:59
@xdoardo xdoardo changed the title Adapt Rust's LLVM wrapper to CHERIoT-Platform's LLVM. Adapt Rust's LLVM wrapper to CHERIoT-Platform's LLVM Aug 25, 2025
@xdoardo xdoardo force-pushed the llvm-preserve-cheri-tags branch 4 times, most recently from a5d370f to 4e85be5 Compare August 26, 2025 11:33
Copy link
Collaborator

@seharris seharris left a comment

Choose a reason for hiding this comment

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

Looks ok to me.

By way of a minor nitpick, there are a few files where I feel like it might be slightly tidier to import rustc_codegen_ssa::common::PreserveCheriTags, unless there's a reason not to I haven't noticed? (this wouldn't work in compiler/rustc_codegen_llvm/src/builder.rs because it would conflict with another enum)

I'm thinking of these, though the ones with (?) only use the enum once:

  • compiler/rustc_codegen_gcc/src/builder.rs
  • compiler/rustc_codegen_gcc/src/intrinsic/mod.rs (?)
  • compiler/rustc_codegen_llvm/src/va_arg.rs (?)
  • compiler/rustc_codegen_ssa/src/mir/block.rs (?)

@xdoardo xdoardo force-pushed the llvm-preserve-cheri-tags branch from 4e85be5 to 1ef0eba Compare August 26, 2025 11:54
@xdoardo
Copy link
Collaborator Author

xdoardo commented Aug 26, 2025

1ef0eba patches those files as suggested.

…d memmove

Co-authored-by: Edoardo Marangoni <ecmm@anche.no>
@xdoardo xdoardo force-pushed the llvm-preserve-cheri-tags branch from 1ef0eba to b4835c3 Compare August 26, 2025 12:09
@xdoardo xdoardo merged commit a679202 into CHERIoT-Platform:beta Aug 26, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants