diff options
| author | bors <bors@rust-lang.org> | 2022-09-06 11:16:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-06 11:16:02 +0000 |
| commit | 3c7278846102bb829c9a789e91bc43f0ed612943 (patch) | |
| tree | 24595f31587b8a0577d18980065e671dcf369f5c /compiler/rustc_codegen_llvm/src | |
| parent | a594044533b5e309eab7ac6b71f4ba8a909af653 (diff) | |
| parent | 893621166175b2fd4c4b448cba56bd58474a59a9 (diff) | |
| download | rust-3c7278846102bb829c9a789e91bc43f0ed612943.tar.gz rust-3c7278846102bb829c9a789e91bc43f0ed612943.zip | |
Auto merge of #101479 - Dylan-DPC:rollup-v8ite0y, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #100658 (TyCtxt::get_attr should check that no duplicates are allowed) - #101021 (Migrate ``rustc_middle`` diagnostic) - #101287 (Document eager evaluation of `bool::then_some` argument) - #101412 (Some more cleanup in `core`) - #101427 (Fix ICE, generalize 'move generics to trait' suggestion for >0 non-rcvr arguments) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/attributes.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/attributes.rs b/compiler/rustc_codegen_llvm/src/attributes.rs index aabbe8ac276..b38684a63e4 100644 --- a/compiler/rustc_codegen_llvm/src/attributes.rs +++ b/compiler/rustc_codegen_llvm/src/attributes.rs @@ -386,7 +386,8 @@ pub fn from_fn_attrs<'ll, 'tcx>( ) { let span = cx .tcx - .get_attr(instance.def_id(), sym::target_feature) + .get_attrs(instance.def_id(), sym::target_feature) + .next() .map_or_else(|| cx.tcx.def_span(instance.def_id()), |a| a.span); let msg = format!( "the target features {} must all be either enabled or disabled together", |