Revert "[CaptureTracking] Supports analysis for dervied pointers"

This reverts commit 87c0937.

Author: Camsyn

llvm/lib/Analysis/CaptureTracking.cpp

@@ -424,10 +424,6 @@ void llvm::PointerMayBeCaptured(const Value *V, CaptureTracker *Tracker,
   if (MaxUsesToExplore == 0)
     MaxUsesToExplore = DefaultMaxUsesToExplore;
 
-  // When analyzing a derived pointer, we need to analyze its underlying
-  // object to determine whether it is captured.
-  // E.g., `ptr + 1` is captured if `ptr` is captured.
-  V = getUnderlyingObjectAggressive(V);
   SmallVector<const Use *, 20> Worklist;
   Worklist.reserve(getDefaultMaxUsesToExploreForCaptureTracking());
   SmallSet<const Use *, 20> Visited;

llvm/unittests/Analysis/CaptureTrackingTest.cpp

@@ -132,31 +132,3 @@ TEST(CaptureTracking, MultipleUsesInSameInstruction) {
   EXPECT_EQ(ICmp, CT.Captures[6]->getUser());
   EXPECT_EQ(1u, CT.Captures[6]->getOperandNo());
 }
-
-TEST(CaptureTracking, DerivedPointerIfBasePointerCaptured) {
-  StringRef Assembly = R"(
-    declare void @bar(ptr)
-
-    define void @test() {
-      %stkobj = alloca [2 x i32]
-      %derived = getelementptr inbounds [2 x i32], ptr %stkobj, i64 0, i64 1
-      store i32 1, ptr %derived
-      call void @bar(ptr %stkobj)
-      ret void
-    }
-  )";
-
-  LLVMContext Context;
-  SMDiagnostic Error;
-  auto M = parseAssemblyString(Assembly, Error, Context);
-  ASSERT_TRUE(M) << "Bad assembly?";
-
-  Function *F = M->getFunction("test");
-  BasicBlock *BB = &F->getEntryBlock();
-  Instruction *StackObj = &*BB->begin();
-  Instruction *DerviedPtr = StackObj->getNextNode();
-  
-  // The base object and its derived pointer are both captured.
-  EXPECT_TRUE(PointerMayBeCaptured(StackObj, true));
-  EXPECT_TRUE(PointerMayBeCaptured(DerviedPtr, true));
-}