replica
/
diffblue-cbmc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3912 from tautschnig/irept-opt-constructors 

irept constructors to avoid immediate detach() calls
This commit is contained in:
Michael Tautschnig 2019-01-24 16:05:41 +00:00 committed by GitHub
parent 05360c42a1 befaff7001
commit 1a0b770aa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/util/irep.h
View File

@ -169,6 +169,7 @@ public:
bool is_nil() const { return id()==ID_nil; }
bool is_not_nil() const { return id()!=ID_nil; }
#if !defined(USE_MOVE) || !defined(SHARING)
explicit irept(const irep_idt &_id)
#ifdef SHARING
:data(&empty_d)
@ -177,7 +178,27 @@ public:
id(_id);
}
#ifdef SHARING
irept(const irep_idt &_id, const named_subt &_named_sub, const subt &_sub)
#ifdef SHARING
: data(&empty_d)
#endif
{
id(_id);
get_named_sub() = _named_sub;
get_sub() = _sub;
}
#else
explicit irept(irep_idt _id) : data(new dt(std::move(_id)))
{
}
irept(irep_idt _id, named_subt _named_sub, subt _sub)
: data(new dt(std::move(_id), std::move(_named_sub), std::move(_sub)))
{
}
#endif
#ifdef SHARING
// constructor for blank irep
irept():data(&empty_d)
{
@ -335,9 +356,9 @@ public:
private:
friend class irept;
#ifdef SHARING
unsigned ref_count;
#endif
#ifdef SHARING
unsigned ref_count = 1;
#endif
/// This irep_idt is the only place to store data in an irep, other than
/// the mere nesting structure
@ -346,9 +367,9 @@ public:
named_subt named_sub;
subt sub;
#ifdef HASH_CODE
mutable std::size_t hash_code;
#endif
#ifdef HASH_CODE
mutable std::size_t hash_code = 0;
#endif
void clear()
{
@ -370,21 +391,20 @@ public:
#endif
}
#ifdef SHARING
dt():ref_count(1)
#ifdef HASH_CODE
, hash_code(0)
#endif
dt() = default;
#ifdef USE_MOVE
explicit dt(irep_idt _data) : data(std::move(_data))
{
}
#else
dt()
#ifdef HASH_CODE
:hash_code(0)
#endif
dt(irep_idt _data, named_subt _named_sub, subt _sub)
: data(std::move(_data)),
named_sub(std::move(_named_sub)),
sub(std::move(_sub))
{
}
#endif
#endif
};
protected:

13
unit/util/irep.cpp
View File

@ -72,6 +72,19 @@ SCENARIO("irept_memory", "[core][utils][irept]")
}
}
GIVEN("Parts of an irep")
{
irept irep("some_id", {{"some_member", irept("other")}}, {irept("op")});
THEN("It is properly initialized")
{
REQUIRE(irep.id() == "some_id");
REQUIRE(irep.find("some_member") == irept("other"));
REQUIRE(irep.get_sub().size() == 1);
REQUIRE(irep.get_sub().front() == irept("op"));
}
}
GIVEN("An initialized irep")
{
irept irep("some_id");