Skip to content

Commit 706a4d9

Browse files
borsbors
committed
Auto merge of #114308 - matthiaskrgr:rollup-m64bkm7, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #109318 (Make `Debug` representations of `[Lazy, Once]*[Cell, Lock]` consistent with `Mutex` and `RwLock`) - #113701 (Re-export core::ffi::FromBytesUntilNulError in std::ffi) - #113804 (Resolve correct archive version name in `opt-dist`) - #114165 (Add missing rvalues to smir) - #114182 (clean up after 113312) - #114193 (Update lexer emoji diagnostics to Unicode 15.0) - #114200 (Detect trait upcasting through struct tail unsizing in new solver select) r? `@ghost` `@rustbot` modify labels: rollup
2 parents db7ff98 + c73e232 commit 706a4d9

File tree

24 files changed

+228
-134
lines changed

24 files changed

+228
-134
lines changed

‎Cargo.lock

+7-42
Original file line numberDiff line numberDiff line change
@@ -3786,7 +3786,7 @@ name = "rustc_lexer"
37863786
version = "0.1.0"
37873787
dependencies = [
37883788
"expect-test",
3789-
"unic-emoji-char",
3789+
"unicode-properties",
37903790
"unicode-xid",
37913791
]
37923792

@@ -5446,38 +5446,6 @@ dependencies = [
54465446
"tempfile",
54475447
]
54485448

5449-
[[package]]
5450-
name = "unic-char-property"
5451-
version = "0.9.0"
5452-
source = "registry+https://github.com/rust-lang/crates.io-index"
5453-
checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
5454-
dependencies = [
5455-
"unic-char-range",
5456-
]
5457-
5458-
[[package]]
5459-
name = "unic-char-range"
5460-
version = "0.9.0"
5461-
source = "registry+https://github.com/rust-lang/crates.io-index"
5462-
checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
5463-
5464-
[[package]]
5465-
name = "unic-common"
5466-
version = "0.9.0"
5467-
source = "registry+https://github.com/rust-lang/crates.io-index"
5468-
checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
5469-
5470-
[[package]]
5471-
name = "unic-emoji-char"
5472-
version = "0.9.0"
5473-
source = "registry+https://github.com/rust-lang/crates.io-index"
5474-
checksum = "0b07221e68897210270a38bde4babb655869637af0f69407f96053a34f76494d"
5475-
dependencies = [
5476-
"unic-char-property",
5477-
"unic-char-range",
5478-
"unic-ucd-version",
5479-
]
5480-
54815449
[[package]]
54825450
name = "unic-langid"
54835451
version = "0.9.1"
@@ -5521,15 +5489,6 @@ dependencies = [
55215489
"unic-langid-impl",
55225490
]
55235491

5524-
[[package]]
5525-
name = "unic-ucd-version"
5526-
version = "0.9.0"
5527-
source = "registry+https://github.com/rust-lang/crates.io-index"
5528-
checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
5529-
dependencies = [
5530-
"unic-common",
5531-
]
5532-
55335492
[[package]]
55345493
name = "unicase"
55355494
version = "2.6.0"
@@ -5567,6 +5526,12 @@ dependencies = [
55675526
"tinyvec",
55685527
]
55695528

5529+
[[package]]
5530+
name = "unicode-properties"
5531+
version = "0.1.0"
5532+
source = "registry+https://github.com/rust-lang/crates.io-index"
5533+
checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0"
5534+
55705535
[[package]]
55715536
name = "unicode-script"
55725537
version = "0.5.5"

‎compiler/rustc_lexer/Cargo.toml

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ Rust lexer used by rustc. No stability guarantees are provided.
1616
# Note that this crate purposefully does not depend on other rustc crates
1717
[dependencies]
1818
unicode-xid = "0.2.0"
19-
unic-emoji-char = "0.9.0"
19+
20+
[dependencies.unicode-properties]
21+
version = "0.1.0"
22+
default-features = false
23+
features = ["emoji"]
2024

