Skip to content

Commit

Permalink
Array repeat expression lengths must be monomorphic at MIR building time
Browse files Browse the repository at this point in the history
  • Loading branch information
oli-obk committed Jan 16, 2020
1 parent 9fe05e9 commit eed0d33
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 12 deletions.
27 changes: 15 additions & 12 deletions src/librustc_mir_build/hair/cx/expr.rs
Expand Up @@ -411,18 +411,21 @@ fn make_mirror_unadjusted<'a, 'tcx>(
let def_id = cx.tcx.hir().local_def_id(count.hir_id);
let substs = InternalSubsts::identity_for_item(cx.tcx, def_id);
let span = cx.tcx.def_span(def_id);
let count =
match cx.tcx.const_eval_resolve(cx.param_env, def_id, substs, None, Some(span)) {
Ok(cv) => cv.eval_usize(cx.tcx, cx.param_env),
Err(ErrorHandled::Reported) => 0,
Err(ErrorHandled::TooGeneric) => {
let span = cx.tcx.def_span(def_id);
cx.tcx
.sess
.span_err(span, "array lengths can't depend on generic parameters");
0
}
};
let count = match cx.tcx.const_eval_resolve(
ty::ParamEnv::reveal_all(),
def_id,
substs,
None,
Some(span),
) {
Ok(cv) => cv.eval_usize(cx.tcx, ty::ParamEnv::reveal_all()),
Err(ErrorHandled::Reported) => 0,
Err(ErrorHandled::TooGeneric) => {
let span = cx.tcx.def_span(def_id);
cx.tcx.sess.span_err(span, "array lengths can't depend on generic parameters");
0
}
};

ExprKind::Repeat { value: v.to_ref(), count }
}
Expand Down
25 changes: 25 additions & 0 deletions src/test/ui/consts/associated_const_generic.rs
@@ -0,0 +1,25 @@
// check-pass

trait TraitA {
const VALUE: usize;
}

struct A;
impl TraitA for A {
const VALUE: usize = 1;
}

trait TraitB {
type MyA: TraitA;
const VALUE: usize = Self::MyA::VALUE;
}

struct B;
impl TraitB for B {
type MyA = A;
}

fn main() {
let _ = [0; A::VALUE];
let _ = [0; B::VALUE]; // Indirectly refers to `A::VALUE`
}

0 comments on commit eed0d33

Please sign in to comment.