michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(library/class_instance_resolution): bug in cache validation

Browse source
This commit is contained in:
Leonardo de Moura 2015-10-18 11:50:54 -07:00
parent 343ede3fbe
commit 2c177d595c
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/library/class_instance_resolution.cpp
View file

@ -147,11 +147,16 @@ struct cienv {
}
void reset_cache() {
m_ctx = list<expr>();
expr_struct_map<expr> fresh;
fresh.swap(m_cache);
}
void reset_cache_and_ctx() {
m_ctx = list<expr>();
m_local_instances.clear();
reset_cache();
}
optional<expr> check_cache(expr const & type) const {
if (m_multiple_instances) {
// We do not cache results when multiple instances have to be generated.
@ -185,7 +190,7 @@ struct cienv {
if (m_max_depth != max_depth ||
m_trans_instances != trans_instances ||
m_trace_instances != trace_instances) {
reset_cache();
reset_cache_and_ctx();
}
m_max_depth = max_depth;
m_trans_instances = trans_instances;
@ -193,11 +198,14 @@ struct cienv {
}
void set_env(environment const & env) {
// Remark: We can implement the following potential refinement.
// If env is a descendant of m_env, and env does not add new global instances,
// then we don't need to reset the cache
if (!m_env.is_descendant(m_env) || !m_env.is_descendant(env)) {
m_env = env;
m_not_reducible_pred = mk_not_reducible_pred(m_env);
m_tc_ptr = nullptr;
reset_cache();
reset_cache_and_ctx();
}
if (!m_tc_ptr) {
@ -349,6 +357,11 @@ struct cienv {
i++;
}
}
if (i < m_local_instances.size()) {
// new ctx has fewer local instances than previous one
m_local_instances.resize(i);
reset_cache();
}
}
void set_pos_info(pos_info_provider const * pip, expr const & type) {
@ -1109,18 +1122,18 @@ struct cienv {
MK_THREAD_LOCAL_GET_DEF(cienv, get_cienv);
static void reset_cache() {
get_cienv().reset_cache();
static void reset_cache_and_ctx() {
get_cienv().reset_cache_and_ctx();
}
ci_type_inference_factory_scope::ci_type_inference_factory_scope(ci_type_inference_factory & factory):
m_old(g_factory) {
g_factory = &factory;
reset_cache();
reset_cache_and_ctx();
}
ci_type_inference_factory_scope::~ci_type_inference_factory_scope() {
reset_cache();
reset_cache_and_ctx();
g_factory = m_old;
}