Skip to content

Commit 750a870

Browse files
borsbors
committed
Auto merge of #136017 - cuviper:beta-next, r=cuviper
[beta] backports - Always force non-trimming of path in `unreachable_patterns` lint #135310 - Add Profile Override for Non-Git Sources #135433 - resolve symlinks of LLVM tool binaries before copying them #135585 - add cache to `AmbiguityCausesVisitor` #135618 - When LLVM's location discriminator value limit is exceeded, emit locations with dummy spans instead of dropping them entirely #135643 - Temporarily bring back `Rvalue::Len` #135709 - make it possible to use ci-rustc on tarball sources #135722 - Remove test panic from File::open #135837 - Only assert the `Parser` size on specific arches #135855 r? cuviper
2 parents 4416507 + 17a1a4f commit 750a870

File tree

156 files changed

+2239
-1653
lines changed

Some content is hidden

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

156 files changed

+2239
-1653
lines changed

‎compiler/rustc_borrowck/src/lib.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,7 @@ use self::ReadOrWrite::{Activation, Read, Reservation, Write};
828828

829829
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
830830
enum ArtificialField {
831+
ArrayLength,
831832
FakeBorrow,
832833
}
833834

@@ -1345,11 +1346,16 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, '_, 'tcx> {
13451346
);
13461347
}
13471348