2125
[dev-dependencies]
2226
expect-test = "1.4.0"

‎compiler/rustc_lexer/src/lib.rs

+4-7
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ pub use crate::cursor::Cursor;
3434
use self::LiteralKind::*;
3535
use self::TokenKind::*;
3636
use crate::cursor::EOF_CHAR;
37+
use unicode_properties::UnicodeEmoji;
3738

3839
/// Parsed token.
3940
/// It doesn't contain information about data that has been parsed,
@@ -428,9 +429,7 @@ impl Cursor<'_> {
428429
Literal { kind, suffix_start }
429430
}
430431
// Identifier starting with an emoji. Only lexed for graceful error recovery.
431-
c if !c.is_ascii() && unic_emoji_char::is_emoji(c) => {
432-
self.fake_ident_or_unknown_prefix()
433-
}
432+
c if !c.is_ascii() && c.is_emoji_char() => self.fake_ident_or_unknown_prefix(),
434433
_ => Unknown,
435434
};
436435
let res = Token::new(token_kind, self.pos_within_token());
@@ -514,9 +513,7 @@ impl Cursor<'_> {
514513
// we see a prefix here, it is definitely an unknown prefix.
515514
match self.first() {
516515
'#' | '"' | '\'' => UnknownPrefix,
517-
c if !c.is_ascii() && unic_emoji_char::is_emoji(c) => {
518-
self.fake_ident_or_unknown_prefix()
519-
}
516+
c if !c.is_ascii() && c.is_emoji_char() => self.fake_ident_or_unknown_prefix(),
520517
_ => Ident,
521518
}
522519
}
@@ -525,7 +522,7 @@ impl Cursor<'_> {
525522
// Start is already eaten, eat the rest of identifier.
526523
self.eat_while(|c| {
527524
unicode_xid::UnicodeXID::is_xid_continue(c)
528-
|| (!c.is_ascii() && unic_emoji_char::is_emoji(c))
525+
|| (!c.is_ascii() && c.is_emoji_char())
529526
|| c == '\u{200d}'
530527
});
531528
// Known prefixes must have been handled earlier. So if

‎compiler/rustc_smir/src/rustc_smir/mod.rs

+47-4
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ impl<'tcx> Stable<'tcx> for mir::Rvalue<'tcx> {
132132
use mir::Rvalue::*;
133133
match self {
134134
Use(op) => stable_mir::mir::Rvalue::Use(op.stable(tables)),
135-
Repeat(_, _) => todo!(),
135+
Repeat(op, len) => stable_mir::mir::Rvalue::Repeat(op.stable(tables), opaque(len)),
136136
Ref(region, kind, place) => stable_mir::mir::Rvalue::Ref(
137137
opaque(region),
138138
kind.stable(tables),
@@ -145,7 +145,11 @@ impl<'tcx> Stable<'tcx> for mir::Rvalue<'tcx> {
145145
stable_mir::mir::Rvalue::AddressOf(mutability.stable(tables), place.stable(tables))
146146
}
147147
Len(place) => stable_mir::mir::Rvalue::Len(place.stable(tables)),
148-
Cast(_, _, _) => todo!(),
148+
Cast(cast_kind, op, ty) => stable_mir::mir::Rvalue::Cast(
149+
cast_kind.stable(tables),
150+
op.stable(tables),
151+
tables.intern_ty(*ty),
152+
),
149153
BinaryOp(bin_op, ops) => stable_mir::mir::Rvalue::BinaryOp(
150154
bin_op.stable(tables),
151155
ops.0.stable(tables),
@@ -163,8 +167,13 @@ impl<'tcx> Stable<'tcx> for mir::Rvalue<'tcx> {
163167
stable_mir::mir::Rvalue::UnaryOp(un_op.stable(tables), op.stable(tables))
164168
}
165169
Discriminant(place) => stable_mir::mir::Rvalue::Discriminant(place.stable(tables)),
166-
Aggregate(_, _) => todo!(),
167-
ShallowInitBox(_, _) => todo!(),
170+
Aggregate(agg_kind, operands) => {
171+
let operands = operands.iter().map(|op| op.stable(tables)).collect();
172+
stable_mir::mir::Rvalue::Aggregate(agg_kind.stable(tables), operands)
173+
}
174+
ShallowInitBox(op, ty) => {
175+
stable_mir::mir::Rvalue::ShallowInitBox(op.stable(tables), tables.intern_ty(*ty))
176+
}
168177
CopyForDeref(place) => stable_mir::mir::Rvalue::CopyForDeref(place.stable(tables)),
169178
}
170179
}
@@ -478,6 +487,40 @@ impl<'tcx> Stable<'tcx> for mir::UnOp {
478487
}
479488
}
480489

