[PATCH] D34780: Make OrderedInstructions and OrderedBasicBlock use AssertingVH, to try and catch mistakes

[Xin Tong via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL306605: Make OrderedInstructions and OrderedBasicBlock use AssertingVH, to try and… (authored by trentxintong).

Repository:
  rL LLVM

https://reviews.llvm.org/D34780

Files:
  llvm/trunk/include/llvm/Analysis/OrderedBasicBlock.h
  llvm/trunk/include/llvm/Transforms/Utils/OrderedInstructions.h


Index: llvm/trunk/include/llvm/Transforms/Utils/OrderedInstructions.h
===================================================================
--- llvm/trunk/include/llvm/Transforms/Utils/OrderedInstructions.h
+++ llvm/trunk/include/llvm/Transforms/Utils/OrderedInstructions.h
@@ -24,13 +24,14 @@
 #include "llvm/Analysis/OrderedBasicBlock.h"
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/Operator.h"
+#include "llvm/IR/ValueHandle.h"
 
 namespace llvm {
 
 class OrderedInstructions {
   /// Used to check dominance for instructions in same basic block.
-  mutable DenseMap<const BasicBlock *, std::unique_ptr<OrderedBasicBlock>>
-      OBBMap;
+  mutable DenseMap<AssertingVH<const BasicBlock>,
+                   std::unique_ptr<OrderedBasicBlock>> OBBMap;
 
   /// The dominator tree of the parent function.
   DominatorTree *DT;
Index: llvm/trunk/include/llvm/Analysis/OrderedBasicBlock.h
===================================================================
--- llvm/trunk/include/llvm/Analysis/OrderedBasicBlock.h
+++ llvm/trunk/include/llvm/Analysis/OrderedBasicBlock.h
@@ -25,6 +25,7 @@
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/IR/BasicBlock.h"
+#include "llvm/IR/ValueHandle.h"
 
 namespace llvm {
 
@@ -34,7 +35,7 @@
 class OrderedBasicBlock {
 private:
   /// \brief Map a instruction to its position in a BasicBlock.
-  SmallDenseMap<const Instruction *, unsigned, 32> NumberedInsts;
+  SmallDenseMap<AssertingVH<const Instruction>, unsigned, 32> NumberedInsts;
 
   /// \brief Keep track of last instruction inserted into \p NumberedInsts.
   /// It speeds up queries for uncached instructions by providing a start point


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D34780.104523.patch
Type: text/x-patch
Size: 1644 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170628/029e0bdb/attachment.bin>