Skip to content

Commit 11853ec

Browse files
committedApr 5, 2024
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
·
1.88.01.79.0
2 parents 9d79cd5 + a074d27 commit 11853ec

File tree

110 files changed

+741
-370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+741
-370
lines changed
 

‎compiler/rustc_codegen_llvm/src/back/write.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,7 @@ fn target_is_apple(cgcx: &CodegenContext<LlvmCodegenBackend>) -> bool {
912912
|| cgcx.opts.target_triple.triple().contains("-darwin")
913913
|| cgcx.opts.target_triple.triple().contains("-tvos")
914914
|| cgcx.opts.target_triple.triple().contains("-watchos")
915+
|| cgcx.opts.target_triple.triple().contains("-visionos")
915916
}
916917

917918
fn target_is_aix(cgcx: &CodegenContext<LlvmCodegenBackend>) -> bool {

‎compiler/rustc_codegen_llvm/src/declare.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> {
147147
for options in [
148148
TypeIdOptions::GENERALIZE_POINTERS,
149149
TypeIdOptions::NORMALIZE_INTEGERS,
150-
TypeIdOptions::ERASE_SELF_TYPE,
150+
TypeIdOptions::USE_CONCRETE_SELF,
151151
]
152152
.into_iter()
153153
.powerset()
@@ -173,9 +173,7 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> {
173173

174174
if self.tcx.sess.is_sanitizer_kcfi_enabled() {
175175
// LLVM KCFI does not support multiple !kcfi_type attachments
176-
// Default to erasing the self type. If we need the concrete type, there will be a
177-
// hint in the instance.
178-
let mut options = TypeIdOptions::ERASE_SELF_TYPE;
176+
let mut options = TypeIdOptions::empty();
179177
if self.tcx.sess.is_sanitizer_cfi_generalize_pointers_enabled() {
180178
options.insert(TypeIdOptions::GENERALIZE_POINTERS);
181179
}

0 commit comments

Comments
 (0)
Please sign in to comment.