diff options
| author | bors <bors@rust-lang.org> | 2024-04-05 22:12:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-05 22:12:43 +0000 |
| commit | 11853ecd86c10dcc8b10d2bbf737fbf9bffe27bc (patch) | |
| tree | 74cbdf5b014e99d96e3f561ed1dd4374648bfb7c /compiler/rustc_codegen_llvm/src | |
| parent | 9d79cd5f79e75bd0d2083260271307ce9acd9081 (diff) | |
| parent | a074d278d30df4d4a3d6cd55117e6fdddfc9dd25 (diff) | |
| download | rust-11853ecd86c10dcc8b10d2bbf737fbf9bffe27bc.tar.gz rust-11853ecd86c10dcc8b10d2bbf737fbf9bffe27bc.zip | |
Auto merge of #123517 - GuillaumeGomez:rollup-eys3jfp, r=GuillaumeGomez
Rollup of 8 pull requests Successful merges: - #121419 (Add aarch64-apple-visionos and aarch64-apple-visionos-sim tier 3 targets) - #123159 (Fix target-cpu fpu features on Arm R/M-profile) - #123487 (CFI: Restore typeid_for_instance default behavior) - #123500 (Revert removing miri jobserver workaround) - #123505 (Revert "Use OS thread name by default") - #123509 (Add jieyouxu to compiler review rotation and as a reviewer for `tests/run-make`, `src/tools/run-make-support` and `src/tools/compiletest`) - #123514 (Fix typo in `compiler/rustc_middle/src/traits/solve/inspect.rs`) - #123515 (Use `include` command to reduce code duplication) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/write.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/declare.rs | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs index 4efea66a7f1..68ba8cbf7b7 100644 --- a/compiler/rustc_codegen_llvm/src/back/write.rs +++ b/compiler/rustc_codegen_llvm/src/back/write.rs @@ -912,6 +912,7 @@ fn target_is_apple(cgcx: &CodegenContext<LlvmCodegenBackend>) -> bool { || cgcx.opts.target_triple.triple().contains("-darwin") || cgcx.opts.target_triple.triple().contains("-tvos") || cgcx.opts.target_triple.triple().contains("-watchos") + || cgcx.opts.target_triple.triple().contains("-visionos") } fn target_is_aix(cgcx: &CodegenContext<LlvmCodegenBackend>) -> bool { diff --git a/compiler/rustc_codegen_llvm/src/declare.rs b/compiler/rustc_codegen_llvm/src/declare.rs index f58dd4066ad..f86cdcaa6f7 100644 --- a/compiler/rustc_codegen_llvm/src/declare.rs +++ b/compiler/rustc_codegen_llvm/src/declare.rs @@ -147,7 +147,7 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> { for options in [ TypeIdOptions::GENERALIZE_POINTERS, TypeIdOptions::NORMALIZE_INTEGERS, - TypeIdOptions::ERASE_SELF_TYPE, + TypeIdOptions::USE_CONCRETE_SELF, ] .into_iter() .powerset() @@ -173,9 +173,7 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> { if self.tcx.sess.is_sanitizer_kcfi_enabled() { // LLVM KCFI does not support multiple !kcfi_type attachments - // Default to erasing the self type. If we need the concrete type, there will be a - // hint in the instance. - let mut options = TypeIdOptions::ERASE_SELF_TYPE; + let mut options = TypeIdOptions::empty(); if self.tcx.sess.is_sanitizer_cfi_generalize_pointers_enabled() { options.insert(TypeIdOptions::GENERALIZE_POINTERS); } |