max/lean4-htt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix(attribute_manager): finalization problem

Browse source 
Global variables must be simple types. Reason: the finalization of
global objects in different compilation units is not specified by the
standard. The only exception is the global at src/shared/init.cpp.
It is used to automatically initialize the lean shared library.

Before this commit, attribute_manager used a std::unique_ptr in a global
variable. The test shared_test was crashing in one of my machines
because a different finalization order was being used.
This commit is contained in:
Leonardo de Moura 2016-12-20 09:50:10 -08:00
parent 516f45428d
commit 127ecff79c
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/library/attribute_manager.cpp
View file

@ -14,10 +14,9 @@ Author: Leonardo de Moura
#include "library/scoped_ext.h"
namespace lean {
static name_map<attribute_ptr> * g_system_attributes;
static std::unique_ptr<user_attribute_ext> g_user_attribute_ext;
static attr_data_ptr * g_default_attr_data_ptr = nullptr;
static name_map<attribute_ptr> * g_system_attributes = nullptr;
static user_attribute_ext * g_user_attribute_ext = nullptr;
static attr_data_ptr * g_default_attr_data_ptr = nullptr;
attr_data_ptr get_default_attr_data() {
return *g_default_attr_data_ptr;
@ -27,7 +26,8 @@ name_map<attribute_ptr> user_attribute_ext::get_attributes(environment const &)
return {};
}
void set_user_attribute_ext(std::unique_ptr<user_attribute_ext> ext) {
g_user_attribute_ext = std::move(ext);
if (g_user_attribute_ext) delete g_user_attribute_ext;
g_user_attribute_ext = ext.release();
}
static std::vector<pair<name, name>> * g_incomp = nullptr;
@ -273,10 +273,10 @@ unsigned get_attribute_fingerprint(environment const & env, name const & attr) {
void initialize_attribute_manager() {
g_default_attr_data_ptr = new attr_data_ptr(new attr_data);
g_system_attributes = new name_map<attribute_ptr>();
g_user_attribute_ext.reset(new user_attribute_ext());
g_incomp = new std::vector<pair<name, name>>();
g_key = new std::string("ATTR");
g_system_attributes = new name_map<attribute_ptr>();
g_user_attribute_ext = new user_attribute_ext();
g_incomp = new std::vector<pair<name, name>>();
g_key = new std::string("ATTR");
attribute_ext::initialize();
}
@ -284,7 +284,7 @@ void finalize_attribute_manager() {
attribute_ext::finalize();
delete g_key;
delete g_incomp;
g_user_attribute_ext.reset();
delete g_user_attribute_ext;
delete g_system_attributes;
delete g_default_attr_data_ptr;
}

1
src/library/attribute_manager.h
View file

@ -265,6 +265,7 @@ typedef typed_attribute<key_value_data> key_value_attribute;
class user_attribute_ext {
public:
virtual ~user_attribute_ext() {}
virtual name_map<attribute_ptr> get_attributes(environment const & env);
virtual void write_entry(serializer &, attr_data const &) {}
virtual attr_data_ptr read_entry(deserializer &) {