Revert "[SelectionDAG] Add pcsections recursively on SDNode values"

Revert "[SelectionDAG] Add missing setValue calls in visitIntrinsicCall"

This reverts commit 0c64e1b.
This reverts commit 1142e6c.

It spuriously added !pcsections where they shouldn't be. See added test
case in test/CodeGen/X86/pcsections.ll as an example. The reason is that
the SelectionDAG chains operations in a basic block as "operands"
pointing to preceding instructions. This resulted in setting the
metadata on _all_ instructions preceding the one that should have the
metadata.

Reverting for now because the semantics of !pcsections was completely
buggy now.

Author: melver

llvm/include/llvm/CodeGen/SelectionDAG.h

@@ -2263,8 +2263,7 @@ class SelectionDAG {
   }
   /// Set PCSections to be associated with Node.
   void addPCSections(const SDNode *Node, MDNode *MD) {
-    SmallPtrSet<const llvm::SDNode *, 32> Visited;
-    addPCSections(Node, MD, Visited);
+    SDEI[Node].PCSections = MD;
   }
   /// Return PCSections associated with Node, or nullptr if none exists.
   MDNode *getPCSections(const SDNode *Node) const {
@@ -2342,10 +2341,6 @@ class SelectionDAG {
   SDNode *FindNodeOrInsertPos(const FoldingSetNodeID &ID, const SDLoc &DL,
                               void *&InsertPos);
 
-  /// Recursively set PCSections to be associated with Node and all its values.
-  void addPCSections(const SDNode *Node, MDNode *MD,
-                     SmallPtrSet<const llvm::SDNode *, 32> &Visited);
-
   /// Maps to auto-CSE operations.
   std::vector<CondCodeSDNode*> CondCodeNodes;
 

llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

@@ -1363,19 +1363,6 @@ SDNode *SelectionDAG::FindNodeOrInsertPos(const FoldingSetNodeID &ID,
   return N;
 }
 
-void SelectionDAG::addPCSections(
-    const SDNode *Node, MDNode *MD,
-    SmallPtrSet<const llvm::SDNode *, 32> &Visited) {
-  // If we've been here before, return now.
-  if (!Visited.insert(Node).second)
-    return;
-
-  SDEI[Node].PCSections = MD;
-
-  for (const SDValue &Op : Node->op_values())
-    addPCSections(Op.getNode(), MD, Visited);
-}
-
 void SelectionDAG::clear() {
   allnodes_clear();
   OperandRecycler.clear(OperandAllocator);

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

@@ -5936,7 +5936,6 @@ void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I,
         /* AlwaysInline */ false, isTC, MachinePointerInfo(I.getArgOperand(0)),
         MachinePointerInfo(I.getArgOperand(1)), I.getAAMetadata(), AA);
     updateDAGForMaybeTailCall(MC);
-    setValue(&I, MC);
     return;
   }
   case Intrinsic::memcpy_inline: {
@@ -5958,7 +5957,6 @@ void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I,
         /* AlwaysInline */ true, isTC, MachinePointerInfo(I.getArgOperand(0)),
         MachinePointerInfo(I.getArgOperand(1)), I.getAAMetadata(), AA);
     updateDAGForMaybeTailCall(MC);
-    setValue(&I, MC);
     return;
   }
   case Intrinsic::memset: {
@@ -5975,7 +5973,6 @@ void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I,
         Root, sdl, Op1, Op2, Op3, Alignment, isVol, /* AlwaysInline */ false,
         isTC, MachinePointerInfo(I.getArgOperand(0)), I.getAAMetadata());
     updateDAGForMaybeTailCall(MS);
-    setValue(&I, MS);
     return;
   }
   case Intrinsic::memset_inline: {
@@ -5994,7 +5991,6 @@ void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I,
                                MachinePointerInfo(I.getArgOperand(0)),
                                I.getAAMetadata());
     updateDAGForMaybeTailCall(MC);
-    setValue(&I, MC);
     return;
   }
   case Intrinsic::memmove: {
@@ -6016,7 +6012,6 @@ void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I,
                                 MachinePointerInfo(I.getArgOperand(1)),
                                 I.getAAMetadata(), AA);
     updateDAGForMaybeTailCall(MM);
-    setValue(&I, MM);
     return;
   }
   case Intrinsic::memcpy_element_unordered_atomic: {
@@ -6033,7 +6028,6 @@ void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I,
                             isTC, MachinePointerInfo(MI.getRawDest()),
                             MachinePointerInfo(MI.getRawSource()));
     updateDAGForMaybeTailCall(MC);
-    setValue(&I, MC);
     return;
   }
   case Intrinsic::memmove_element_unordered_atomic: {
@@ -6050,7 +6044,6 @@ void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I,
                              isTC, MachinePointerInfo(MI.getRawDest()),
                              MachinePointerInfo(MI.getRawSource()));
     updateDAGForMaybeTailCall(MC);
-    setValue(&I, MC);
     return;
   }
   case Intrinsic::memset_element_unordered_atomic: {
@@ -6066,7 +6059,6 @@ void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I,
         DAG.getAtomicMemset(getRoot(), sdl, Dst, Val, Length, LengthTy, ElemSz,
                             isTC, MachinePointerInfo(MI.getRawDest()));
     updateDAGForMaybeTailCall(MC);
-    setValue(&I, MC);
     return;
   }
   case Intrinsic::call_preallocated_setup: {