From 8b5dbc37a899faf0d2cb842bcb1ebc66a319c394 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Fri, 2 Jun 2023 09:25:00 -0700 Subject: [PATCH] [CodeGen] Use llvm::LLVMContext::MD_invariant_load (NFC) --- clang/lib/CodeGen/CGObjC.cpp | 2 +- clang/lib/CodeGen/CGObjCMac.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/CodeGen/CGObjC.cpp b/clang/lib/CodeGen/CGObjC.cpp index 7df2088..c8f0070 100644 --- a/clang/lib/CodeGen/CGObjC.cpp +++ b/clang/lib/CodeGen/CGObjC.cpp @@ -140,7 +140,7 @@ llvm::Value *CodeGenFunction::EmitObjCCollectionLiteral(const Expr *E, LValue LV = MakeNaturalAlignAddrLValue(Constant, IdTy); llvm::Value *Ptr = EmitLoadOfScalar(LV, E->getBeginLoc()); cast(Ptr)->setMetadata( - CGM.getModule().getMDKindID("invariant.load"), + llvm::LLVMContext::MD_invariant_load, llvm::MDNode::get(getLLVMContext(), std::nullopt)); return Builder.CreateBitCast(Ptr, ConvertType(E->getType())); } diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp index 5f4cdc6..d52e560 100644 --- a/clang/lib/CodeGen/CGObjCMac.cpp +++ b/clang/lib/CodeGen/CGObjCMac.cpp @@ -7229,7 +7229,7 @@ CGObjCNonFragileABIMac::EmitIvarOffset(CodeGen::CodeGenFunction &CGF, CGF.getSizeAlign(), "ivar"); if (IsIvarOffsetKnownIdempotent(CGF, Ivar)) cast(IvarOffsetValue) - ->setMetadata(CGM.getModule().getMDKindID("invariant.load"), + ->setMetadata(llvm::LLVMContext::MD_invariant_load, llvm::MDNode::get(VMContext, std::nullopt)); } @@ -7629,7 +7629,7 @@ llvm::Value *CGObjCNonFragileABIMac::EmitSelector(CodeGenFunction &CGF, Address Addr = EmitSelectorAddr(Sel); llvm::LoadInst* LI = CGF.Builder.CreateLoad(Addr); - LI->setMetadata(CGM.getModule().getMDKindID("invariant.load"), + LI->setMetadata(llvm::LLVMContext::MD_invariant_load, llvm::MDNode::get(VMContext, std::nullopt)); return LI; } -- 2.7.4