Skip to content

Commit 932289c

Browse files
eddybeddyb
committed
rustc: introduce ty::Const { ConstVal, Ty }.
1 parent 50076b0 commit 932289c

File tree

31 files changed

+409
-194
lines changed

31 files changed

+409
-194
lines changed

‎src/librustc/ich/impls_ty.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,10 +277,10 @@ for ::middle::const_val::ConstVal<'gcx> {
277277
mem::discriminant(self).hash_stable(hcx, hasher);
278278

279279
match *self {
280-
Float(ref value) => {
280+
Integral(ref value) => {
281281
value.hash_stable(hcx, hasher);
282282
}
283-
Integral(ref value) => {
283+
Float(ref value) => {
284284
value.hash_stable(hcx, hasher);
285285
}
286286
Str(ref value) => {
@@ -325,6 +325,11 @@ impl_stable_hash_for!(struct ::middle::const_val::ByteArray<'tcx> {
325325
data
326326
});
327327

328+
impl_stable_hash_for!(struct ty::Const<'tcx> {
329+
ty,
330+
val
331+
});
332+
328333
impl_stable_hash_for!(struct ty::ClosureSubsts<'tcx> { substs });
329334

330335
impl_stable_hash_for!(struct ty::GeneratorInterior<'tcx> { witness });

‎src/librustc/middle/const_val.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ use syntax_pos::Span;
3030

3131
use std::borrow::Cow;
3232

33-
pub type EvalResult<'tcx> = Result<&'tcx ConstVal<'tcx>, ConstEvalErr<'tcx>>;
33+
pub type EvalResult<'tcx> = Result<&'tcx ty::Const<'tcx>, ConstEvalErr<'tcx>>;
3434

3535
#[derive(Copy, Clone, Debug, Hash, RustcEncodable, RustcDecodable, Eq, PartialEq)]
3636
pub enum ConstVal<'tcx> {
37-
Float(ConstFloat),
3837
Integral(ConstInt),
38+
Float(ConstFloat),
3939
Str(InternedString),
4040
ByteStr(ByteArray<'tcx>),
4141
Bool(bool),
@@ -45,8 +45,6 @@ pub enum ConstVal<'tcx> {
4545
Aggregate(ConstAggregate<'tcx>),
4646
}
4747

48-
impl<'tcx> serialize::UseSpecializedDecodable for &'tcx ConstVal<'tcx> {}
49-
5048
#[derive(Copy, Clone, Debug, Hash, RustcEncodable, Eq, PartialEq)]
5149
pub struct ByteArray<'tcx> {
5250
pub data: &'tcx [u8],
@@ -56,10 +54,10 @@ impl<'tcx> serialize::UseSpecializedDecodable for ByteArray<'tcx> {}
5654

5755
#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
5856
pub enum ConstAggregate<'tcx> {
59-
Struct(&'tcx [(ast::Name, &'tcx ConstVal<'tcx>)]),
60-
Tuple(&'tcx [&'tcx ConstVal<'tcx>]),
61-
Array(&'tcx [&'tcx ConstVal<'tcx>]),
62-
Repeat(&'tcx ConstVal<'tcx>, u64),
57+
Struct(&'tcx [(ast::Name, &'tcx ty::Const<'tcx>)]),
58+
Tuple(&'tcx [&'tcx ty::Const<'tcx>]),
59+
Array(&'tcx [&'tcx ty::Const<'tcx>]),
60+
Repeat(&'tcx ty::Const<'tcx>, u64),
6361
}
6462

6563
impl<'tcx> Encodable for ConstAggregate<'tcx> {
@@ -259,7 +257,7 @@ pub fn eval_length(tcx: TyCtxt,
259257
let param_env = ty::ParamEnv::empty(Reveal::UserFacing);
260258
let substs = Substs::identity_for_item(tcx.global_tcx(), count_def_id);
261259
match tcx.at(count_expr.span).const_eval(param_env.and((count_def_id, substs))) {
262-
Ok(&Integral(Usize(count))) => {
260+
Ok(&ty::Const { val: Integral(Usize(count)), .. }) => {
263261
let val = count.as_u64(tcx.sess.target.uint_type);
264262
assert_eq!(val as usize as u64, val);
265263
Ok(val as usize)

‎src/librustc/mir/mod.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,11 +1187,15 @@ impl<'tcx> Operand<'tcx> {
11871187
substs: &'tcx Substs<'tcx>,
11881188
span: Span,
11891189
) -> Self {
1190+
let ty = tcx.type_of(def_id).subst(tcx, substs);
11901191
Operand::Constant(box Constant {
11911192
span,
1192-
ty: tcx.type_of(def_id).subst(tcx, substs),
1193+
ty,
11931194
literal: Literal::Value {
1194-
value: tcx.mk_const(ConstVal::Function(def_id, substs))
1195+
value: tcx.mk_const(ty::Const {
1196+
val: ConstVal::Function(def_id, substs),
1197+
ty
1198+
})
11951199
},
11961200
})
11971201
}
@@ -1480,7 +1484,7 @@ pub enum Literal<'tcx> {
14801484
substs: &'tcx Substs<'tcx>,
14811485
},
14821486
Value {
1483-
value: &'tcx ConstVal<'tcx>,
1487+
value: &'tcx ty::Const<'tcx>,
14841488
},
14851489
Promoted {
14861490
// Index into the `promoted` vector of `Mir`.
@@ -1501,9 +1505,9 @@ impl<'tcx> Debug for Literal<'tcx> {
15011505
Item { def_id, substs } => {
15021506
ppaux::parameterized(fmt, substs, def_id, &[])
15031507
}
1504-
Value { ref value } => {
1508+
Value { value } => {
15051509
write!(fmt, "const ")?;
1506-
fmt_const_val(fmt, value)
1510+
fmt_const_val(fmt, &value.val)
15071511
}
15081512
Promoted { index } => {
15091513
write!(fmt, "{:?}", index)

‎src/librustc/mir/visit.rs

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use middle::const_val::ConstVal;
1211
use hir::def_id::DefId;
1312
use ty::subst::Substs;
1413
use ty::{ClosureSubsts, Region, Ty, GeneratorInterior};
@@ -214,6 +213,18 @@ macro_rules! make_mir_visitor {
214213
self.super_ty(ty);
215214
}
216215

216+
fn visit_region(&mut self,
217+
region: & $($mutability)* ty::Region<'tcx>,
218+
_: Location) {
219+
self.super_region(region);
220+
}
221+
222+
fn visit_const(&mut self,
223+
constant: & $($mutability)* &'tcx ty::Const<'tcx>,
224+
_: Location) {
225+
self.super_const(constant);
226+
}
227+
217228
fn visit_substs(&mut self,
218229
substs: & $($mutability)* &'tcx Substs<'tcx>,
219230
_: Location) {
@@ -232,12 +243,6 @@ macro_rules! make_mir_visitor {
232243
self.super_generator_interior(interior);
233244
}
234245

235-
fn visit_const_val(&mut self,
236-
const_val: & $($mutability)* &'tcx ConstVal<'tcx>,
237-
_: Location) {
238-
self.super_const_val(const_val);
239-
}
240-
241246
fn visit_const_int(&mut self,
242247
const_int: &ConstInt,
243248
_: Location) {
@@ -517,9 +522,10 @@ macro_rules! make_mir_visitor {
517522
self.visit_const_usize(length, location);
518523
}
519524

520-
Rvalue::Ref(r, bk, ref $($mutability)* path) => {
525+
Rvalue::Ref(ref $($mutability)* r, bk, ref $($mutability)* path) => {
526+
self.visit_region(r, location);
521527
self.visit_lvalue(path, LvalueContext::Borrow {
522-
region: r,
528+
region: *r,
523529
kind: bk
524530
}, location);
525531
}
@@ -724,7 +730,7 @@ macro_rules! make_mir_visitor {
724730
self.visit_substs(substs, location);
725731
}
726732
Literal::Value { ref $($mutability)* value } => {
727-
self.visit_const_val(value, location);
733+
self.visit_const(value, location);
728734
}
729735
Literal::Promoted { index: _ } => {}
730736
}
@@ -749,6 +755,12 @@ macro_rules! make_mir_visitor {
749755
fn super_ty(&mut self, _ty: & $($mutability)* Ty<'tcx>) {
750756
}
751757

758+
fn super_region(&mut self, _region: & $($mutability)* ty::Region<'tcx>) {
759+
}
760+
761+
fn super_const(&mut self, _const: & $($mutability)* &'tcx ty::Const<'tcx>) {
762+
}
763+
752764
fn super_substs(&mut self, _substs: & $($mutability)* &'tcx Substs<'tcx>) {
753765
}
754766

@@ -760,9 +772,6 @@ macro_rules! make_mir_visitor {
760772
_substs: & $($mutability)* ClosureSubsts<'tcx>) {
761773
}
762774

763-
fn super_const_val(&mut self, _const_val: & $($mutability)* &'tcx ConstVal<'tcx>) {
764-
}
765-
766775
fn super_const_int(&mut self, _const_int: &ConstInt) {
767776
}
768777

‎src/librustc/ty/context.rs

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use hir::map as hir_map;
2121
use hir::map::DefPathHash;
2222
use lint::{self, Lint};
2323
use ich::{self, StableHashingContext, NodeIdHashingMode};
24-
use middle::const_val::ConstVal;
2524
use middle::free_region::FreeRegionMap;
2625
use middle::lang_items;
2726
use middle::resolve_lifetime::{self, ObjectLifetimeDefault};
@@ -33,7 +32,7 @@ use ty::ReprOptions;
3332
use traits;
3433
use ty::{self, Ty, TypeAndMut};
3534
use ty::{TyS, TypeVariants, Slice};
36-
use ty::{AdtKind, AdtDef, ClosureSubsts, GeneratorInterior, Region};
35+
use ty::{AdtKind, AdtDef, ClosureSubsts, GeneratorInterior, Region, Const};
3736
use ty::{PolyFnSig, InferTy, ParamTy, ProjectionTy, ExistentialPredicate, Predicate};
3837
use ty::RegionKind;
3938
use ty::{TyVar, TyVid, IntVar, IntVid, FloatVar, FloatVid};
@@ -109,7 +108,7 @@ pub struct CtxtInterners<'tcx> {
109108
region: RefCell<FxHashSet<Interned<'tcx, RegionKind>>>,
110109
existential_predicates: RefCell<FxHashSet<Interned<'tcx, Slice<ExistentialPredicate<'tcx>>>>>,
111110
predicates: RefCell<FxHashSet<Interned<'tcx, Slice<Predicate<'tcx>>>>>,
112-
const_: RefCell<FxHashSet<Interned<'tcx, ConstVal<'tcx>>>>,
111+
const_: RefCell<FxHashSet<Interned<'tcx, Const<'tcx>>>>,
113112
}
114113

115114
impl<'gcx: 'tcx, 'tcx> CtxtInterners<'tcx> {
@@ -945,21 +944,21 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
945944
}
946945
}
947946

948-
pub fn alloc_constval_slice(self, values: &[&'tcx ConstVal<'gcx>])
949-
-> &'gcx [&'tcx ConstVal<'gcx>] {
947+
pub fn alloc_const_slice(self, values: &[&'tcx ty::Const<'tcx>])
948+
-> &'tcx [&'tcx ty::Const<'tcx>] {
950949
if values.is_empty() {
951950
&[]
952951
} else {
953-
self.global_interners.arena.alloc_slice(values)
952+
self.interners.arena.alloc_slice(values)
954953
}
955954
}
956955

957-
pub fn alloc_name_constval_slice(self, values: &[(ast::Name, &'tcx ConstVal<'gcx>)])
958-
-> &'gcx [(ast::Name, &'tcx ConstVal<'gcx>)] {
956+
pub fn alloc_name_const_slice(self, values: &[(ast::Name, &'tcx ty::Const<'tcx>)])
957+
-> &'tcx [(ast::Name, &'tcx ty::Const<'tcx>)] {
959958
if values.is_empty() {
960959
&[]
961960
} else {
962-
self.global_interners.arena.alloc_slice(values)
961+
self.interners.arena.alloc_slice(values)
963962
}
964963
}
965964

@@ -1216,13 +1215,10 @@ impl<'a, 'tcx> Lift<'tcx> for Ty<'a> {
12161215
}
12171216
}
12181217

1219-
impl<'a, 'tcx> Lift<'tcx> for &'a Substs<'a> {
1220-
type Lifted = &'tcx Substs<'tcx>;
1221-
fn lift_to_tcx<'b, 'gcx>(&self, tcx: TyCtxt<'b, 'gcx, 'tcx>) -> Option<&'tcx Substs<'tcx>> {
1222-
if self.len() == 0 {
1223-
return Some(Slice::empty());
1224-
}
1225-
if tcx.interners.arena.in_arena(&self[..] as *const _) {
1218+
impl<'a, 'tcx> Lift<'tcx> for Region<'a> {
1219+
type Lifted = Region<'tcx>;
1220+
fn lift_to_tcx<'b, 'gcx>(&self, tcx: TyCtxt<'b, 'gcx, 'tcx>) -> Option<Region<'tcx>> {
1221+
if tcx.interners.arena.in_arena(*self as *const _) {
12261222
return Some(unsafe { mem::transmute(*self) });
12271223
}
12281224
// Also try in the global tcx if we're not that.
@@ -1234,9 +1230,9 @@ impl<'a, 'tcx> Lift<'tcx> for &'a Substs<'a> {
12341230
}
12351231
}
12361232

1237-
impl<'a, 'tcx> Lift<'tcx> for Region<'a> {
1238-
type Lifted = Region<'tcx>;
1239-
fn lift_to_tcx<'b, 'gcx>(&self, tcx: TyCtxt<'b, 'gcx, 'tcx>) -> Option<Region<'tcx>> {
1233+
impl<'a, 'tcx> Lift<'tcx> for &'a Const<'a> {
1234+
type Lifted = &'tcx Const<'tcx>;
1235+
fn lift_to_tcx<'b, 'gcx>(&self, tcx: TyCtxt<'b, 'gcx, 'tcx>) -> Option<&'tcx Const<'tcx>> {
12401236
if tcx.interners.arena.in_arena(*self as *const _) {
12411237
return Some(unsafe { mem::transmute(*self) });
12421238
}
@@ -1249,6 +1245,24 @@ impl<'a, 'tcx> Lift<'tcx> for Region<'a> {
12491245
}
12501246
}
12511247

1248+
impl<'a, 'tcx> Lift<'tcx> for &'a Substs<'a> {
1249+
type Lifted = &'tcx Substs<'tcx>;
1250+
fn lift_to_tcx<'b, 'gcx>(&self, tcx: TyCtxt<'b, 'gcx, 'tcx>) -> Option<&'tcx Substs<'tcx>> {
1251+
if self.len() == 0 {
1252+
return Some(Slice::empty());
1253+
}
1254+
if tcx.interners.arena.in_arena(&self[..] as *const _) {
1255+
return Some(unsafe { mem::transmute(*self) });
1256+
}
1257+
// Also try in the global tcx if we're not that.
1258+
if !tcx.is_global() {
1259+
self.lift_to_tcx(tcx.global_tcx())
1260+
} else {
1261+
None
1262+
}
1263+
}
1264+
}
1265+
12521266
impl<'a, 'tcx> Lift<'tcx> for &'a Slice<Ty<'a>> {
12531267
type Lifted = &'tcx Slice<Ty<'tcx>>;
12541268
fn lift_to_tcx<'b, 'gcx>(&self, tcx: TyCtxt<'b, 'gcx, 'tcx>)
@@ -1536,8 +1550,8 @@ impl<'tcx: 'lcx, 'lcx> Borrow<[Predicate<'lcx>]>
15361550
}
15371551
}
15381552

1539-
impl<'tcx: 'lcx, 'lcx> Borrow<ConstVal<'lcx>> for Interned<'tcx, ConstVal<'tcx>> {
1540-
fn borrow<'a>(&'a self) -> &'a ConstVal<'lcx> {
1553+
impl<'tcx: 'lcx, 'lcx> Borrow<Const<'lcx>> for Interned<'tcx, Const<'tcx>> {
1554+
fn borrow<'a>(&'a self) -> &'a Const<'lcx> {
15411555
&self.0
15421556
}
15431557
}
@@ -1623,7 +1637,7 @@ direct_interners!('tcx,
16231637
_ => false
16241638
}
16251639
}) -> RegionKind,
1626-
const_: mk_const(/*|c: &Const| keep_local(&c.ty)*/ |_| false) -> ConstVal<'tcx>
1640+
const_: mk_const(|c: &Const| keep_local(&c.ty) || keep_local(&c.val)) -> Const<'tcx>
16271641
);
16281642

16291643
macro_rules! slice_interners {

‎src/librustc/ty/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pub use self::sty::{InferTy, ParamTy, ProjectionTy, ExistentialPredicate};
6464
pub use self::sty::{ClosureSubsts, GeneratorInterior, TypeAndMut};
6565
pub use self::sty::{TraitRef, TypeVariants, PolyTraitRef};
6666
pub use self::sty::{ExistentialTraitRef, PolyExistentialTraitRef};
67-
pub use self::sty::{ExistentialProjection, PolyExistentialProjection};
67+
pub use self::sty::{ExistentialProjection, PolyExistentialProjection, Const};
6868
pub use self::sty::{BoundRegion, EarlyBoundRegion, FreeRegion, Region};
6969
pub use self::sty::RegionKind;
7070
pub use self::sty::{TyVid, IntVid, FloatVid, RegionVid, SkolemizedRegionVid};
@@ -1601,7 +1601,7 @@ impl<'a, 'gcx, 'tcx> AdtDef {
16011601
if let VariantDiscr::Explicit(expr_did) = v.discr {
16021602
let substs = Substs::identity_for_item(tcx.global_tcx(), expr_did);
16031603
match tcx.const_eval(param_env.and((expr_did, substs))) {
1604-
Ok(&ConstVal::Integral(v)) => {
1604+
Ok(&ty::Const { val: ConstVal::Integral(v), .. }) => {
16051605
discr = v;
16061606
}
16071607
err => {
@@ -1641,7 +1641,7 @@ impl<'a, 'gcx, 'tcx> AdtDef {
16411641
ty::VariantDiscr::Explicit(expr_did) => {
16421642
let substs = Substs::identity_for_item(tcx.global_tcx(), expr_did);
16431643
match tcx.const_eval(param_env.and((expr_did, substs))) {
1644-
Ok(&ConstVal::Integral(v)) => {
1644+
Ok(&ty::Const { val: ConstVal::Integral(v), .. }) => {
16451645
explicit_value = v;
16461646
break;
16471647
}

0 commit comments

Comments
 (0)