Changeset b4a835d for src/Common

Timestamp:

May 8, 2018, 9:27:25 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

df22130

Parents:

3d60c08 (diff), afd550c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/Common

Files:

• Heap.cc (modified) (2 diffs)
• PassVisitor.proto.h (modified) (4 diffs)

src/Common/Heap.cc

@@ -130 +130 @@
                                 abort();
                         }
-#endif
+#endif // RTLD_NEXT
                 } // if
 
@@ -144 +144 @@
                 fptr = (generic_fptr_t)dlsym( library, symbol );
 #endif // _GNU_SOURCE
+
+                error = dlerror();
+                if ( error ) {
+                        std::cerr << "interpose_symbol : internal error, " << error << std::endl;
+                        abort();
+                }
+
+                return fptr;
+        }
 
         extern "C" {

src/Common/PassVisitor.proto.h

@@ -47 +47 @@
 
         operator bool() { return m_ref ? *m_ref : true; }
-        bool operator=( bool val ) { return *m_ref = val; }
+        bool operator=( bool val ) { assert(m_ref); return *m_ref = val; }
 
 private:
@@ -53 +53 @@
         friend class ChildrenGuard;
 
-        bool * set( bool & val ) {
+        bool * set( bool * val ) {
                 bool * prev = m_ref;
-                m_ref = &val;
+                m_ref = val;
                 return prev;
         }
@@ -67 +67 @@
         ChildrenGuard( bool_ref * ref )
                 : m_val ( true )
-                , m_prev( ref ? ref->set( m_val ) : nullptr )
+                , m_prev( ref ? ref->set( &m_val ) : nullptr )
                 , m_ref ( ref )
         {}
@@ -73 +73 @@
         ~ChildrenGuard() {
                 if( m_ref ) {
-                        m_ref->set( *m_prev );
+                        m_ref->set( m_prev );
                 }
         }