Changeset 10cfad9 for src

Timestamp:

May 7, 2018, 5:22:37 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

14a61b5

Parents:

b6d7f44

Message:

Fixed bad merge

File:

• src/Common/Heap.cc (modified) (2 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" {