bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #79445 - SNCPlay42:struct-tail-recursion-limit, r=oli-obk

Browse source 
check the recursion limit when finding a struct's tail

fixes #79437

This does a `delay_span_bug` (via `ty_error_with_message`) rather than emit a new error message, under the assumption that there will be an error elsewhere (even if the type isn't infinitely recursive, just deeper than the recursion limit, this appears to be the case).
This commit is contained in:
bors 2020-12-05 15:58:06 +00:00
commit 5bb68c31f8
3 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_middle/src/ty/util.rs
View file

@ -18,7 +18,7 @@ use rustc_hir as hir;
use rustc_hir::def::DefKind;
use rustc_hir::def_id::DefId;
use rustc_macros::HashStable;
use rustc_span::Span;
use rustc_span::{Span, DUMMY_SP};
use rustc_target::abi::{Integer, Size, TargetDataLayout};
use smallvec::SmallVec;
use std::{cmp, fmt};
@ -221,7 +221,13 @@ impl<'tcx> TyCtxt<'tcx> {
mut ty: Ty<'tcx>,
normalize: impl Fn(Ty<'tcx>) -> Ty<'tcx>,
) -> Ty<'tcx> {
loop {
for iteration in 0.. {
if !self.sess.recursion_limit().value_within_limit(iteration) {
return self.ty_error_with_message(
DUMMY_SP,
&format!("reached the recursion limit finding the struct tail for {}", ty),
);
}
match *ty.kind() {
ty::Adt(def, substs) => {
if !def.is_struct() {