1348-
&Rvalue::Discriminant(place) => {
1349+
&(Rvalue::Len(place) | Rvalue::Discriminant(place)) => {
1350+
let af = match *rvalue {
1351+
Rvalue::Len(..) => Some(ArtificialField::ArrayLength),
1352+
Rvalue::Discriminant(..) => None,
1353+
_ => unreachable!(),
1354+
};
13491355
self.access_place(
13501356
location,
13511357
(place, span),
1352-
(Shallow(None), Read(ReadKind::Copy)),
1358+
(Shallow(af), Read(ReadKind::Copy)),
13531359
LocalMutationIsAllowed::No,
13541360
state,
13551361
);

‎compiler/rustc_borrowck/src/places_conflict.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ fn place_components_conflict<'tcx>(
203203
let base_ty = base.ty(body, tcx).ty;
204204

205205
match (elem, base_ty.kind(), access) {
206-
(_, _, Shallow(Some(ArtificialField::FakeBorrow))) => {
206+
(_, _, Shallow(Some(ArtificialField::ArrayLength)))
207+
| (_, _, Shallow(Some(ArtificialField::FakeBorrow))) => {
207208
// The array length is like additional fields on the
208209
// type; it does not overlap any existing data there.
209210
// Furthermore, if cannot actually be a prefix of any

‎compiler/rustc_borrowck/src/polonius/legacy/loan_invalidations.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,16 @@ impl<'a, 'tcx> LoanInvalidationsGenerator<'a, 'tcx> {
298298
self.consume_operand(location, op);
299299
}
300300

301-
&Rvalue::Discriminant(place) => {
301+
&(Rvalue::Len(place) | Rvalue::Discriminant(place)) => {
302+
let af = match rvalue {
303+
Rvalue::Len(..) => Some(ArtificialField::ArrayLength),
304+
Rvalue::Discriminant(..) => None,
305+
_ => unreachable!(),
306+
};
302307
self.access_place(
303308
location,
304309
place,
305-
(Shallow(None), Read(ReadKind::Copy)),
310+
(Shallow(af), Read(ReadKind::Copy)),
306311
LocalMutationIsAllowed::No,
307312
);
308313
}

‎compiler/rustc_borrowck/src/type_check/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -2221,6 +2221,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
22212221

22222222
Rvalue::RawPtr(..)
22232223
| Rvalue::ThreadLocalRef(..)
2224+
| Rvalue::Len(..)
22242225
| Rvalue::Discriminant(..)
22252226
| Rvalue::NullaryOp(NullOp::OffsetOf(..), _) => {}
22262227
}
@@ -2236,6 +2237,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
22362237
| Rvalue::Repeat(..)
22372238
| Rvalue::Ref(..)
22382239
| Rvalue::RawPtr(..)
2240+
| Rvalue::Len(..)
22392241
| Rvalue::Cast(..)
22402242
| Rvalue::ShallowInitBox(..)
22412243
| Rvalue::BinaryOp(..)

‎compiler/rustc_codegen_cranelift/src/base.rs

+6
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,12 @@ fn codegen_stmt<'tcx>(
828828
fx.bcx.ins().nop();
829829
}
830830
}
831+
Rvalue::Len(place) => {
832+
let place = codegen_place(fx, place);
833+
let usize_layout = fx.layout_of(fx.tcx.types.usize);
834+
let len = codegen_array_len(fx, place);
835+
lval.write_cvalue(fx, CValue::by_val(len, usize_layout));
836+
}
831837
Rvalue::ShallowInitBox(ref operand, content_ty) => {
832838
let content_ty = fx.monomorphize(content_ty);
833839
let box_layout = fx.layout_of(Ty::new_box(fx.tcx, content_ty));

‎compiler/rustc_codegen_gcc/src/debuginfo.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ fn make_mir_scope<'gcc, 'tcx>(
113113
let scope_data = &mir.source_scopes[scope];
114114
let parent_scope = if let Some(parent) = scope_data.parent_scope {
115115
make_mir_scope(cx, _instance, mir, variables, debug_context, instantiated, parent);
116-
debug_context.scopes[parent].unwrap()
116+
debug_context.scopes[parent]
117117
} else {
118118
// The root is the function itself.
119119
let file = cx.sess().source_map().lookup_source_file(mir.span.lo());
120-
debug_context.scopes[scope] = Some(DebugScope {
120+
debug_context.scopes[scope] = DebugScope {
121121
file_start_pos: file.start_pos,
122122
file_end_pos: file.end_position(),
123-
..debug_context.scopes[scope].unwrap()
124-
});
123+
..debug_context.scopes[scope]
124+
};
125125
instantiated.insert(scope);
126126
return;
127127
};
@@ -130,7 +130,7 @@ fn make_mir_scope<'gcc, 'tcx>(
130130
if !vars.contains(scope) && scope_data.inlined.is_none() {
131131
// Do not create a DIScope if there are no variables defined in this
132132
// MIR `SourceScope`, and it's not `inlined`, to avoid debuginfo bloat.
133-
debug_context.scopes[scope] = Some(parent_scope);
133+
debug_context.scopes[scope] = parent_scope;
134134
instantiated.insert(scope);
135135
return;
136136
}
@@ -157,12 +157,12 @@ fn make_mir_scope<'gcc, 'tcx>(
157157
// TODO(tempdragon): dbg_scope: Add support for scope extension here.
158158
inlined_at.or(p_inlined_at);
159159

160-
debug_context.scopes[scope] = Some(DebugScope {
160+
debug_context.scopes[scope] = DebugScope {
161161
dbg_scope,
162162
inlined_at,
163163
file_start_pos: loc.file.start_pos,
164164
file_end_pos: loc.file.end_position(),
165-
});
165+
};
166166
instantiated.insert(scope);
167167
}
168168

@@ -232,12 +232,12 @@ impl<'gcc, 'tcx> DebugInfoCodegenMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
232232
}
233233

234234
// Initialize fn debug context (including scopes).
235-
let empty_scope = Some(DebugScope {
235+
let empty_scope = DebugScope {
236236
dbg_scope: self.dbg_scope_fn(instance, fn_abi, Some(llfn)),
237237
inlined_at: None,
238238
file_start_pos: BytePos(0),
239239
file_end_pos: BytePos(0),
240-
});
240+
};
241241
let mut fn_debug_context = FunctionDebugContext {
242242
scopes: IndexVec::from_elem(empty_scope, mir.source_scopes.as_slice()),
243243
inlined_function_scopes: Default::default(),

‎compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs

+22-37
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_middle::mir::{Body, SourceScope};
99
use rustc_middle::ty::layout::{FnAbiOf, HasTypingEnv};
1010
use rustc_middle::ty::{self, Instance};
1111
use rustc_session::config::DebugInfo;
12-
use rustc_span::{BytePos, hygiene};
12+
use rustc_span::{BytePos, DUMMY_SP, hygiene};
1313

1414
use super::metadata::file_metadata;
1515
use super::utils::DIB;
@@ -85,23 +85,15 @@ fn make_mir_scope<'ll, 'tcx>(
8585
discriminators,
8686
parent,
8787
);
88-
if let Some(parent_scope) = debug_context.scopes[parent] {
89-
parent_scope
90-
} else {
91-
// If the parent scope could not be represented then no children
92-
// can be either.
93-
debug_context.scopes[scope] = None;
94-
instantiated.insert(scope);
95-
return;
96-
}
88+
debug_context.scopes[parent]
9789
} else {
9890
// The root is the function itself.
9991
let file = cx.sess().source_map().lookup_source_file(mir.span.lo());
100-
debug_context.scopes[scope] = Some(DebugScope {
92+
debug_context.scopes[scope] = DebugScope {
10193
file_start_pos: file.start_pos,
10294
file_end_pos: file.end_position(),
103-
..debug_context.scopes[scope].unwrap()
104-
});
95+
..debug_context.scopes[scope]
96+
};
10597
instantiated.insert(scope);
10698
return;
10799
};
@@ -112,7 +104,7 @@ fn make_mir_scope<'ll, 'tcx>(
112104
{
113105
// Do not create a DIScope if there are no variables defined in this
114106
// MIR `SourceScope`, and it's not `inlined`, to avoid debuginfo bloat.
115-
debug_context.scopes[scope] = Some(parent_scope);
107+
debug_context.scopes[scope] = parent_scope;
116108
instantiated.insert(scope);
117109
return;
118110
}
@@ -145,14 +137,7 @@ fn make_mir_scope<'ll, 'tcx>(
145137
},
146138
};
147139

148-
let mut debug_scope = Some(DebugScope {
149-
dbg_scope,
150-
inlined_at: parent_scope.inlined_at,
151-
file_start_pos: loc.file.start_pos,
152-
file_end_pos: loc.file.end_position(),
153-
});
154-
155-
if let Some((_, callsite_span)) = scope_data.inlined {
140+
let inlined_at = scope_data.inlined.map(|(_, callsite_span)| {
156141
let callsite_span = hygiene::walk_chain_collapsed(callsite_span, mir.span);
157142
let callsite_scope = parent_scope.adjust_dbg_scope_for_span(cx, callsite_span);
158143
let loc = cx.dbg_loc(callsite_scope, parent_scope.inlined_at, callsite_span);
@@ -175,29 +160,29 @@ fn make_mir_scope<'ll, 'tcx>(
175160
// Note further that we can't key this hashtable on the span itself,
176161
// because these spans could have distinct SyntaxContexts. We have
177162
// to key on exactly what we're giving to LLVM.
178-
let inlined_at = match discriminators.entry(callsite_span.lo()) {
163+
match discriminators.entry(callsite_span.lo()) {
179164
Entry::Occupied(mut o) => {
180165
*o.get_mut() += 1;
166+
// NB: We have to emit *something* here or we'll fail LLVM IR verification
167+
// in at least some circumstances (see issue #135322) so if the required
168+
// discriminant cannot be encoded fall back to the dummy location.
181169
unsafe { llvm::LLVMRustDILocationCloneWithBaseDiscriminator(loc, *o.get()) }
170+
.unwrap_or_else(|| {
171+
cx.dbg_loc(callsite_scope, parent_scope.inlined_at, DUMMY_SP)
172+
})
182173
}
183174
Entry::Vacant(v) => {
184175
v.insert(0);
185-
Some(loc)
186-
}
187-
};
188-
match inlined_at {
189-
Some(inlined_at) => {
190-
debug_scope.as_mut().unwrap().inlined_at = Some(inlined_at);
191-
}
192-
None => {
193-
// LLVM has a maximum discriminator that it can encode (currently
194-
// it uses 12 bits for 4096 possible values). If we exceed that
195-
// there is little we can do but drop the debug info.
196-
debug_scope = None;
176+
loc
197177
}
198178
}
199-
}
179+
});
200180

201-
debug_context.scopes[scope] = debug_scope;
181+
debug_context.scopes[scope] = DebugScope {
182+
dbg_scope,
183+
inlined_at: inlined_at.or(parent_scope.inlined_at),
184+
file_start_pos: loc.file.start_pos,
185+
file_end_pos: loc.file.end_position(),
186+
};
202187
instantiated.insert(scope);
203188
}

‎compiler/rustc_codegen_llvm/src/debuginfo/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -293,12 +293,12 @@ impl<'ll, 'tcx> DebugInfoCodegenMethods<'tcx> for CodegenCx<'ll, 'tcx> {
293293
}
294294

295295
// Initialize fn debug context (including scopes).
296-
let empty_scope = Some(DebugScope {
296+
let empty_scope = DebugScope {
297297
dbg_scope: self.dbg_scope_fn(instance, fn_abi, Some(llfn)),
298298
inlined_at: None,
299299
file_start_pos: BytePos(0),
300300
file_end_pos: BytePos(0),
301-
});
301+
};
302302
let mut fn_debug_context = FunctionDebugContext {
303303
scopes: IndexVec::from_elem(empty_scope, &mir.source_scopes),
304304
inlined_function_scopes: Default::default(),

‎compiler/rustc_codegen_ssa/src/mir/debuginfo.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ use crate::traits::*;
1919

2020
pub struct FunctionDebugContext<'tcx, S, L> {
2121
/// Maps from source code to the corresponding debug info scope.
22-
/// May be None if the backend is not capable of representing the scope for
23-
/// some reason.
24-
pub scopes: IndexVec<mir::SourceScope, Option<DebugScope<S, L>>>,
22+
pub scopes: IndexVec<mir::SourceScope, DebugScope<S, L>>,
2523

2624
/// Maps from an inlined function to its debug info declaration.
2725
pub inlined_function_scopes: FxHashMap<Instance<'tcx>, S>,
@@ -232,7 +230,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
232230
&self,
233231
source_info: mir::SourceInfo,
234232
) -> Option<(Bx::DIScope, Option<Bx::DILocation>, Span)> {
235-
let scope = &self.debug_context.as_ref()?.scopes[source_info.scope]?;
233+
let scope = &self.debug_context.as_ref()?.scopes[source_info.scope];
236234
let span = hygiene::walk_chain_collapsed(source_info.span, self.mir.span);
237235
Some((scope.adjust_dbg_scope_for_span(self.cx, span), scope.inlined_at, span))
238236
}

‎compiler/rustc_codegen_ssa/src/mir/rvalue.rs

+28-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ use rustc_session::config::OptLevel;
1010
use rustc_span::{DUMMY_SP, Span};
1111
use tracing::{debug, instrument};
1212

13-
use super::FunctionCx;
1413
use super::operand::{OperandRef, OperandValue};
1514
use super::place::PlaceRef;
15+
use super::{FunctionCx, LocalRef};
1616
use crate::common::IntPredicate;
1717
use crate::traits::*;
1818
use crate::{MemFlags, base};
@@ -593,6 +593,14 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
593593
self.codegen_place_to_pointer(bx, place, mk_ptr)
594594
}
595595

596+
mir::Rvalue::Len(place) => {
597+
let size = self.evaluate_array_len(bx, place);
598+
OperandRef {
599+
val: OperandValue::Immediate(size),
600+
layout: bx.cx().layout_of(bx.tcx().types.usize),
601+
}
602+
}
603+
596604
mir::Rvalue::BinaryOp(op_with_overflow, box (ref lhs, ref rhs))
597605
if let Some(op) = op_with_overflow.overflowing_to_wrapping() =>
598606
{
@@ -792,6 +800,24 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
792800
}
793801
}
794802

803+
fn evaluate_array_len(&mut self, bx: &mut Bx, place: mir::Place<'tcx>) -> Bx::Value {
804+
// ZST are passed as operands and require special handling
805+
// because codegen_place() panics if Local is operand.
806+
if let Some(index) = place.as_local() {
807+
if let LocalRef::Operand(op) = self.locals[index] {
808+
if let ty::Array(_, n) = op.layout.ty.kind() {
809+
let n = n
810+
.try_to_target_usize(bx.tcx())
811+
.expect("expected monomorphic const in codegen");
812+
return bx.cx().const_usize(n);
813+
}
814+
}
815+
}
816+
// use common size calculation for non zero-sized types
817+
let cg_value = self.codegen_place(bx, place.as_ref());
818+
cg_value.len(bx.cx())
819+
}
820+
795821
/// Codegen an `Rvalue::RawPtr` or `Rvalue::Ref`
796822
fn codegen_place_to_pointer(
797823
&mut self,
@@ -1063,6 +1089,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
10631089
mir::Rvalue::Ref(..) |
10641090
mir::Rvalue::CopyForDeref(..) |
10651091
mir::Rvalue::RawPtr(..) |
1092+
mir::Rvalue::Len(..) |
10661093
mir::Rvalue::Cast(..) | // (*)
10671094
mir::Rvalue::ShallowInitBox(..) | // (*)
10681095
mir::Rvalue::BinaryOp(..) |

‎compiler/rustc_const_eval/src/check_consts/check.rs

+7-21
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,8 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
488488
Rvalue::Use(_)
489489
| Rvalue::CopyForDeref(..)
490490
| Rvalue::Repeat(..)
491-
| Rvalue::Discriminant(..) => {}
491+
| Rvalue::Discriminant(..)
492+
| Rvalue::Len(_) => {}
492493

493494
Rvalue::Aggregate(kind, ..) => {
494495
if let AggregateKind::Coroutine(def_id, ..) = kind.as_ref()
@@ -572,27 +573,12 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
572573
) => {}
573574
Rvalue::ShallowInitBox(_, _) => {}
574575

575-
Rvalue::UnaryOp(op, operand) => {
576+
Rvalue::UnaryOp(_, operand) => {
576577
let ty = operand.ty(self.body, self.tcx);
577-
match op {
578-
UnOp::Not | UnOp::Neg => {
579-
if is_int_bool_float_or_char(ty) {
580-
// Int, bool, float, and char operations are fine.
581-
} else {
582-
span_bug!(
583-
self.span,
584-
"non-primitive type in `Rvalue::UnaryOp{op:?}`: {ty:?}",
585-
);
586-
}
587-
}
588-
UnOp::PtrMetadata => {
589-
if !ty.is_ref() && !ty.is_unsafe_ptr() {
590-
span_bug!(
591-
self.span,
592-
"non-pointer type in `Rvalue::UnaryOp({op:?})`: {ty:?}",
593-
);
594-
}
595-
}
578+
if is_int_bool_float_or_char(ty) {
579+
// Int, bool, float, and char operations are fine.
580+
} else {
581+
span_bug!(self.span, "non-primitive type in `Rvalue::UnaryOp`: {:?}", ty);
596582
}
597583
}
598584

‎compiler/rustc_const_eval/src/check_consts/qualifs.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,9 @@ where
230230
Q::in_any_value_of_ty(cx, rvalue.ty(cx.body, cx.tcx))
231231
}
232232

233-
Rvalue::Discriminant(place) => in_place::<Q, _>(cx, in_local, place.as_ref()),
233+
Rvalue::Discriminant(place) | Rvalue::Len(place) => {
234+
in_place::<Q, _>(cx, in_local, place.as_ref())
235+
}
234236

235237
Rvalue::CopyForDeref(place) => in_place::<Q, _>(cx, in_local, place.as_ref()),
236238

0 commit comments

Comments
 (0)