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

Jump to bottom

Create different inference variables for different defining uses of TAITs #86118

Merged
merged 18 commits into from
Jun 9, 2021
Merged

Create different inference variables for different defining uses of TAITs #86118

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
aa7024b
Add VecMap to rustc_data_structures
spastorino Jun 4, 2021
2bc723f
Change opaque type map to be a `VecMap`
spastorino Jun 4, 2021
3405725
Change concrete opaque type to be a `VecMap`
spastorino Jun 4, 2021
7f8cad2
Make OpaqueTypeKey the key of opaque types map
spastorino Jun 5, 2021
7294f49
Remove ResolvedOpaqueTy and just use Ty, SubstsRef is already there
spastorino Jun 7, 2021
37ab718
Make opaque type map key be of type OpaqueTypeKey
spastorino Jun 7, 2021
5dabd55
Use substs from opaque type key instead of using it from opaque_decl
spastorino Jun 7, 2021
e386373
Remove substs from OpaqueTypeDecl, use the one in OpaqueTypeKey
spastorino Jun 7, 2021
9e547b4
Differentiate different defining uses of taits when they reference di…
spastorino Jun 7, 2021
c80d062
Add more TAIT multiple defining uses test cases
spastorino Jun 7, 2021
dd56ec6
Add VecMap::get_by(FnMut -> bool)
spastorino Jun 8, 2021
1278f3f
Simplify code by using VecMap::get_by
spastorino Jun 8, 2021
f07412d
Destructure OpaqueTypeKey in certain cases to simplify code
spastorino Jun 8, 2021
ecd78e9
defin_ty_def_id -> definition_ty_def_id
spastorino Jun 8, 2021
0ad09f9
Do not deconstruct OpaqueTypeKey to make the code more clear
spastorino Jun 8, 2021
ed94da1
Explicitly pass find arguments down the predicate so coercions can apply
spastorino Jun 8, 2021
cad762b
Use impl FnMut directly as predicate type
spastorino Jun 8, 2021
7b1e1c7
add VecMap docs
spastorino Jun 8, 2021
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
18 changes: 7 additions & 11 deletions compiler/rustc_mir/src/borrow_check/type_check/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,28 +1283,25 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
);

