Merge pull request swiftlang#11115 from bulbazord/6.2-tls-fix

[lldb] Fix TLS support on Darwin platforms

Author: JDevlieghere

lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp

@@ -1173,9 +1173,8 @@ DynamicLoaderDarwin::GetThreadLocalData(const lldb::ModuleSP module_sp,
   //  size_t offset;
   // }
   //
-  // The strategy is to take get_addr, call it with the address of the
-  // containing TLS_Thunk structure, and add the offset to the resulting
-  // pointer to get the data block.
+  // The strategy is to take get_addr and call it with the address of the
+  // containing TLS_Thunk structure.
   //
   // On older apple platforms, the key is treated as a pthread_key_t and passed
   // to pthread_getspecific. The pointer returned from that call is added to
@@ -1204,7 +1203,7 @@ DynamicLoaderDarwin::GetThreadLocalData(const lldb::ModuleSP module_sp,
       const addr_t tls_data = evaluate_tls_address(
           thunk_load_addr, llvm::ArrayRef<addr_t>(tls_load_addr));
       if (tls_data != LLDB_INVALID_ADDRESS)
-        return tls_data + tls_offset;
+        return tls_data;
     }
   }
 

lldb/test/API/lang/c/tls_globals/TestTlsGlobals.py

@@ -73,6 +73,11 @@ def test(self):
             VARIABLES_DISPLAYED_CORRECTLY,
             patterns=["\(int\) \$.* = 88"],
         )
+        self.expect(
+            "expr var_static2",
+            VARIABLES_DISPLAYED_CORRECTLY,
+            patterns=[r"\(int\) \$.* = 66"],
+        )
         self.expect(
             "expr var_shared",
             VARIABLES_DISPLAYED_CORRECTLY,
@@ -104,6 +109,11 @@ def test(self):
             VARIABLES_DISPLAYED_CORRECTLY,
             patterns=["\(int\) \$.* = 44"],
         )
+        self.expect(
+            "expr var_static2",
+            VARIABLES_DISPLAYED_CORRECTLY,
+            patterns=[r"\(int\) \$.* = 22"],
+        )
         self.expect(
             "expr var_shared",
             VARIABLES_DISPLAYED_CORRECTLY,

lldb/test/API/lang/c/tls_globals/main.c

@@ -10,10 +10,12 @@ touch_shared();
 
 // Create some TLS storage within the static executable.
 __thread int var_static = 44;
+__thread int var_static2 = 22;
 
 void *fn_static(void *param)
 {
 	var_static *= 2;
+	var_static2 *= 3;
 	shared_check();
 	usleep(1); // thread breakpoint
 	for(;;)