Skip to content

Commit f8e67c4

Browse files
committed
Revert "[DWARFLinker] Handle DW_OP_GNU_push_tls_address while check for variable location."
This reverts commit e897384.
1 parent 41717fd commit f8e67c4

File tree

2 files changed

+2
-199
lines changed

2 files changed

+2
-199
lines changed

llvm/lib/DWARFLinker/DWARFLinker.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -420,11 +420,6 @@ void DWARFLinker::cleanupAuxiliarryData(LinkContext &Context) {
420420
DIEAlloc.Reset();
421421
}
422422

423-
static bool isTlsAddressCode(uint8_t DW_OP_Code) {
424-
return DW_OP_Code == dwarf::DW_OP_form_tls_address ||
425-
DW_OP_Code == dwarf::DW_OP_GNU_push_tls_address;
426-
}
427-
428423
std::optional<int64_t>
429424
DWARFLinker::getVariableRelocAdjustment(AddressesMap &RelocMgr,
430425
const DWARFDie &DIE) {
@@ -476,7 +471,8 @@ DWARFLinker::getVariableRelocAdjustment(AddressesMap &RelocMgr,
476471
case dwarf::DW_OP_const8u:
477472
case dwarf::DW_OP_const4s:
478473
case dwarf::DW_OP_const8s:
479-
if (NextIt == Expression.end() || !isTlsAddressCode(NextIt->getCode()))
474+
if (NextIt == Expression.end() ||
475+
NextIt->getCode() != dwarf::DW_OP_form_tls_address)
480476
break;
481477
[[fallthrough]];
482478
case dwarf::DW_OP_addr: {

llvm/test/tools/dsymutil/X86/tls-variable.test

Lines changed: 0 additions & 193 deletions
This file was deleted.

0 commit comments

Comments
 (0)