diff options
| author | bors <bors@rust-lang.org> | 2022-12-12 16:00:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-12 16:00:14 +0000 |
| commit | 69f9c33d71c871fc16ac445211281c6e7a340943 (patch) | |
| tree | 348cdcec6049f68be8c2618d727b2facd1ccb857 /compiler | |
| parent | 0040709e39bfa159d099ee14628ad4ac72f91406 (diff) | |
| parent | c9aa73c3b141d04aeffe7ff359f0fe2d642ff2b1 (diff) | |
| download | rust-1.66.0.tar.gz rust-1.66.0.zip | |
Auto merge of #105563 - pietroalbini:pa-stable-1.66.0, r=pietroalbini 1.66.0
[stable] Prepare 1.66.0 release This PR prepares the artifacts for the 1.66.0 release. The following PRs have been backported: * #104782 * #105023 * #104558 * #104610 * #103989 * #104650 * #105539 * #105477 r? `@ghost`
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_middle/src/middle/limits.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_passes/src/reachable.rs | 11 | ||||
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/project.rs | 15 |
3 files changed, 12 insertions, 16 deletions
diff --git a/compiler/rustc_middle/src/middle/limits.rs b/compiler/rustc_middle/src/middle/limits.rs index 53c4d926784..12aef66bcf9 100644 --- a/compiler/rustc_middle/src/middle/limits.rs +++ b/compiler/rustc_middle/src/middle/limits.rs @@ -38,7 +38,7 @@ pub fn provide(providers: &mut ty::query::Providers) { tcx.hir().krate_attrs(), tcx.sess, sym::const_eval_limit, - 1_000_000, + 2_000_000, ), } } diff --git a/compiler/rustc_passes/src/reachable.rs b/compiler/rustc_passes/src/reachable.rs index 10d5fc5d671..50070869ad9 100644 --- a/compiler/rustc_passes/src/reachable.rs +++ b/compiler/rustc_passes/src/reachable.rs @@ -116,6 +116,17 @@ impl<'tcx> Visitor<'tcx> for ReachableContext<'tcx> { intravisit::walk_expr(self, expr) } + + fn visit_inline_asm(&mut self, asm: &'tcx hir::InlineAsm<'tcx>, id: hir::HirId) { + for (op, _) in asm.operands { + if let hir::InlineAsmOperand::SymStatic { def_id, .. } = op { + if let Some(def_id) = def_id.as_local() { + self.reachable_symbols.insert(def_id); + } + } + } + intravisit::walk_inline_asm(self, asm, id); + } } impl<'tcx> ReachableContext<'tcx> { diff --git a/compiler/rustc_trait_selection/src/traits/project.rs b/compiler/rustc_trait_selection/src/traits/project.rs index 46a10d21c78..e4284b9d337 100644 --- a/compiler/rustc_trait_selection/src/traits/project.rs +++ b/compiler/rustc_trait_selection/src/traits/project.rs @@ -565,21 +565,6 @@ impl<'a, 'b, 'tcx> TypeFolder<'tcx> for AssocTypeNormalizer<'a, 'b, 'tcx> { .flatten() .unwrap_or_else(|| ty.super_fold_with(self).into()) }; - // For cases like #95134 we would like to catch overflows early - // otherwise they slip away and cause ICE. - let recursion_limit = self.tcx().recursion_limit(); - if !recursion_limit.value_within_limit(self.depth) - // HACK: Don't overflow when running cargo doc see #100991 - && !self.tcx().sess.opts.actually_rustdoc - { - let obligation = Obligation::with_depth( - self.cause.clone(), - recursion_limit.0, - self.param_env, - ty, - ); - self.selcx.infcx().err_ctxt().report_overflow_error(&obligation, true); - } debug!( ?self.depth, ?ty, |
