Implement clone and update lldb files

royitaqi · royitaqi · commit d6878b1b4d17 · 2025-06-20T20:01:51.000-07:00
diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp
@@ -642,7 +642,7 @@ bool SBDebugger::GetDefaultArchitecture(char *arch_name, size_t arch_name_len) {
     ArchSpec default_arch = Target::GetDefaultArchitecture();
 
     if (default_arch.IsValid()) {
-      const std::string &triple_str = default_arch.GetTriple().str(false);
+      const std::string &triple_str = default_arch.GetTriple().clone(true, false).str();
       if (!triple_str.empty())
         ::snprintf(arch_name, arch_name_len, "%s", triple_str.c_str());
       else
diff --git a/lldb/source/API/SBModule.cpp b/lldb/source/API/SBModule.cpp
@@ -576,7 +576,7 @@ const char *SBModule::GetTriple() {
   if (!module_sp)
     return nullptr;
 
-  std::string triple(module_sp->GetArchitecture().GetTriple().str(false));
+  std::string triple(module_sp->GetArchitecture().GetTriple().clone(true, false).str());
   // Unique the string so we don't run into ownership issues since the const
   // strings put the string into the string pool once and the strings never
   // comes out
diff --git a/lldb/source/API/SBModuleSpec.cpp b/lldb/source/API/SBModuleSpec.cpp
@@ -112,7 +112,7 @@ void SBModuleSpec::SetObjectName(const char *name) {
 const char *SBModuleSpec::GetTriple() {
   LLDB_INSTRUMENT_VA(this);
 
-  std::string triple(m_opaque_up->GetArchitecture().GetTriple().str(false));
+  std::string triple(m_opaque_up->GetArchitecture().GetTriple().clone(true, false).str());
   // Unique the string so we don't run into ownership issues since the const
   // strings put the string into the string pool once and the strings never
   // comes out
diff --git a/lldb/source/API/SBTarget.cpp b/lldb/source/API/SBTarget.cpp
@@ -1576,7 +1576,7 @@ const char *SBTarget::GetTriple() {
   LLDB_INSTRUMENT_VA(this);
 
   if (TargetSP target_sp = GetSP()) {
-    std::string triple(target_sp->GetArchitecture().GetTriple().str(false));
+    std::string triple(target_sp->GetArchitecture().GetTriple().clone(true, false).str());
     // Unique the string so we don't run into ownership issues since the const
     // strings put the string into the string pool once and the strings never
     // comes out
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
@@ -1612,7 +1612,7 @@ bool Module::GetIsDynamicLinkEditor() {
 uint32_t Module::Hash() {
   std::string identifier;
   llvm::raw_string_ostream id_strm(identifier);
-  id_strm << m_arch.GetTriple().str(false) << '-' << m_file.GetPath();
+  id_strm << m_arch.GetTriple().clone(true, false).str() << '-' << m_file.GetPath();
   if (m_object_name)
     id_strm << '(' << m_object_name << ')';
   if (m_object_offset > 0)
@@ -1626,7 +1626,7 @@ uint32_t Module::Hash() {
 std::string Module::GetCacheKey() {
   std::string key;
   llvm::raw_string_ostream strm(key);
-  strm << m_arch.GetTriple().str(false) << '-' << m_file.GetFilename();
+  strm << m_arch.GetTriple().clone(true, false).str() << '-' << m_file.GetFilename();
   if (m_object_name)
     strm << '(' << m_object_name << ')';
   strm << '-' << llvm::format_hex(Hash(), 10);
diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
@@ -498,7 +498,7 @@ DynamicLoaderDarwinKernel::CheckForKernelImageAtAddress(lldb::addr_t addr,
             log,
             "DynamicLoaderDarwinKernel::CheckForKernelImageAtAddress: "
             "kernel binary image found at 0x%" PRIx64 " with arch '%s' %s",
-            addr, kernel_arch.GetTriple().str(false).c_str(), uuid_str.c_str());
+            addr, kernel_arch.GetTriple().clone(true, false).str().c_str(), uuid_str.c_str());
       }
       return memory_module_sp->GetUUID();
     }
diff --git a/lldb/source/Plugins/DynamicLoader/FreeBSD-Kernel/DynamicLoaderFreeBSDKernel.cpp b/lldb/source/Plugins/DynamicLoader/FreeBSD-Kernel/DynamicLoaderFreeBSDKernel.cpp
@@ -236,7 +236,7 @@ lldb_private::UUID DynamicLoaderFreeBSDKernel::CheckForKernelImageAtAddress(
   LLDB_LOGF(log,
             "DynamicLoaderFreeBSDKernel::CheckForKernelImageAtAddress: "
             "kernel binary image found at 0x%" PRIx64 " with arch '%s' %s",
-            addr, kernel_arch.GetTriple().str(false).c_str(), uuid_str.c_str());
+            addr, kernel_arch.GetTriple().clone(true, false).str().c_str(), uuid_str.c_str());
 
   return memory_module_sp->GetUUID();
 }
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
@@ -509,7 +509,7 @@ static void SetupTargetOpts(CompilerInstance &compiler,
 
   const auto target_machine = target_arch.GetMachine();
   if (target_arch.IsValid()) {
-    std::string triple = target_arch.GetTriple().str(false);
+    std::string triple = target_arch.GetTriple().clone(true, false).str();
     compiler.getTargetOpts().Triple = triple;
     LLDB_LOGF(log, "Using %s as the target triple",
               compiler.getTargetOpts().Triple.c_str());
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
@@ -659,7 +659,7 @@ ClangModulesDeclVendor::Create(Target &target) {
       "-fsyntax-only",
       "-femit-all-decls",
       "-target",
-      arch.GetTriple().str(false),
+      arch.GetTriple().clone(true, false).str(),
       "-fmodules-validate-system-headers",
       "-Werror=non-modular-include-in-framework-module",
       "-Xclang=-fincremental-extensions",
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/CppModuleConfiguration.cpp b/lldb/source/Plugins/ExpressionParser/Clang/CppModuleConfiguration.cpp
@@ -35,8 +35,8 @@ bool CppModuleConfiguration::SetOncePath::TrySet(llvm::StringRef path) {
 static llvm::SmallVector<std::string, 2>
 getTargetIncludePaths(const llvm::Triple &triple) {
   llvm::SmallVector<std::string, 2> paths;
-  if (!triple.str(false).empty()) {
-    paths.push_back("/usr/include/" + triple.str(false));
+  if (!triple.clone(true, false).str().empty()) {
+    paths.push_back("/usr/include/" + triple.clone(true, false).str());
     if (!triple.getArchName().empty() ||
         triple.getOSAndEnvironmentName().empty())
       paths.push_back(("/usr/include/" + triple.getArchName() + "-" +
@@ -75,13 +75,13 @@ bool CppModuleConfiguration::analyzeFile(const FileSpec &f,
       parent_path(posix_dir, Style::posix).ends_with("c++")) {
     if (!m_std_inc.TrySet(posix_dir))
       return false;
-    if (triple.str(false).empty())
+    if (triple.clone(true, false).str().empty())
       return true;
 
     posix_dir.consume_back("c++/v1");
     // Check if this is a target-specific libc++ include directory.
     return m_std_target_inc.TrySet(
-        (posix_dir + triple.str(false) + "/c++/v1").str());
+        (posix_dir + triple.clone(true, false).str() + "/c++/v1").str());
   }
 
   std::optional<llvm::StringRef> inc_path;
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -6746,7 +6746,7 @@ bool ObjectFileMachO::SaveCore(const lldb::ProcessSP &process_sp,
       break;
     default:
       error = Status::FromErrorStringWithFormat(
-          "unsupported core architecture: %s", target_triple.str(false).c_str());
+          "unsupported core architecture: %s", target_triple.clone(true, false).str().c_str());
       break;
     }
 
diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
@@ -354,7 +354,7 @@ Status PlatformRemoteGDBServer::LaunchProcess(ProcessLaunchInfo &launch_info) {
   m_gdb_client_up->SendEnvironment(launch_info.GetEnvironment());
 
   ArchSpec arch_spec = launch_info.GetArchitecture();
-  const char *arch_triple = arch_spec.GetTriple().str(false).c_str();
+  const char *arch_triple = arch_spec.GetTriple().clone(true, false).str().c_str();
 
   m_gdb_client_up->SendLaunchArchPacket(arch_triple);
   LLDB_LOGF(
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -497,8 +497,8 @@ static void ParseLangArgs(LangOptions &Opts, ArchSpec arch) {
 TypeSystemClang::TypeSystemClang(llvm::StringRef name,
                                  llvm::Triple target_triple) {
   m_display_name = name.str();
-  if (!target_triple.str(false).empty())
-    SetTargetTriple(target_triple.str(false));
+  if (!target_triple.clone(true, false).str().empty())
+    SetTargetTriple(target_triple.clone(true, false).str());
   // The caller didn't pass an ASTContext so create a new one for this
   // TypeSystemClang.
   CreateASTContext();
@@ -509,7 +509,7 @@ TypeSystemClang::TypeSystemClang(llvm::StringRef name,
 TypeSystemClang::TypeSystemClang(llvm::StringRef name,
                                  ASTContext &existing_ctxt) {
   m_display_name = name.str();
-  SetTargetTriple(existing_ctxt.getTargetInfo().getTriple().str(false));
+  SetTargetTriple(existing_ctxt.getTargetInfo().getTriple().clone(true, false).str());
 
   m_ast_up.reset(&existing_ctxt);
   GetASTMap().Insert(&existing_ctxt, this);
diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp
@@ -250,7 +250,7 @@ void Platform::GetStatus(Stream &strm) {
 
   ArchSpec arch(GetSystemArchitecture());
   if (arch.IsValid()) {
-    if (!arch.GetTriple().str(false).empty()) {
+    if (!arch.GetTriple().clone(true, false).str().empty()) {
       strm.Printf("    Triple: ");
       arch.DumpTriple(strm.AsRawOstream());
       strm.EOL();
diff --git a/lldb/source/Target/Statistics.cpp b/lldb/source/Target/Statistics.cpp
@@ -401,7 +401,7 @@ llvm::json::Value DebuggerStats::ReportStatistics(
         module_stat.path.append(1, ')');
       }
       module_stat.uuid = module->GetUUID().GetAsString();
-      module_stat.triple = module->GetArchitecture().GetTriple().str(false);
+      module_stat.triple = module->GetArchitecture().GetTriple().clone(true, false).str();
       json_modules.emplace_back(module_stat.ToJSON());
     }
   }
diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
@@ -461,9 +461,7 @@ class Triple {
   /// @name Direct Component Access
   /// @{
 
-  // const std::string &str() const { return Data; }
-
-  const std::string &str(bool includeObjectFormat) const { return Data; }
+  const std::string &str() const { return Data; }
 
   const std::string &getTriple() const { return Data; }
 
@@ -1228,6 +1226,23 @@ class Triple {
   /// Merge target triples.
   std::string merge(const Triple &Other) const;
 
+  /// Clone the triple. Optionally, only keep the first \p N components.
+  ///
+  /// The original triple string is either emmpty or in the following format:
+  /// > [arch]-[vendor]-[os][-[env][-[objfmt]]]
+  ///
+  /// The cloned triple string will preserve the first \p N components exactly
+  /// the same as the original (including the leading "-" and the value, empty
+  /// or not).
+  ///
+  /// E.g. Triple("arm64-apple-ios").clone(5) == "arm64-apple-ios"
+  /// E.g. Triple("arm64-apple-ios--").clone(3) == "arm64-apple-ios"
+  /// E.g. Triple("arm64-apple-ios--").clone(4) == "arm64-apple-ios-"
+  /// E.g. Triple("arm64-apple-ios--").clone(5) == "arm64-apple-ios--"
+  ///
+  /// \returns the cloned triple.
+  Triple clone(int N = 5) const;
+
   /// Some platforms have different minimum supported OS versions that
   /// varies by the architecture specified in the triple. This function
   /// returns the minimum supported OS version for this triple if one an exists,
diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp
@@ -2107,6 +2107,45 @@ std::string Triple::merge(const Triple &Other) const {
   return Other.str();
 }
 
+Triple Triple::clone(bool IncludeEnvironment, bool IncludeObjectFormat) const {
+  if (str() == "")
+    return Triple();
+  if (IncludeEnvironment && IncludeObjectFormat)
+    return Triple(*this);
+
+  SmallString<64> triple;
+  llvm::StringRef tmp;
+  // arch
+  std::pair<llvm::StringRef, llvm::StringRef> pair = StringRef(Data).split('-'); // pair<arch, vendor/os/env/obj>
+  triple += pair.first;
+  // vendor
+  pair = pair.second.split('-'); // pair<vendor, os/env/obj>
+  triple += "-";
+  triple += pair.first;
+  // os
+  pair = (tmp = pair.second).split('-'); // pair<os, env/obj>
+  triple += "-";
+  triple += pair.first;
+  // environment
+  bool has_environment = tmp != pair.first;
+  pair = (tmp = pair.second).split('-'); // pair<env, obj>
+  bool added_environment = false;
+  if (has_environment && IncludeEnvironment) {
+    triple += "-";
+    triple += pair.first;
+    added_environment = true;
+  }
+  // object format
+  bool has_object_format = tmp != pair.first;
+  if (has_object_format && IncludeObjectFormat) {
+    if (!added_environment)
+      triple += "-";
+    triple += "-";
+    triple += pair.second;
+  }
+  return Triple(triple);
+}
+
 bool Triple::isMacOSXVersionLT(unsigned Major, unsigned Minor,
                                unsigned Micro) const {
   assert(isMacOSX() && "Not an OS X triple!");
diff --git a/llvm/unittests/TargetParser/TripleTest.cpp b/llvm/unittests/TargetParser/TripleTest.cpp
@@ -2926,4 +2926,86 @@ TEST(TripleTest, isCompatibleWith) {
     EXPECT_TRUE(DoTest(C.B, C.A, C.Result));
   }
 }
+
+TEST(TripleTest, Clone) {
+  // Empty triple
+  {
+    llvm::Triple triple;
+    ASSERT_EQ(triple.str(), "");
+    ASSERT_EQ(triple.clone(true, true).str(), "");
+    ASSERT_EQ(triple.clone(true, false).str(), "");
+    ASSERT_EQ(triple.clone(false, true).str(), "");
+    ASSERT_EQ(triple.clone(false, false).str(), "");
+  }
+
+  // Normal triple with 3 components
+  {
+    llvm::Triple triple("arm64-apple-ios");
+    ASSERT_EQ(triple.str(), "arm64-apple-ios");
+    ASSERT_EQ(triple.clone(true, true).str(), "arm64-apple-ios");
+    ASSERT_EQ(triple.clone(true, false).str(), "arm64-apple-ios");
+    ASSERT_EQ(triple.clone(false, true).str(), "arm64-apple-ios");
+    ASSERT_EQ(triple.clone(false, false).str(), "arm64-apple-ios");
+  }
+
+  // Normal triple with 4 components
+  {
+    llvm::Triple triple("arm64-apple-ios-simulator");
+    ASSERT_EQ(triple.str(), "arm64-apple-ios-simulator");
+    ASSERT_EQ(triple.clone(true, true).str(), "arm64-apple-ios-simulator");
+    ASSERT_EQ(triple.clone(true, false).str(), "arm64-apple-ios-simulator");
+    ASSERT_EQ(triple.clone(false, true).str(), "arm64-apple-ios");
+    ASSERT_EQ(triple.clone(false, false).str(), "arm64-apple-ios");
+  }
+
+  // Normal triple with 5 components
+  {
+    llvm::Triple triple("arm64-apple-ios-simulator-macho");
+    ASSERT_EQ(triple.str(), "arm64-apple-ios-simulator-macho");
+    ASSERT_EQ(triple.clone(true, true).str(), "arm64-apple-ios-simulator-macho");
+    ASSERT_EQ(triple.clone(true, false).str(), "arm64-apple-ios-simulator");
+    ASSERT_EQ(triple.clone(false, true).str(), "arm64-apple-ios--macho");
+    ASSERT_EQ(triple.clone(false, false).str(), "arm64-apple-ios");
+  }
+
+  // Empty vendor and os
+  {
+    llvm::Triple triple("arm64---simulator-macho");
+    ASSERT_EQ(triple.str(), "arm64---simulator-macho");
+    ASSERT_EQ(triple.clone(true, true).str(), "arm64---simulator-macho");
+    ASSERT_EQ(triple.clone(true, false).str(), "arm64---simulator");
+    ASSERT_EQ(triple.clone(false, true).str(), "arm64----macho");
+    ASSERT_EQ(triple.clone(false, false).str(), "arm64--");
+  }
+
+  // Empty environment, no object format
+  {
+    llvm::Triple triple("arm64-apple-ios-");
+    ASSERT_EQ(triple.str(), "arm64-apple-ios-");
+    ASSERT_EQ(triple.clone(true, true).str(), "arm64-apple-ios-");
+    ASSERT_EQ(triple.clone(true, false).str(), "arm64-apple-ios-");
+    ASSERT_EQ(triple.clone(false, true).str(), "arm64-apple-ios");
+    ASSERT_EQ(triple.clone(false, false).str(), "arm64-apple-ios");
+  }
+
+  // Empty object format
+  {
+    llvm::Triple triple("arm64-apple-ios-simulator-");
+    ASSERT_EQ(triple.str(), "arm64-apple-ios-simulator-");
+    ASSERT_EQ(triple.clone(true, true).str(), "arm64-apple-ios-simulator-");
+    ASSERT_EQ(triple.clone(true, false).str(), "arm64-apple-ios-simulator");
+    ASSERT_EQ(triple.clone(false, true).str(), "arm64-apple-ios--");
+    ASSERT_EQ(triple.clone(false, false).str(), "arm64-apple-ios");
+  }
+
+  // Empty environment, has object format
+  {
+    llvm::Triple triple("arm64----macho");
+    ASSERT_EQ(triple.str(), "arm64----macho");
+    ASSERT_EQ(triple.clone(true, true).str(), "arm64----macho");
+    ASSERT_EQ(triple.clone(true, false).str(), "arm64---");
+    ASSERT_EQ(triple.clone(false, true).str(), "arm64----macho");
+    ASSERT_EQ(triple.clone(false, false).str(), "arm64--");
+  }
+}
 } // end anonymous namespace

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ DynamicLoaderDarwinKernel::CheckForKernelImageAtAddress(lldb::addr_t addr,`
`498`	`498`	`log,`
`499`	`499`	`"DynamicLoaderDarwinKernel::CheckForKernelImageAtAddress: "`
`500`	`500`	`"kernel binary image found at 0x%" PRIx64 " with arch '%s' %s",`
`501`		`- addr, kernel_arch.GetTriple().str(false).c_str(), uuid_str.c_str());`
	`501`	`+ addr, kernel_arch.GetTriple().clone(true, false).str().c_str(), uuid_str.c_str());`
`502`	`502`	`}`
`503`	`503`	`return memory_module_sp->GetUUID();`
`504`	`504`	`}`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ lldb_private::UUID DynamicLoaderFreeBSDKernel::CheckForKernelImageAtAddress(`
`236`	`236`	`LLDB_LOGF(log,`
`237`	`237`	`"DynamicLoaderFreeBSDKernel::CheckForKernelImageAtAddress: "`
`238`	`238`	`"kernel binary image found at 0x%" PRIx64 " with arch '%s' %s",`
`239`		`- addr, kernel_arch.GetTriple().str(false).c_str(), uuid_str.c_str());`
	`239`	`+ addr, kernel_arch.GetTriple().clone(true, false).str().c_str(), uuid_str.c_str());`
`240`	`240`
`241`	`241`	`return memory_module_sp->GetUUID();`
`242`	`242`	`}`