[PATCH] D20713: ValueMapper: fix assertion when null-mapping a constant for linking metadata

[Mehdi AMINI via llvm-commits]

mehdi_amini updated this revision to Diff 58871.
mehdi_amini added a comment.

Refactor the assertion in a helper lambda


http://reviews.llvm.org/D20713

Files:
  lib/Transforms/Utils/ValueMapper.cpp
  test/Linker/null_mapping_constant.ll

Index: test/Linker/null_mapping_constant.ll
===================================================================
--- /dev/null
+++ test/Linker/null_mapping_constant.ll
@@ -0,0 +1,11 @@
+; RUN: llvm-link %s -S -o - | FileCheck %s
+; Check that the constant is not linked and the metadata is correctly referencing a nullptr
+; CHECK: !0 = !{!"foo", null, i64 16}
+
+
+
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx10.12.0"
+ at foo = external unnamed_addr constant { [4 x i8*], [32 x i8] }, align 32
+!llvm.bitsets = !{!0}
+!0 = !{!"foo", [4 x i8*]* getelementptr inbounds ({ [4 x i8*], [32 x i8] }, { [4 x i8*], [32 x i8] }* @foo, i32 0, i32 0), i64 16}
Index: lib/Transforms/Utils/ValueMapper.cpp
===================================================================
--- lib/Transforms/Utils/ValueMapper.cpp
+++ lib/Transforms/Utils/ValueMapper.cpp
@@ -429,13 +429,23 @@
   if (BlockAddress *BA = dyn_cast<BlockAddress>(C))
     return mapBlockAddress(*BA);
 
+  auto mapValueOrNull = [this](Value *V) {
+    auto Mapped = mapValue(V);
+    assert((Flags & RF_NullMapMissingGlobalValues) &&
+           "Unexpected null mapping for constant operand without "
+           "NullMapMissingGlobalValues flag");
+    return Mapped;
+  };
+
   // Otherwise, we have some other constant to remap.  Start by checking to see
   // if all operands have an identity remapping.
   unsigned OpNo = 0, NumOperands = C->getNumOperands();
   Value *Mapped = nullptr;
   for (; OpNo != NumOperands; ++OpNo) {
     Value *Op = C->getOperand(OpNo);
-    Mapped = mapValue(Op);
+    Mapped = mapValueOrNull(Op);
+    if (!Mapped)
+      return nullptr;
     if (Mapped != Op)
       break;
   }
@@ -462,8 +472,12 @@
     Ops.push_back(cast<Constant>(Mapped));
 
     // Map the rest of the operands that aren't processed yet.
-    for (++OpNo; OpNo != NumOperands; ++OpNo)
-      Ops.push_back(cast<Constant>(mapValue(C->getOperand(OpNo))));
+    for (++OpNo; OpNo != NumOperands; ++OpNo) {
+      Mapped = mapValueOrNull(C->getOperand(OpNo));
+      if (!Mapped)
+        return nullptr;
+      Ops.push_back(cast<Constant>(Mapped));
+    }
   }
   Type *NewSrcTy = nullptr;
   if (TypeMapper)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D20713.58871.patch
Type: text/x-patch
Size: 2222 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160528/46ec3dba/attachment.bin>