490+
impl<'tcx> Stable<'tcx> for mir::AggregateKind<'tcx> {
491+
type T = stable_mir::mir::AggregateKind;
492+
fn stable(&self, tables: &mut Tables<'tcx>) -> Self::T {
493+
match self {
494+
mir::AggregateKind::Array(ty) => {
495+
stable_mir::mir::AggregateKind::Array(tables.intern_ty(*ty))
496+
}
497+
mir::AggregateKind::Tuple => stable_mir::mir::AggregateKind::Tuple,
498+
mir::AggregateKind::Adt(def_id, var_idx, generic_arg, user_ty_index, field_idx) => {
499+
stable_mir::mir::AggregateKind::Adt(
500+
rustc_internal::adt_def(*def_id),
501+
var_idx.index(),
502+
generic_arg.stable(tables),
503+
user_ty_index.map(|idx| idx.index()),
504+
field_idx.map(|idx| idx.index()),
505+
)
506+
}
507+
mir::AggregateKind::Closure(def_id, generic_arg) => {
508+
stable_mir::mir::AggregateKind::Closure(
509+
rustc_internal::closure_def(*def_id),
510+
generic_arg.stable(tables),
511+
)
512+
}
513+
mir::AggregateKind::Generator(def_id, generic_arg, movability) => {
514+
stable_mir::mir::AggregateKind::Generator(
515+
rustc_internal::generator_def(*def_id),
516+
generic_arg.stable(tables),
517+
movability.stable(tables),
518+
)
519+
}
520+
}
521+
}
522+
}
523+
481524
impl<'tcx> Stable<'tcx> for rustc_hir::GeneratorKind {
482525
type T = stable_mir::mir::GeneratorKind;
483526
fn stable(&self, _: &mut Tables<'tcx>) -> Self::T {

‎compiler/rustc_smir/src/stable_mir/mir/body.rs

+37-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
use crate::stable_mir::ty::Region;
1+
use crate::stable_mir::ty::{
2+
AdtDef, ClosureDef, Const, GeneratorDef, GenericArgs, Movability, Region,
3+
};
24
use crate::stable_mir::{self, ty::Ty};
35

46
#[derive(Clone, Debug)]
@@ -137,7 +139,6 @@ pub enum Statement {
137139
Nop,
138140
}
139141

140-
// FIXME this is incomplete
141142
#[derive(Clone, Debug)]
142143
pub enum Rvalue {
143144
/// Creates a pointer with the indicated mutability to the place.
@@ -146,6 +147,16 @@ pub enum Rvalue {
146147
/// `&raw v` or `addr_of!(v)`.
147148
AddressOf(Mutability, Place),
148149

150+
/// Creates an aggregate value, like a tuple or struct.
151+
///
152+
/// This is needed because dataflow analysis needs to distinguish
153+
/// `dest = Foo { x: ..., y: ... }` from `dest.x = ...; dest.y = ...;` in the case that `Foo`
154+
/// has a destructor.
155+
///
156+
/// Disallowed after deaggregation for all aggregate kinds except `Array` and `Generator`. After
157+
/// generator lowering, `Generator` aggregate kinds are disallowed too.
158+
Aggregate(AggregateKind, Vec<Operand>),
159+
149160
/// * `Offset` has the same semantics as [`offset`](pointer::offset), except that the second
150161
/// parameter may be a `usize` as well.
151162
/// * The comparison operations accept `bool`s, `char`s, signed or unsigned integers, floats,
@@ -198,6 +209,16 @@ pub enum Rvalue {
198209
/// Creates a reference to the place.
199210
Ref(Region, BorrowKind, Place),
200211

212+
/// Creates an array where each element is the value of the operand.
213+
///
214+
/// This is the cause of a bug in the case where the repetition count is zero because the value
215+
/// is not dropped, see [#74836].
216+
///
217+
/// Corresponds to source code like `[x; 32]`.
218+
///
219+
/// [#74836]: https://github.com/rust-lang/rust/issues/74836
220+
Repeat(Operand, Const),
221+
201222
/// Transmutes a `*mut u8` into shallow-initialized `Box<T>`.
202223
///
203224
/// This is different from a normal transmute because dataflow analysis will treat the box as
@@ -232,6 +253,15 @@ pub enum Rvalue {
232253
Use(Operand),
233254
}
234255

256+
#[derive(Clone, Debug)]
257+
pub enum AggregateKind {
258+
Array(Ty),
259+
Tuple,
260+
Adt(AdtDef, VariantIdx, GenericArgs, Option<UserTypeAnnotationIndex>, Option<FieldIdx>),
261+
Closure(ClosureDef, GenericArgs),
262+
Generator(GeneratorDef, GenericArgs, Movability),
263+
}
264+
235265
#[derive(Clone, Debug)]
236266
pub enum Operand {
237267
Copy(Place),
@@ -247,6 +277,11 @@ pub struct Place {
247277

248278
type FieldIdx = usize;
249279

280+
/// The source-order index of a variant in a type.
281+
type VariantIdx = usize;
282+
283+
type UserTypeAnnotationIndex = usize;
284+
250285
#[derive(Clone, Debug)]
251286
pub struct SwitchTarget {
252287
pub value: u128,

‎compiler/rustc_smir/src/stable_mir/ty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ impl Ty {
1010
}
1111
}
1212

13-
type Const = Opaque;
13+
pub(crate) type Const = Opaque;
1414
pub(crate) type Region = Opaque;
1515
type Span = Opaque;
1616

‎compiler/rustc_trait_selection/src/solve/eval_ctxt/select.rs

+20-5
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,18 @@ impl<'tcx> InferCtxtSelectExt<'tcx> for InferCtxt<'tcx> {
100100
rematch_impl(self, goal, def_id, nested_obligations)
101101
}
102102

103+
// If an unsize goal is ambiguous, then we can manually rematch it to make
104+
// selection progress for coercion during HIR typeck. If it is *not* ambiguous,
105+
// but is `BuiltinImplSource::Misc`, it may have nested `Unsize` goals,
106+
// and we need to rematch those to detect tuple unsizing and trait upcasting.
107+
// FIXME: This will be wrong if we have param-env or where-clause bounds
108+
// with the unsize goal -- we may need to mark those with different impl
109+
// sources.
103110
(Certainty::Maybe(_), CandidateSource::BuiltinImpl(src))
111+
| (Certainty::Yes, CandidateSource::BuiltinImpl(src @ BuiltinImplSource::Misc))
104112
if self.tcx.lang_items().unsize_trait() == Some(goal.predicate.def_id()) =>
105113
{
106-
rematch_unsize(self, goal, nested_obligations, src)
114+
rematch_unsize(self, goal, nested_obligations, src, certainty)
107115
}
108116

109117
// Technically some builtin impls have nested obligations, but if
@@ -217,6 +225,7 @@ fn rematch_unsize<'tcx>(
217225
goal: Goal<'tcx, ty::TraitPredicate<'tcx>>,
218226
mut nested: Vec<PredicateObligation<'tcx>>,
219227
source: BuiltinImplSource,
228+
certainty: Certainty,
220229
) -> SelectionResult<'tcx, Selection<'tcx>> {
221230
let tcx = infcx.tcx;
222231
let a_ty = structurally_normalize(goal.predicate.self_ty(), infcx, goal.param_env, &mut nested);
@@ -227,6 +236,12 @@ fn rematch_unsize<'tcx>(
227236
&mut nested,
228237
);
229238
match (a_ty.kind(), b_ty.kind()) {
239+
// Stall any ambiguous upcasting goals, since we can't rematch those
240+
(ty::Dynamic(_, _, ty::Dyn), ty::Dynamic(_, _, ty::Dyn)) => match certainty {
241+
Certainty::Yes => Ok(Some(ImplSource::Builtin(source, nested))),
242+
_ => Ok(None),
243+
},
244+
// `T` -> `dyn Trait` upcasting
230245
(_, &ty::Dynamic(data, region, ty::Dyn)) => {
231246
// Check that the type implements all of the predicates of the def-id.
232247
// (i.e. the principal, all of the associated types match, and any auto traits)
@@ -354,10 +369,10 @@ fn rematch_unsize<'tcx>(
354369
);
355370
Ok(Some(ImplSource::Builtin(source, nested)))
356371
}
357-
// FIXME: We *could* ICE here if either:
358-
// 1. the certainty is `Certainty::Yes`,
359-
// 2. we're in codegen (which should mean `Certainty::Yes`).
360-
_ => Ok(None),
372+
_ => {
373+
assert_ne!(certainty, Certainty::Yes);
374+
Ok(None)
375+
}
361376
}
362377
}
363378

‎library/core/src/cell/once.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,12 @@ impl<T> Default for OnceCell<T> {
250250
#[stable(feature = "once_cell", since = "1.70.0")]
251251
impl<T: fmt::Debug> fmt::Debug for OnceCell<T> {
252252
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
253+
let mut d = f.debug_tuple("OnceCell");
253254
match self.get() {
254-
Some(v) => f.debug_tuple("OnceCell").field(v).finish(),
255-
None => f.write_str("OnceCell(Uninit)"),
256-
}
255+
Some(v) => d.field(v),
256+
None => d.field(&format_args!("<uninit>")),
257+
};
258+
d.finish()
257259
}
258260
}
259261

‎library/core/src/fmt/mod.rs

+5-15
Original file line numberDiff line numberDiff line change
@@ -2521,22 +2521,12 @@ impl<T: Copy + Debug> Debug for Cell<T> {
25212521
#[stable(feature = "rust1", since = "1.0.0")]
25222522
impl<T: ?Sized + Debug> Debug for RefCell<T> {
25232523
fn fmt(&self, f: &mut Formatter<'_>) -> Result {
2524+
let mut d = f.debug_struct("RefCell");
25242525
match self.try_borrow() {
2525-
Ok(borrow) => f.debug_struct("RefCell").field("value", &borrow).finish(),
2526-
Err(_) => {
2527-
// The RefCell is mutably borrowed so we can't look at its value
2528-
// here. Show a placeholder instead.
2529-
struct BorrowedPlaceholder;
2530-
2531-
impl Debug for BorrowedPlaceholder {
2532-
fn fmt(&self, f: &mut Formatter<'_>) -> Result {
2533-
f.write_str("<borrowed>")
2534-
}
2535-
}
2536-
2537-
f.debug_struct("RefCell").field("value", &BorrowedPlaceholder).finish()
2538-
}
2539-
}
2526+
Ok(borrow) => d.field("value", &borrow),
2527+
Err(_) => d.field("value", &format_args!("<borrowed>")),
2528+
};
2529+
d.finish()
25402530
}
25412531
}
25422532

0 commit comments

Comments
 (0)