mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Code Activity

remove reinterpret cast occurrences that require disabling strict alias analysis #987 #1210

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-08-17 20:28:49 -07:00
parent 43c2ccb29a
commit ff47c8632b
5 changed files with 24 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/util/array_map.h
View file

@ -63,10 +63,7 @@ class array_map {
}
void really_flush() {
typename vector<optional<entry> >::iterator it = m_map.begin();
typename vector<optional<entry> >::iterator end = m_map.end();
for (; it != end; ++it) {
optional<entry> & e = *it;
for (optional<entry> & e : m_map) {
if (e) {
m_plugin.del_eh(e->m_key, e->m_data);
e.set_invalid();

19
src/util/optional.h
View file

@ -23,24 +23,25 @@ Revision History:
template<typename T>
class optional {
char m_obj[sizeof(T)];
T* m_obj;
char m_initialized;
void construct(const T & val) {
m_initialized = 1;
new (reinterpret_cast<void *>(m_obj)) T(val);
m_obj = alloc(T, val);
}
void destroy() {
if (m_initialized == 1) {
reinterpret_cast<T *>(m_obj)->~T();
dealloc(m_obj);
m_obj = 0;
}
m_initialized = 0;
}
public:
optional():
m_initialized(0) {}
m_obj(0), m_initialized(0) {}
explicit optional(const T & val) {
construct(val);
@ -65,7 +66,7 @@ public:
T * get() const {
if (m_initialized == 1) {
return reinterpret_cast<T *>(m_obj);
return m_obj;
}
else {
return 0;
@ -80,22 +81,22 @@ public:
T * operator->() {
SASSERT(m_initialized==1);
return reinterpret_cast<T *>(m_obj);
return m_obj;
}
T const * operator->() const {
SASSERT(m_initialized==1);
return reinterpret_cast<T const *>(m_obj);
return m_obj;
}
const T & operator*() const {
SASSERT(m_initialized==1);
return *reinterpret_cast<T const*>(m_obj);
return *m_obj;
}
T & operator*() {
SASSERT(m_initialized==1);
return *reinterpret_cast<T *>(m_obj);
return *m_obj;
}
optional & operator=(const T & val) {