From ab50317e96e57dee5b3ff4ad3f16f205b2a3359e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 24 Jan 2024 20:17:23 +0100 Subject: Merge llvm-project main llvmorg-18-init-18359-g93248729cfae This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project main llvmorg-18-init-18359-g93248729cfae, the last commit before the upstream release/18.x branch was created. PR: 276104 MFC after: 1 month (cherry picked from commit 7a6dacaca14b62ca4b74406814becb87a3fefac0) --- contrib/llvm-project/llvm/lib/TextAPI/Platform.cpp | 4 ++++ contrib/llvm-project/llvm/lib/TextAPI/RecordsSlice.cpp | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'contrib/llvm-project/llvm/lib/TextAPI') diff --git a/contrib/llvm-project/llvm/lib/TextAPI/Platform.cpp b/contrib/llvm-project/llvm/lib/TextAPI/Platform.cpp index ed041af40aa5..e891594300c2 100644 --- a/contrib/llvm-project/llvm/lib/TextAPI/Platform.cpp +++ b/contrib/llvm-project/llvm/lib/TextAPI/Platform.cpp @@ -106,6 +106,10 @@ std::string getOSAndEnvironmentName(PlatformType Platform, return "watchos" + Version + "-simulator"; case PLATFORM_DRIVERKIT: return "driverkit" + Version; + case PLATFORM_XROS: + return "xros" + Version; + case PLATFORM_XROS_SIMULATOR: + return "xros" + Version + "-simulator"; } llvm_unreachable("Unknown llvm::MachO::PlatformType enum"); } diff --git a/contrib/llvm-project/llvm/lib/TextAPI/RecordsSlice.cpp b/contrib/llvm-project/llvm/lib/TextAPI/RecordsSlice.cpp index 7ceffc7c9284..840fe1855da6 100644 --- a/contrib/llvm-project/llvm/lib/TextAPI/RecordsSlice.cpp +++ b/contrib/llvm-project/llvm/lib/TextAPI/RecordsSlice.cpp @@ -332,9 +332,8 @@ llvm::MachO::convertToInterfaceFile(const Records &Slices) { } File = createInterfaceFile(Slices, *InstallNames.begin()); - for (auto it = std::next(InstallNames.begin()); it != InstallNames.end(); - ++it) - File->addDocument(createInterfaceFile(Slices, *it)); + for (StringRef IN : llvm::drop_begin(InstallNames)) + File->addDocument(createInterfaceFile(Slices, IN)); return File; } -- cgit v1.2.3