[CallSiteSplitting] Dereference pointer earlier.
authorFlorian Hahn <florian.hahn@arm.com>
Tue, 13 Feb 2018 13:51:51 +0000 (13:51 +0000)
committerFlorian Hahn <florian.hahn@arm.com>
Tue, 13 Feb 2018 13:51:51 +0000 (13:51 +0000)
This should make the sanitizers happy.

llvm-svn: 325004

llvm/lib/Transforms/Scalar/CallSiteSplitting.cpp

index af78b7c..faea3fa 100644 (file)
@@ -296,10 +296,10 @@ static void splitCallSite(
       CallPN->addIncoming(NewCI, SplitBlock);
   }
 
-  auto OriginalBegin = TailBB->begin();
+  auto *OriginalBegin = &*TailBB->begin();
   // Replace users of the original call with a PHI mering call-sites split.
   if (CallPN) {
-    CallPN->insertBefore(&*OriginalBegin);
+    CallPN->insertBefore(OriginalBegin);
     Instr->replaceAllUsesWith(CallPN);
   }
 
@@ -327,7 +327,7 @@ static void splitCallSite(
     }
     CurrentI->eraseFromParent();
     // We are done once we handled the first original instruction in TailBB.
-    if (CurrentI == &*OriginalBegin)
+    if (CurrentI == OriginalBegin)
       break;
   }
   NumCallSiteSplit++;