Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #125592

Closed
wants to merge 17 commits into from
Closed

Rollup of 8 pull requests #125592

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
62a104d
Update Tests
veera-sivarajan Apr 16, 2024
f005b45
Support C23's Variadics Without a Named Parameter
veera-sivarajan Apr 16, 2024
531dae1
Only allow immutable statics with #[linkage]
bjorn3 May 12, 2024
c58b7c9
Don't skip inner const when looking for body for suggestion
compiler-errors May 23, 2024
2782123
cleanup dependence of `ExtCtxt` in transcribe when macro expansion
SparrowLii May 25, 2024
ce67768
crashes: increment the number of tracked ones
matthiaskrgr May 25, 2024
bebcb4e
Also mention my-self for check-cfg docs changes
Urgau May 25, 2024
91b3ef5
Notify T-rustdoc for beta-accepted and stable-accepted too
camelid May 26, 2024
d37f456
Avoid a `FieldIdx::from_usize` in InstSimplify
scottmcm May 26, 2024
ec0d36b
Rollup merge of #124048 - veera-sivarajan:bugfix-123773-c23-variadics…
jhpratt May 26, 2024
0996b74
Rollup merge of #125046 - bjorn3:no_mutable_static_linkage, r=cjgillot
jhpratt May 26, 2024
5c24222
Rollup merge of #125469 - compiler-errors:dont-skip-inner-const-body,…
jhpratt May 26, 2024
8bcf07e
Rollup merge of #125530 - SparrowLii:expand2, r=petrochenkov
jhpratt May 26, 2024
a57926a
Rollup merge of #125539 - matthiaskrgr:cräsh, r=jieyouxu
jhpratt May 26, 2024
8ba8b65
Rollup merge of #125544 - Urgau:check-cfg-mention-cargo-specific, r=j…
jhpratt May 26, 2024
94583a4
Rollup merge of #125566 - camelid:notify-accepted, r=GuillaumeGomez
jhpratt May 26, 2024
75b0523
Rollup merge of #125582 - scottmcm:less-from-usize, r=jieyouxu
jhpratt May 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Avoid a FieldIdx::from_usize in InstSimplify
  • Loading branch information
@scottmcm
scottmcm committed May 26, 2024
commit d37f456b2a6e58e2ff8f33abd7bf8404ebd46559
4 changes: 2 additions & 2 deletions compiler/rustc_mir_transform/src/dataflow_const_prop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ impl<'tcx> ValueAnalysis<'tcx> for ConstAnalysis<'_, 'tcx> {
_ => return,
};
if let Some(variant_target_idx) = variant_target {
for (field_index, operand) in operands.iter().enumerate() {
for (field_index, operand) in operands.iter_enumerated() {
if let Some(field) = self.map().apply(
variant_target_idx,
TrackElem::Field(FieldIdx::from_usize(field_index)),
TrackElem::Field(field_index),
) {
self.assign_operand(state, field, operand);
}
Expand Down
5 changes: 2 additions & 3 deletions compiler/rustc_mir_transform/src/instsimplify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use rustc_middle::ty::layout::ValidityRequirement;
use rustc_middle::ty::{self, GenericArgsRef, ParamEnv, Ty, TyCtxt};
use rustc_span::sym;
use rustc_span::symbol::Symbol;
use rustc_target::abi::FieldIdx;
use rustc_target::spec::abi::Abi;

pub struct InstSimplify;
Expand Down Expand Up @@ -217,11 +216,11 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> {
&& let Some(place) = operand.place()
{
let variant = adt_def.non_enum_variant();
for (i, field) in variant.fields.iter().enumerate() {
for (i, field) in variant.fields.iter_enumerated() {
let field_ty = field.ty(self.tcx, args);
if field_ty == *cast_ty {
let place = place.project_deeper(
&[ProjectionElem::Field(FieldIdx::from_usize(i), *cast_ty)],
&[ProjectionElem::Field(i, *cast_ty)],
self.tcx,
);
let operand = if operand.is_move() {
Expand Down
Loading