From 9d2c0a7f6a1ac90b4feecf60e5599705a4d5cdf2 Mon Sep 17 00:00:00 2001 From: LIU JIE Date: Fri, 23 Feb 2024 11:34:31 +0800 Subject: [PATCH] feat: add env configuration for resolve depth (#228) --- pilota-build/src/codegen/workspace.rs | 5 ++--- pilota-build/src/lib.rs | 7 +++++++ pilota-build/src/middle/context.rs | 5 ++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pilota-build/src/codegen/workspace.rs b/pilota-build/src/codegen/workspace.rs index 4a0d2305..d24e8932 100644 --- a/pilota-build/src/codegen/workspace.rs +++ b/pilota-build/src/codegen/workspace.rs @@ -12,7 +12,7 @@ use crate::{ fmt::fmt_file, middle::context::{CrateId, DefLocation}, rir::{self, ItemPath}, - Codegen, CodegenBackend, Context, DefId, + Codegen, CodegenBackend, Context, DefId, MAX_RESOLVE_DEPTH, }; #[derive(Clone)] @@ -161,7 +161,6 @@ where fn collect_def_ids(&self, input: &[DefId]) -> FxHashMap { use crate::middle::ty::Visitor; - const MAX_RECURSION_DEPTH: usize = 64; struct PathCollector<'a> { map: &'a mut FxHashMap, cx: &'a Context, @@ -180,7 +179,7 @@ where map: &mut FxHashMap, mut depth: usize, ) { - if map.contains_key(&def_id) || depth > MAX_RECURSION_DEPTH { + if map.contains_key(&def_id) || depth > *MAX_RESOLVE_DEPTH { return; } depth += 1; diff --git a/pilota-build/src/lib.rs b/pilota-build/src/lib.rs index 09ca7cac..489b0c37 100644 --- a/pilota-build/src/lib.rs +++ b/pilota-build/src/lib.rs @@ -50,6 +50,13 @@ use salsa::Durability; pub use symbol::{DefId, IdentName}; pub use tags::TagId; +lazy_static::lazy_static! { + pub(crate) static ref MAX_RESOLVE_DEPTH: usize = std::env::var("MAX_RESOLVE_DEPTH") + .ok() + .and_then(|s| s.parse().ok()) + .unwrap_or(256); +} + pub trait MakeBackend: Sized { type Target: CodegenBackend; fn make_backend(self, context: Context) -> Self::Target; diff --git a/pilota-build/src/middle/context.rs b/pilota-build/src/middle/context.rs index bb34e34e..c624ccaf 100644 --- a/pilota-build/src/middle/context.rs +++ b/pilota-build/src/middle/context.rs @@ -22,7 +22,7 @@ use crate::{ symbol::{DefId, FileId, IdentName, Symbol}, tags::{EnumMode, TagId, Tags}, ty::{AdtDef, AdtKind, CodegenTy, Visitor}, - Plugin, + Plugin, MAX_RESOLVE_DEPTH, }; #[derive(Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Clone)] @@ -272,7 +272,6 @@ impl ContextBuilder { &self, input: &[DefId], ) -> FxHashMap { - const MAX_RECURSION_DEPTH: usize = 64; struct PathCollector<'a> { map: &'a mut FxHashMap, cx: &'a ContextBuilder, @@ -291,7 +290,7 @@ impl ContextBuilder { map: &mut FxHashMap, mut depth: usize, ) { - if map.contains_key(&def_id) || depth > MAX_RECURSION_DEPTH { + if map.contains_key(&def_id) || depth > *MAX_RESOLVE_DEPTH { return; } depth += 1;