Merge pull request llvm#177 from AMD-Lightning-Internal/amd/dev/juamarti/fi_dbg_unexpected_ptr

[AMDGPU][DebugInfo] Drop DIExpression when we encounter something else than a pointer during FrameLowering

Author: jmmartinez

llvm/include/llvm/IR/DebugInfoMetadata.h

@@ -3307,13 +3307,6 @@ class DIExpression : public MDNode {
         ->getElements();
   }
 
-  DIExpression *getPoisoned() const {
-    std::optional<FragmentInfo> Frag = getFragmentInfo();
-    if (!Frag)
-      return DIExpression::get(getContext(), PoisonedExpr);
-    return getPoisonedFragment(Frag->OffsetInBits, Frag->SizeInBits);
-  }
-
   DIExpression(LLVMContext &C, StorageType Storage, ArrayRef<uint64_t> Elements)
       : MDNode(C, DIExpressionKind, Storage, {}),
         Elements(std::in_place_type<OldElements>, Elements.begin(),
@@ -3341,6 +3334,13 @@ class DIExpression : public MDNode {
   }
 
 public:
+  DIExpression *getPoisoned() const {
+    std::optional<FragmentInfo> Frag = getFragmentInfo();
+    if (!Frag)
+      return DIExpression::get(getContext(), PoisonedExpr);
+    return getPoisonedFragment(Frag->OffsetInBits, Frag->SizeInBits);
+  }
+
   DEFINE_MDNODE_GET(DIExpression, (std::nullopt_t Elements), (Elements))
   DEFINE_MDNODE_GET(DIExpression, (ArrayRef<uint64_t> Elements), (Elements))
   // The bool parameter is ignored, and only present to disambiguate the

llvm/lib/Target/AMDGPU/AMDGPUFrameLowering.cpp

@@ -101,7 +101,13 @@ DIExpression *AMDGPUFrameLowering::lowerFIArgToFPArg(const MachineFunction &MF,
     if (auto *Arg = std::get_if<DIOp::Arg>(&*I)) {
       if (Arg->getIndex() != ArgIndex)
         continue;
+
       Type *ResultType = Arg->getResultType();
+      // Weird case: we expect a pointer but on optimized builds it may not be
+      // the case.
+      if (!ResultType->isPointerTy())
+        return Expr->getPoisoned();
+
       unsigned PointerSizeInBits =
           DL.getPointerSizeInBits(ResultType->getPointerAddressSpace());
       auto *IntTy = IntegerType::get(Context, PointerSizeInBits);