[llvm] r362454 - Fix DWARF DebugInfo unit test errors when cross-compiling
Jason Liu via llvm-commits
llvm-commits at lists.llvm.org
Mon Jun 3 15:22:03 PDT 2019
Author: jasonliu
Date: Mon Jun 3 15:22:03 2019
New Revision: 362454
URL: http://llvm.org/viewvc/llvm-project?rev=362454&view=rev
Log:
Fix DWARF DebugInfo unit test errors when cross-compiling
Summary:
When building with a Default Target set we can experience issues
in the DWARF DebugInfo unit tests because:
They assume we can generate object files for the host platform.
Some tests assume the endianess of the target we are generating
DWARF for and the host match.
This patch correct these issues by ensuring the tests which
generate objects in memory are run with respect to
LVM_DEFAULT_TARGET_TRIPLE and it's endianess.
We also make sure we don't use the hosts address size for line test
and split the triple util function in DwarfUtils into a version
that takes an address size and one that doesn't.
See also for discussion:
http://lists.llvm.org/pipermail/llvm-dev/2019-March/131212.html
Patch by: daltenty
Differential Revision: https://reviews.llvm.org/D62084
Modified:
llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp
llvm/trunk/unittests/DebugInfo/DWARF/DwarfUtils.cpp
llvm/trunk/unittests/DebugInfo/DWARF/DwarfUtils.h
Modified: llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp?rev=362454&r1=362453&r2=362454&view=diff
==============================================================================
--- llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp (original)
+++ llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp Mon Jun 3 15:22:03 2019
@@ -41,7 +41,7 @@ namespace {
template <uint16_t Version, class AddrType, class RefAddrType>
void TestAllForms() {
- Triple Triple = getHostTripleForAddrSize(sizeof(AddrType));
+ Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
if (!isConfigurationSupported(Triple))
return;
@@ -455,7 +455,7 @@ TEST(DWARFDebugInfo, TestDWARF32Version5
}
template <uint16_t Version, class AddrType> void TestChildren() {
- Triple Triple = getHostTripleForAddrSize(sizeof(AddrType));
+ Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
if (!isConfigurationSupported(Triple))
return;
@@ -585,7 +585,7 @@ TEST(DWARFDebugInfo, TestDWARF32Version4
}
template <uint16_t Version, class AddrType> void TestReferences() {
- Triple Triple = getHostTripleForAddrSize(sizeof(AddrType));
+ Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
if (!isConfigurationSupported(Triple))
return;
@@ -835,7 +835,7 @@ TEST(DWARFDebugInfo, TestDWARF32Version4
}
template <uint16_t Version, class AddrType> void TestAddresses() {
- Triple Triple = getHostTripleForAddrSize(sizeof(AddrType));
+ Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
if (!isConfigurationSupported(Triple))
return;
@@ -1007,7 +1007,7 @@ TEST(DWARFDebugInfo, TestDWARF32Version4
}
TEST(DWARFDebugInfo, TestStringOffsets) {
- Triple Triple = getHostTripleForAddrSize(sizeof(void *));
+ Triple Triple = getNormalizedDefaultTargetTriple();
if (!isConfigurationSupported(Triple))
return;
@@ -1071,7 +1071,7 @@ TEST(DWARFDebugInfo, TestStringOffsets)
}
TEST(DWARFDebugInfo, TestEmptyStringOffsets) {
- Triple Triple = getHostTripleForAddrSize(sizeof(void *));
+ Triple Triple = getNormalizedDefaultTargetTriple();
if (!isConfigurationSupported(Triple))
return;
@@ -1100,7 +1100,7 @@ TEST(DWARFDebugInfo, TestEmptyStringOffs
}
TEST(DWARFDebugInfo, TestRelations) {
- Triple Triple = getHostTripleForAddrSize(sizeof(void *));
+ Triple Triple = getNormalizedDefaultTargetTriple();
if (!isConfigurationSupported(Triple))
return;
@@ -1287,7 +1287,7 @@ TEST(DWARFDebugInfo, TestDWARFDie) {
}
TEST(DWARFDebugInfo, TestChildIterators) {
- Triple Triple = getHostTripleForAddrSize(sizeof(void *));
+ Triple Triple = getNormalizedDefaultTargetTriple();
if (!isConfigurationSupported(Triple))
return;
@@ -1401,7 +1401,7 @@ TEST(DWARFDebugInfo, TestEmptyChildren)
}
TEST(DWARFDebugInfo, TestAttributeIterators) {
- Triple Triple = getHostTripleForAddrSize(sizeof(void *));
+ Triple Triple = getNormalizedDefaultTargetTriple();
if (!isConfigurationSupported(Triple))
return;
@@ -1463,7 +1463,7 @@ TEST(DWARFDebugInfo, TestAttributeIterat
}
TEST(DWARFDebugInfo, TestFindRecurse) {
- Triple Triple = getHostTripleForAddrSize(sizeof(void *));
+ Triple Triple = getNormalizedDefaultTargetTriple();
if (!isConfigurationSupported(Triple))
return;
@@ -1677,7 +1677,7 @@ TEST(DWARFDebugInfo, TestDwarfToFunction
}
TEST(DWARFDebugInfo, TestFindAttrs) {
- Triple Triple = getHostTripleForAddrSize(sizeof(void *));
+ Triple Triple = getNormalizedDefaultTargetTriple();
if (!isConfigurationSupported(Triple))
return;
@@ -1740,7 +1740,7 @@ TEST(DWARFDebugInfo, TestFindAttrs) {
}
TEST(DWARFDebugInfo, TestImplicitConstAbbrevs) {
- Triple Triple = getHostTripleForAddrSize(sizeof(void *));
+ Triple Triple = getNormalizedDefaultTargetTriple();
if (!isConfigurationSupported(Triple))
return;
Modified: llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp?rev=362454&r1=362453&r2=362454&view=diff
==============================================================================
--- llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp (original)
+++ llvm/trunk/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp Mon Jun 3 15:22:03 2019
@@ -37,7 +37,7 @@ struct CommonFixture {
}
bool setupGenerator(uint16_t Version = 4) {
- Triple T = getHostTripleForAddrSize(8);
+ Triple T = getDefaultTargetTripleForAddrSize(8);
if (!isConfigurationSupported(T))
return false;
auto ExpectedGenerator = Generator::create(T, Version);
@@ -50,8 +50,9 @@ struct CommonFixture {
Context = createContext();
assert(Context != nullptr && "test state is not valid");
const DWARFObject &Obj = Context->getDWARFObj();
- LineData = DWARFDataExtractor(Obj, Obj.getLineSection(),
- sys::IsLittleEndianHost, 8);
+ LineData = DWARFDataExtractor(
+ Obj, Obj.getLineSection(),
+ getDefaultTargetTripleForAddrSize(8).isLittleEndian(), 8);
}
std::unique_ptr<DWARFContext> createContext() {
Modified: llvm/trunk/unittests/DebugInfo/DWARF/DwarfUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/DWARF/DwarfUtils.cpp?rev=362454&r1=362453&r2=362454&view=diff
==============================================================================
--- llvm/trunk/unittests/DebugInfo/DWARF/DwarfUtils.cpp (original)
+++ llvm/trunk/unittests/DebugInfo/DWARF/DwarfUtils.cpp Mon Jun 3 15:22:03 2019
@@ -9,6 +9,7 @@
#include "DwarfUtils.h"
#include "llvm/ADT/Triple.h"
#include "llvm/Config/llvm-config.h"
+#include "llvm/Support/Host.h"
#include "llvm/Support/TargetRegistry.h"
#include "llvm/Support/TargetSelect.h"
@@ -25,9 +26,20 @@ static void initLLVMIfNeeded() {
}
}
-Triple llvm::dwarf::utils::getHostTripleForAddrSize(uint8_t AddrSize) {
- Triple T(Triple::normalize(LLVM_HOST_TRIPLE));
+Triple llvm::dwarf::utils::getNormalizedDefaultTargetTriple() {
+ Triple T(Triple::normalize(sys::getDefaultTargetTriple()));
+ return T;
+}
+
+Triple llvm::dwarf::utils::getDefaultTargetTripleForAddrSize(uint8_t AddrSize) {
+ Triple T = getNormalizedDefaultTargetTriple();
+
+ assert((AddrSize == 4 || AddrSize == 8) &&
+ "Only 32-bit/64-bit address size variants are supported");
+
+ // If a 32-bit/64-bit address size was specified, try to convert the triple
+ // if it is for the wrong variant.
if (AddrSize == 8 && T.isArch32Bit())
return T.get64BitArchVariant();
if (AddrSize == 4 && T.isArch64Bit())
Modified: llvm/trunk/unittests/DebugInfo/DWARF/DwarfUtils.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/DebugInfo/DWARF/DwarfUtils.h?rev=362454&r1=362453&r2=362454&view=diff
==============================================================================
--- llvm/trunk/unittests/DebugInfo/DWARF/DwarfUtils.h (original)
+++ llvm/trunk/unittests/DebugInfo/DWARF/DwarfUtils.h Mon Jun 3 15:22:03 2019
@@ -18,7 +18,8 @@ class Triple;
namespace dwarf {
namespace utils {
-Triple getHostTripleForAddrSize(uint8_t AddrSize);
+Triple getDefaultTargetTripleForAddrSize(uint8_t AddrSize);
+Triple getNormalizedDefaultTargetTriple();
bool isConfigurationSupported(Triple &T);
} // end namespace utils
More information about the llvm-commits
mailing list