[PATCH] D60613: Make setInitializer() assert that the entire initializer is usable.

[Arnt Gulbrandsen via Phabricator via llvm-commits]

arnt updated this revision to Diff 206821.
arnt added a comment.

Rebased to this morning's LLVM.

No changes were necessary.


Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D60613/new/

https://reviews.llvm.org/D60613

Files:
  llvm/lib/IR/Globals.cpp


Index: llvm/lib/IR/Globals.cpp
===================================================================
--- llvm/lib/IR/Globals.cpp
+++ llvm/lib/IR/Globals.cpp
@@ -381,6 +381,21 @@
   getParent()->getGlobalList().erase(getIterator());
 }
 
+static void assertThatAllGlobalsAreIn(Constant *Value, Module *Correct) {
+#ifndef NDEBUG
+  if(ConstantStruct *V = dyn_cast<ConstantStruct>(Value)) {
+    for(int I = 0, N = V->getNumOperands(); I != N; ++I)
+      assertThatAllGlobalsAreIn(V->getOperand(I), Correct);
+  } else if(ConstantArray *V = dyn_cast<ConstantArray>(Value)) {
+    for(int I = 0, N = V->getNumOperands(); I != N; ++I)
+      assertThatAllGlobalsAreIn(V->getAggregateElement(I), Correct);
+  } else if(GlobalValue *V = dyn_cast<GlobalValue>(Value)) {
+    assert((!V->getParent() || V->getParent() == Correct) &&
+           "A Constant and its initializer cannot be in different modules");
+  }
+#endif
+}
+
 void GlobalVariable::setInitializer(Constant *InitVal) {
   if (!InitVal) {
     if (hasInitializer()) {
@@ -399,6 +414,7 @@
     if (!hasInitializer())
       setGlobalVariableNumOperands(1);
     Op<0>().set(InitVal);
+    assertThatAllGlobalsAreIn(InitVal, getParent());
   }
 }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60613.206821.patch
Type: text/x-patch
Size: 1205 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190627/7b47a577/attachment-0001.bin>