Merge upstream/llvm into amd-debug

[mariusz-sikora-at-amd]

Multiple merge-commits, synced with top of upstream llvm

[1]

commit d87d5052b80b68bd70b7470d24bec65da41ff74c (HEAD -> amd/dev/masikora/amd-debug-merge-candidate)
Merge: a0b792d2cf53 8365c9085c63
Author: Mariusz Sikora <mariusz.sikora@amd.com>
Date:   Wed Aug 12 10:03:26 2026 -0400

    Merge llvm/main into amd-debug

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
remerge CONFLICT (content): Merge conflict in llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
index bad509ecb39c..4e1b98cf60cf 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
@@ -579,15 +579,9 @@ bool DwarfExpression::addExpression(
   // and not any other parts of the following DWARF expression.
   assert(!IsEmittingEntryValue && "Can't emit entry value around expression");

-<<<<<<< a0b792d2cf53 (Merge llvm/main into amd-debug)
   IsPoisonedExpr = false;

-  std::optional<DIExpression::ExprOperand> PrevConvertOp;
-||||||| cff4ca2e51f8
-  std::optional<DIExpression::ExprOperand> PrevConvertOp;
-=======
   std::optional<DIExpression::ConvertOp> PrevConvertOp;
->>>>>>> 8365c9085c63 ([RISCV][P-ext] Support Packed Multiply High (#211223))

   while (ExprCursor) {
     auto Op = ExprCursor.take();
diff --git a/llvm/lib/IR/DebugInfoMetadata.cpp b/llvm/lib/IR/DebugInfoMetadata.cpp
remerge CONFLICT (content): Merge conflict in llvm/lib/IR/DebugInfoMetadata.cpp
index 2ec4edbfed26..76e131dc836a 100644
--- a/llvm/lib/IR/DebugInfoMetadata.cpp
+++ b/llvm/lib/IR/DebugInfoMetadata.cpp
@@ -1800,7 +1800,43 @@ bool DIExpression::ExprOperand::isNonEmitting() const {
   return getOp() == dwarf::DW_OP_LLVM_tag_offset;
 }

-<<<<<<< a0b792d2cf53 (Merge llvm/main into amd-debug)
+bool DIExpression::ArgOp::classof(const ExprOperand *Op) {
+  return Op->is(dwarf::DW_OP_LLVM_arg);
+}
+
+bool DIExpression::FragmentOp::classof(const ExprOperand *Op) {
+  return Op->is(dwarf::DW_OP_LLVM_fragment);
+}
+
+bool DIExpression::ExtractBitsOp::classof(const ExprOperand *Op) {
+  return Op->is(dwarf::DW_OP_LLVM_extract_bits_sext) ||
+         Op->is(dwarf::DW_OP_LLVM_extract_bits_zext);
+}
+
+bool DIExpression::ExtractBitsOp::isSigned() const {
+  return is(dwarf::DW_OP_LLVM_extract_bits_sext);
+}
+
+bool DIExpression::ConvertOp::classof(const ExprOperand *Op) {
+  return Op->is(dwarf::DW_OP_LLVM_convert);
+}
+
+bool DIExpression::EntryValueOp::classof(const ExprOperand *Op) {
+  return Op->is(dwarf::DW_OP_LLVM_entry_value);
+}
+
+bool DIExpression::TagOffsetOp::classof(const ExprOperand *Op) {
+  return Op->is(dwarf::DW_OP_LLVM_tag_offset);
+}
+
+bool DIExpression::ConstuOp::classof(const ExprOperand *Op) {
+  return Op->is(dwarf::DW_OP_constu);
+}
+
+bool DIExpression::PlusUconstOp::classof(const ExprOperand *Op) {
+  return Op->is(dwarf::DW_OP_plus_uconst);
+}
+
 namespace {
 /// Extends validation to include Arguments and DataLayout when available,
 /// falling back to assuming the expression is valid when these are not
@@ -1994,48 +2030,6 @@ bool DIExpression::isValid(
       *ErrS << Verifier.getErrorMsg() << '\n';
     return Result;
   }
-||||||| cff4ca2e51f8
-bool DIExpression::isValid() const {
-=======
-bool DIExpression::ArgOp::classof(const ExprOperand *Op) {
-  return Op->is(dwarf::DW_OP_LLVM_arg);
-}
-
-bool DIExpression::FragmentOp::classof(const ExprOperand *Op) {
-  return Op->is(dwarf::DW_OP_LLVM_fragment);
-}
-
-bool DIExpression::ExtractBitsOp::classof(const ExprOperand *Op) {
-  return Op->is(dwarf::DW_OP_LLVM_extract_bits_sext) ||
-         Op->is(dwarf::DW_OP_LLVM_extract_bits_zext);
-}
-
-bool DIExpression::ExtractBitsOp::isSigned() const {
-  return is(dwarf::DW_OP_LLVM_extract_bits_sext);
-}
-
-bool DIExpression::ConvertOp::classof(const ExprOperand *Op) {
-  return Op->is(dwarf::DW_OP_LLVM_convert);
-}
-
-bool DIExpression::EntryValueOp::classof(const ExprOperand *Op) {
-  return Op->is(dwarf::DW_OP_LLVM_entry_value);
-}
-
-bool DIExpression::TagOffsetOp::classof(const ExprOperand *Op) {
-  return Op->is(dwarf::DW_OP_LLVM_tag_offset);
-}
-
-bool DIExpression::ConstuOp::classof(const ExprOperand *Op) {
-  return Op->is(dwarf::DW_OP_constu);
-}
-
-bool DIExpression::PlusUconstOp::classof(const ExprOperand *Op) {
-  return Op->is(dwarf::DW_OP_plus_uconst);
-}
-
-bool DIExpression::isValid() const {
->>>>>>> 8365c9085c63 ([RISCV][P-ext] Support Packed Multiply High (#211223))
   for (auto I = expr_op_begin(), E = expr_op_end(); I != E; ++I) {
     // Check that there's space for the operand.
     if (I->get() + I->getSize() > E->get())
@@ -2457,18 +2451,10 @@ bool DIExpression::extractLeadingOffset(
 bool DIExpression::hasAllLocationOps(unsigned N) const {
   SmallDenseSet<uint64_t, 4> SeenOps;
   for (auto ExprOp : expr_ops())
-<<<<<<< a0b792d2cf53 (Merge llvm/main into amd-debug)
-    if (ExprOp.getOp() == dwarf::DW_OP_LLVM_arg)
-      SeenOps.insert(ExprOp.getArg(0));
-    else if (ExprOp.getOp() == dwarf::DW_OP_LLVM_poisoned)
-      return true;
-||||||| cff4ca2e51f8
-    if (ExprOp.getOp() == dwarf::DW_OP_LLVM_arg)
-      SeenOps.insert(ExprOp.getArg(0));
-=======
     if (auto Arg = dyn_cast<ArgOp>(ExprOp))
       SeenOps.insert(Arg.getIndex());
->>>>>>> 8365c9085c63 ([RISCV][P-ext] Support Packed Multiply High (#211223))
+    else if (ExprOp.getOp() == dwarf::DW_OP_LLVM_poisoned)
+      return true;
   for (uint64_t Idx = 0; Idx < N; ++Idx)
     if (!SeenOps.contains(Idx))
       return false;
diff --git a/llvm/unittests/IR/MetadataTest.cpp b/llvm/unittests/IR/MetadataTest.cpp
index fe2cb561d7bb..2f1b068d897c 100644
--- a/llvm/unittests/IR/MetadataTest.cpp
+++ b/llvm/unittests/IR/MetadataTest.cpp
@@ -3821,7 +3821,8 @@ TEST_F(DIExpressionTest, GetActiveBits) {
     auto *Type = DIBasicType::get(Context, dwarf::DW_TAG_base_type, Name, 64, 0,
                                   Encoding, DINode::FlagZero);
     return DILocalVariable::get(Context, getSubprogram(), Name, getFile(), 0,
-                                Type, 0, DINode::FlagZero, 0, nullptr);
+                                Type, 0, DINode::FlagZero,
+                                dwarf::DW_MSPACE_LLVM_none, 0, nullptr);
   };
   auto *SignedVar = MakeVariable("signed", dwarf::DW_ATE_signed);
   auto *UnsignedVar = MakeVariable("unsigned", dwarf::DW_ATE_unsigned);

[2]

commit 0da841ebaaef1cd11e76db5da2897d7366bb03ea
Merge: 0810fecb2297 23a601dc9690
Author: Mariusz Sikora <mariusz.sikora@amd.com>
Date:   Wed Aug 12 09:29:50 2026 -0400

    Merge llvm/main into amd-debug

diff --git a/llvm/include/llvm/IR/DIBuilder.h b/llvm/include/llvm/IR/DIBuilder.h
remerge CONFLICT (content): Merge conflict in llvm/include/llvm/IR/DIBuilder.h
index 0a9ab5aad4db..ee860497fb81 100644
--- a/llvm/include/llvm/IR/DIBuilder.h
+++ b/llvm/include/llvm/IR/DIBuilder.h
@@ -90,28 +90,12 @@ namespace llvm {
     void insertDbgVariableRecord(DbgVariableRecord *DVR,
                                  InsertPosition InsertPt);

-<<<<<<< 0810fecb2297 (Merge llvm/main into amd-debug)
-    /// Internal helper with common code used by insertDbg{Value,Addr}Intrinsic.
-    Instruction *insertDbgIntrinsic(llvm::Function *Intrinsic, llvm::Value *Val,
-                                    DILocalVariable *VarInfo,
-                                    DIExpression *Expr, const DILocation *DL,
-                                    InsertPosition InsertPt);
-
     /// Internal helper for insertDbgAddrIntrinsic.
     Instruction *
     insertDbgAddrIntrinsic(llvm::Value *Val, DILocalVariable *VarInfo,
                            DIExpression *Expr, const DILocation *DL,
                            BasicBlock *InsertBB, Instruction *InsertBefore);

-||||||| 37aca9d38434
-    /// Internal helper with common code used by insertDbg{Value,Addr}Intrinsic.
-    Instruction *insertDbgIntrinsic(llvm::Function *Intrinsic, llvm::Value *Val,
-                                    DILocalVariable *VarInfo,
-                                    DIExpression *Expr, const DILocation *DL,
-                                    InsertPosition InsertPt);
-
-=======
->>>>>>> 23a601dc9690 ([clang][KCFI] Skip the KCFIPass on Hexagon (#211716))
   public:
     /// Construct a builder for a module.
     ///

[rocm-cciapp]

PSDB Build Link: http://mlse-bdc-20dd129:8065/#/builders/6/builds/253

[mariusz-sikora-at-amd]

ping