for &(opaque_type_key, opaque_decl) in &opaque_type_map {
let opaque_def_id = opaque_type_key.def_id;
let resolved_ty = infcx.resolve_vars_if_possible(opaque_decl.concrete_ty);
let concrete_is_opaque = if let ty::Opaque(def_id, _) = resolved_ty.kind() {
*def_id == opaque_def_id
*def_id == opaque_type_key.def_id
} else {
false
};

let opaque_type_key =
OpaqueTypeKey { def_id: opaque_def_id, substs: opaque_decl.substs };
let concrete_ty = match concrete_opaque_types
.iter()
.find(|(opaque_type_key, _)| opaque_type_key.def_id == opaque_def_id)
.map(|(_, concrete_ty)| concrete_ty)
.find(|(key, _)| key.def_id == opaque_type_key.def_id)
.map(|(_, ty)| ty)
spastorino marked this conversation as resolved.
Show resolved Hide resolved
{
None => {
if !concrete_is_opaque {
tcx.sess.delay_span_bug(
body.span,
&format!(
"Non-defining use of {:?} with revealed type",
opaque_def_id,
opaque_type_key.def_id,
),
);
}
Expand All @@ -1313,7 +1310,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
Some(concrete_ty) => concrete_ty,
};
debug!("concrete_ty = {:?}", concrete_ty);
let subst_opaque_defn_ty = concrete_ty.subst(tcx, opaque_decl.substs);
let subst_opaque_defn_ty = concrete_ty.subst(tcx, opaque_type_key.substs);
let renumbered_opaque_defn_ty =
renumber::renumber_regions(infcx, subst_opaque_defn_ty);

Expand Down Expand Up @@ -1353,7 +1350,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
// gets 'revealed' into
debug!(
"eq_opaque_type_and_type: non-defining use of {:?}",
opaque_def_id,
opaque_type_key.def_id,
);
}
}
Expand All @@ -1379,14 +1376,13 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
// instantiated it with).
if let Some(opaque_type_map) = opaque_type_map {
for (opaque_type_key, opaque_decl) in opaque_type_map {
let opaque_def_id = opaque_type_key.def_id;
self.fully_perform_op(
locations,
ConstraintCategory::OpaqueType,
CustomTypeOp::new(
|_cx| {
infcx.constrain_opaque_type(
opaque_def_id,
opaque_type_key.def_id,
&opaque_decl,
GenerateMemberConstraints::IfNoStaticBound,
universal_region_relations,
Expand Down
3 changes: 1 addition & 2 deletions compiler/rustc_trait_selection/src/opaque_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,8 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
debug!("constrain_opaque_types()");

for &(opaque_type_key, opaque_defn) in opaque_types {
spastorino marked this conversation as resolved.
Show resolved Hide resolved
let OpaqueTypeKey { def_id, substs: _ } = opaque_type_key;
self.constrain_opaque_type(
def_id,
opaque_type_key.def_id,
&opaque_defn,
GenerateMemberConstraints::WhenRequired,
free_region_relations,
Expand Down
9 changes: 4 additions & 5 deletions compiler/rustc_typeck/src/check/check.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,11 +717,10 @@ fn check_opaque_meets_bounds<'tcx>(
);

for (opaque_type_key, opaque_defn) in opaque_type_map {
let def_id = opaque_type_key.def_id;
match infcx
.at(&misc_cause, param_env)
.eq(opaque_defn.concrete_ty, tcx.type_of(def_id).subst(tcx, opaque_defn.substs))
{
match infcx.at(&misc_cause, param_env).eq(
opaque_defn.concrete_ty,
tcx.type_of(opaque_type_key.def_id).subst(tcx, opaque_defn.substs),
spastorino marked this conversation as resolved.
Show resolved Hide resolved
) {
Ok(infer_ok) => inh.register_infer_ok_obligations(infer_ok),
Err(ty_err) => tcx.sess.delay_span_bug(
opaque_defn.definition_span,
Expand Down
14 changes: 6 additions & 8 deletions compiler/rustc_typeck/src/check/writeback.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use rustc_middle::hir::place::Place as HirPlace;
use rustc_middle::mir::FakeReadCause;
use rustc_middle::ty::adjustment::{Adjust, Adjustment, PointerCast};
use rustc_middle::ty::fold::{TypeFoldable, TypeFolder};
use rustc_middle::ty::{self, OpaqueTypeKey, Ty, TyCtxt};
use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_span::symbol::sym;
use rustc_span::Span;
use rustc_trait_selection::opaque_types::InferCtxtExt;
Expand Down Expand Up @@ -476,8 +476,8 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {

fn visit_opaque_types(&mut self, span: Span) {
for &(opaque_type_key, opaque_defn) in self.fcx.opaque_types.borrow().iter() {
let OpaqueTypeKey { def_id, substs: _ } = opaque_type_key;
let hir_id = self.tcx().hir().local_def_id_to_hir_id(def_id.expect_local());
let hir_id =
self.tcx().hir().local_def_id_to_hir_id(opaque_type_key.def_id.expect_local());
let instantiated_ty = self.resolve(opaque_defn.concrete_ty, &hir_id);

debug_assert!(!instantiated_ty.has_escaping_bound_vars());
Expand All @@ -494,7 +494,6 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
// fn foo<U>() -> Foo<U> { .. }
// ```
// figures out the concrete type with `U`, but the stored type is with `T`.
let opaque_type_key = OpaqueTypeKey { def_id, substs: opaque_defn.substs };
let definition_ty = self.fcx.infer_opaque_definition_from_instantiation(
opaque_type_key,
instantiated_ty,
Expand All @@ -506,7 +505,7 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
if let ty::Opaque(defin_ty_def_id, _substs) = *definition_ty.kind() {
if let hir::OpaqueTyOrigin::Misc | hir::OpaqueTyOrigin::TyAlias = opaque_defn.origin
{
if def_id == defin_ty_def_id {
if opaque_type_key.def_id == defin_ty_def_id {
debug!(
"skipping adding concrete definition for opaque type {:?} {:?}",
opaque_defn, defin_ty_def_id
Expand All @@ -516,14 +515,13 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
}
}

if !opaque_defn.substs.needs_infer() {
if !opaque_type_key.substs.needs_infer() {
// We only want to add an entry into `concrete_opaque_types`
// if we actually found a defining usage of this opaque type.
// Otherwise, we do nothing - we'll either find a defining usage
// in some other location, or we'll end up emitting an error due
// to the lack of defining usage
if !skip_add {
let opaque_type_key = OpaqueTypeKey { def_id, substs: opaque_defn.substs };
let old_concrete_ty = self
.typeck_results
.concrete_opaque_types
Expand All @@ -534,7 +532,7 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
span,
"`visit_opaque_types` tried to write different types for the same \
opaque type: {:?}, {:?}, {:?}, {:?}",
def_id,
opaque_type_key.def_id,
definition_ty,
opaque_defn,
old_concrete_ty,
Expand Down