Merge pull request #4163 from adrian-prantl/91007207-1

adrian-prantl · web-flow · commit 7850acdeaa15 · 2022-04-04T12:58:14.000-07:00
Prevent GetAugmentedArchSpec() from attaching "unknown" environments
diff --git a/lldb/source/Host/common/HostInfoBase.cpp b/lldb/source/Host/common/HostInfoBase.cpp
@@ -205,7 +205,8 @@ ArchSpec HostInfoBase::GetAugmentedArchSpec(llvm::StringRef triple) {
     normalized_triple.setVendor(host_triple.getVendor());
   if (normalized_triple.getOSName().empty())
     normalized_triple.setOS(host_triple.getOS());
-  if (normalized_triple.getEnvironmentName().empty())
+  if (normalized_triple.getEnvironmentName().empty() &&
+      !host_triple.getEnvironmentName().empty())
     normalized_triple.setEnvironment(host_triple.getEnvironment());
   return ArchSpec(normalized_triple);
 }
diff --git a/lldb/unittests/Host/HostInfoTest.cpp b/lldb/unittests/Host/HostInfoTest.cpp
@@ -43,6 +43,9 @@ TEST_F(HostInfoTest, GetAugmentedArchSpec) {
   // Test LLDB_ARCH_DEFAULT
   EXPECT_EQ(HostInfo::GetAugmentedArchSpec(LLDB_ARCH_DEFAULT).GetTriple(),
             HostInfo::GetArchitecture(HostInfo::eArchKindDefault).GetTriple());
+  EXPECT_NE(
+      HostInfo::GetAugmentedArchSpec("armv7k").GetTriple().getEnvironmentName(),
+      "unknown");
 }
 
 TEST_F(HostInfoTest, GetHostname) {

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,9 @@ TEST_F(HostInfoTest, GetAugmentedArchSpec) {`
`43`	`43`	`// Test LLDB_ARCH_DEFAULT`
`44`	`44`	`EXPECT_EQ(HostInfo::GetAugmentedArchSpec(LLDB_ARCH_DEFAULT).GetTriple(),`
`45`	`45`	`HostInfo::GetArchitecture(HostInfo::eArchKindDefault).GetTriple());`
	`46`	`+ EXPECT_NE(`
	`47`	`+ HostInfo::GetAugmentedArchSpec("armv7k").GetTriple().getEnvironmentName(),`
	`48`	`+ "unknown");`
`46`	`49`	`}`
`47`	`50`
`48`	`51`	`TEST_F(HostInfoTest, GetHostname) {`