https://github.com/boomanaiden154 created https://github.com/llvm/llvm-project/pull/205985
I had to revert #205928 due to missing shared library dependencies. Just adding the dependency only fixes the build in some configurations. When building with clang, which automatically enables PCH, we end up with ambiguity between llvm::LoopInfo and clang::CodeGen::LoopInfo. This patch prefixes the namespace on the symbols to make it explicit which we are referring to fix the issue. This also brings us a bit more in line with the LLVM coding standards: https://llvm.org/docs/CodingStandards.html#use-namespace-qualifiers-to-define-previously-declared-symbols >From 41566adec828af5cc254a894daea897263d07e2d Mon Sep 17 00:00:00 2001 From: Aiden Grossman <[email protected]> Date: Fri, 26 Jun 2026 06:18:51 +0000 Subject: [PATCH] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20initia?= =?UTF-8?q?l=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Created using spr 1.3.7 --- clang/lib/CodeGen/CGLoopInfo.cpp | 56 +++++++++++++++----------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/clang/lib/CodeGen/CGLoopInfo.cpp b/clang/lib/CodeGen/CGLoopInfo.cpp index 369b052bf7a28..6b0b1b55213e1 100644 --- a/clang/lib/CodeGen/CGLoopInfo.cpp +++ b/clang/lib/CodeGen/CGLoopInfo.cpp @@ -21,9 +21,8 @@ using namespace clang::CodeGen; using namespace llvm; -MDNode * -LoopInfo::createFollowupMetadata(const char *FollowupName, - ArrayRef<llvm::Metadata *> LoopProperties) { +MDNode *clang::CodeGen::LoopInfo::createFollowupMetadata( + const char *FollowupName, ArrayRef<llvm::Metadata *> LoopProperties) { LLVMContext &Ctx = Header->getContext(); SmallVector<Metadata *, 4> Args; @@ -32,10 +31,9 @@ LoopInfo::createFollowupMetadata(const char *FollowupName, return MDNode::get(Ctx, Args); } -SmallVector<Metadata *, 4> -LoopInfo::createPipeliningMetadata(const LoopAttributes &Attrs, - ArrayRef<Metadata *> LoopProperties, - bool &HasUserTransforms) { +SmallVector<Metadata *, 4> clang::CodeGen::LoopInfo::createPipeliningMetadata( + const LoopAttributes &Attrs, ArrayRef<Metadata *> LoopProperties, + bool &HasUserTransforms) { LLVMContext &Ctx = Header->getContext(); std::optional<bool> Enabled; @@ -72,9 +70,9 @@ LoopInfo::createPipeliningMetadata(const LoopAttributes &Attrs, } SmallVector<Metadata *, 4> -LoopInfo::createPartialUnrollMetadata(const LoopAttributes &Attrs, - ArrayRef<Metadata *> LoopProperties, - bool &HasUserTransforms) { +clang::CodeGen::LoopInfo::createPartialUnrollMetadata( + const LoopAttributes &Attrs, ArrayRef<Metadata *> LoopProperties, + bool &HasUserTransforms) { LLVMContext &Ctx = Header->getContext(); std::optional<bool> Enabled; @@ -130,10 +128,9 @@ LoopInfo::createPartialUnrollMetadata(const LoopAttributes &Attrs, return Args; } -SmallVector<Metadata *, 4> -LoopInfo::createUnrollAndJamMetadata(const LoopAttributes &Attrs, - ArrayRef<Metadata *> LoopProperties, - bool &HasUserTransforms) { +SmallVector<Metadata *, 4> clang::CodeGen::LoopInfo::createUnrollAndJamMetadata( + const LoopAttributes &Attrs, ArrayRef<Metadata *> LoopProperties, + bool &HasUserTransforms) { LLVMContext &Ctx = Header->getContext(); std::optional<bool> Enabled; @@ -194,9 +191,9 @@ LoopInfo::createUnrollAndJamMetadata(const LoopAttributes &Attrs, } SmallVector<Metadata *, 4> -LoopInfo::createLoopVectorizeMetadata(const LoopAttributes &Attrs, - ArrayRef<Metadata *> LoopProperties, - bool &HasUserTransforms) { +clang::CodeGen::LoopInfo::createLoopVectorizeMetadata( + const LoopAttributes &Attrs, ArrayRef<Metadata *> LoopProperties, + bool &HasUserTransforms) { LLVMContext &Ctx = Header->getContext(); std::optional<bool> Enabled; @@ -320,9 +317,9 @@ LoopInfo::createLoopVectorizeMetadata(const LoopAttributes &Attrs, } SmallVector<Metadata *, 4> -LoopInfo::createLoopDistributeMetadata(const LoopAttributes &Attrs, - ArrayRef<Metadata *> LoopProperties, - bool &HasUserTransforms) { +clang::CodeGen::LoopInfo::createLoopDistributeMetadata( + const LoopAttributes &Attrs, ArrayRef<Metadata *> LoopProperties, + bool &HasUserTransforms) { LLVMContext &Ctx = Header->getContext(); std::optional<bool> Enabled; @@ -366,10 +363,9 @@ LoopInfo::createLoopDistributeMetadata(const LoopAttributes &Attrs, return Args; } -SmallVector<Metadata *, 4> -LoopInfo::createFullUnrollMetadata(const LoopAttributes &Attrs, - ArrayRef<Metadata *> LoopProperties, - bool &HasUserTransforms) { +SmallVector<Metadata *, 4> clang::CodeGen::LoopInfo::createFullUnrollMetadata( + const LoopAttributes &Attrs, ArrayRef<Metadata *> LoopProperties, + bool &HasUserTransforms) { LLVMContext &Ctx = Header->getContext(); std::optional<bool> Enabled; @@ -401,7 +397,7 @@ LoopInfo::createFullUnrollMetadata(const LoopAttributes &Attrs, return Args; } -SmallVector<Metadata *, 4> LoopInfo::createMetadata( +SmallVector<Metadata *, 4> clang::CodeGen::LoopInfo::createMetadata( const LoopAttributes &Attrs, llvm::ArrayRef<llvm::Metadata *> AdditionalLoopProperties, bool &HasUserTransforms) { @@ -474,9 +470,11 @@ void LoopAttributes::clear() { MustProgress = false; } -LoopInfo::LoopInfo(BasicBlock *Header, const LoopAttributes &Attrs, - const llvm::DebugLoc &StartLoc, const llvm::DebugLoc &EndLoc, - LoopInfo *Parent) +clang::CodeGen::LoopInfo::LoopInfo(BasicBlock *Header, + const LoopAttributes &Attrs, + const llvm::DebugLoc &StartLoc, + const llvm::DebugLoc &EndLoc, + LoopInfo *Parent) : Header(Header), Attrs(Attrs), StartLoc(StartLoc), EndLoc(EndLoc), Parent(Parent) { @@ -502,7 +500,7 @@ LoopInfo::LoopInfo(BasicBlock *Header, const LoopAttributes &Attrs, TempLoopID = MDNode::getTemporary(Header->getContext(), {}); } -void LoopInfo::finish() { +void clang::CodeGen::LoopInfo::finish() { // We did not annotate the loop body instructions because there are no // attributes for this loop. if (!TempLoopID) _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
