Skip to content

Commit 969c145

Browse files
committed
don't set HAS_INFER for fresh types
1 parent 485c5fb commit 969c145

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/doc/rustc-guide

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 5bd60bc51efaec04e69e2e18b59678e2af066433

src/librustc_middle/ty/flags.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ impl FlagComputation {
109109
}
110110

111111
&ty::Infer(infer) => {
112-
self.add_flags(TypeFlags::HAS_TY_INFER);
113112
self.add_flags(TypeFlags::STILL_FURTHER_SPECIALIZABLE);
114113
match infer {
115114
ty::FreshTy(_) | ty::FreshIntTy(_) | ty::FreshFloatTy(_) => {}
116115

117116
ty::TyVar(_) | ty::IntVar(_) | ty::FloatVar(_) => {
117+
self.add_flags(TypeFlags::HAS_TY_INFER);
118118
self.add_flags(TypeFlags::KEEP_IN_LOCAL_TCX)
119119
}
120120
}
@@ -221,11 +221,13 @@ impl FlagComputation {
221221
self.add_flags(TypeFlags::HAS_CT_PROJECTION);
222222
}
223223
ty::ConstKind::Infer(infer) => {
224-
self.add_flags(TypeFlags::HAS_CT_INFER);
225224
self.add_flags(TypeFlags::STILL_FURTHER_SPECIALIZABLE);
226225
match infer {
227226
InferConst::Fresh(_) => {}
228-
InferConst::Var(_) => self.add_flags(TypeFlags::KEEP_IN_LOCAL_TCX),
227+
InferConst::Var(_) => {
228+
self.add_flags(TypeFlags::HAS_CT_INFER);
229+
self.add_flags(TypeFlags::KEEP_IN_LOCAL_TCX)
230+
}
229231
}
230232
}
231233
ty::ConstKind::Bound(debruijn, _) => {

0 commit comments

Comments
 (0)