Merge remote-tracking branch 'upstream/master' into windows

dyninst · Jun 21, 2016 · bbcacd2 · bbcacd2
2 parents cbd6e39 + d1b4334
commit bbcacd2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/dyninstAPI_RT/src/RTcommon.c b/dyninstAPI_RT/src/RTcommon.c
@@ -117,10 +117,17 @@ int fakeTickCount;
 #ifdef _MSC_VER
 #define TLS_VAR __declspec(thread)
 #else
-#define TLS_VAR __thread
+// Note, the initial-exec model gives us static TLS which can be accessed
+// directly, unlike dynamic TLS that calls __tls_get_addr().  Such calls risk
+// recursing back to us if they're also instrumented, ad infinitum.  Static TLS
+// must be used very sparingly though, because it is a limited resource.
+// *** This case is very special -- do not use IE in general libraries! ***
+#define TLS_VAR __thread __attribute__ ((tls_model("initial-exec")))
 #endif
 
-TLS_VAR int DYNINST_tls_tramp_guard = 1;
+// It's tempting to make this a char, but glibc < 2.17 hits a bug:
+//   https://sourceware.org/bugzilla/show_bug.cgi?id=14898
+static TLS_VAR short DYNINST_tls_tramp_guard = 1;
 
 DLLEXPORT int DYNINST_lock_tramp_guard()
 {

diff --git a/symtabAPI/src/Object-elf.C b/symtabAPI/src/Object-elf.C
@@ -2433,7 +2433,7 @@ bool Object::fix_global_symbol_modules_static_dwarf()
     Dwarf_Debug *dbg_ptr = dwarf->type_dbg();
     if (!dbg_ptr)
         return false;
-    Dwarf_Debug &dbg = *dbg_ptr;
+    Dwarf_Debug dbg = *dbg_ptr;
     ModuleFixer m(dbg, this);
     bool result = m.parse();
     freeList.push_back(m.getFreeList());

diff --git a/symtabAPI/src/dwarfWalker.C b/symtabAPI/src/dwarfWalker.C
@@ -73,7 +73,7 @@ using namespace std;
    }
 #define DWARF_CHECK_RET(x) DWARF_CHECK_RET_VAL(x, false)
 
-DwarfWalker::DwarfWalker(Symtab *symtab, Dwarf_Debug &dbg)
+DwarfWalker::DwarfWalker(Symtab *symtab, Dwarf_Debug dbg)
    :
    DwarfParseActions(symtab, dbg),
    srcFileList_(NULL),

diff --git a/symtabAPI/src/dwarfWalker.h b/symtabAPI/src/dwarfWalker.h
@@ -34,7 +34,7 @@ namespace Dyninst {
         class DwarfParseActions {
 
         protected:
-            Dwarf_Debug &dbg() { return dbg_; }
+            Dwarf_Debug dbg() { return dbg_; }
 
 
             Module *& mod() { return mod_; }
@@ -44,9 +44,9 @@ namespace Dyninst {
 
         private:
             Module *mod_;
-            Dwarf_Debug &dbg_;
+            Dwarf_Debug dbg_;
         public:
-            DwarfParseActions(Symtab* s, Dwarf_Debug& d) :
+            DwarfParseActions(Symtab* s, Dwarf_Debug d) :
                     symtab_(s),
                     dbg_(d),
                     mod_(NULL)
@@ -171,7 +171,7 @@ namespace Dyninst {
 
             } Error;
 
-            DwarfWalker(Symtab *symtab, Dwarf_Debug &dbg);
+            DwarfWalker(Symtab *symtab, Dwarf_Debug dbg);
 
             virtual ~DwarfWalker();
             typedef