]> granicus.if.org Git - llvm/commitdiff
[DebugInfo] Remove redundant check in SimplifyCFG; NFC.
authorRobert Lougher <rob.lougher@gmail.com>
Thu, 12 Jan 2017 21:11:09 +0000 (21:11 +0000)
committerRobert Lougher <rob.lougher@gmail.com>
Thu, 12 Jan 2017 21:11:09 +0000 (21:11 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@291813 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Transforms/Utils/SimplifyCFG.cpp

index 01bfd123014979f551dbe8ebfcfa5c4de4271fe2..6e30919246c742384ebb611076b2773491a6e110 100644 (file)
@@ -1275,10 +1275,9 @@ static bool HoistThenElseCodeToIf(BranchInst *BI,
                            LLVMContext::MD_mem_parallel_loop_access};
     combineMetadata(I1, I2, KnownIDs);
 
-    // If the debug loc for I1 and I2 are different, as we are combining them
-    // into one instruction, we do not want to select debug loc randomly from 
-    // I1 or I2.
-    if (!isa<CallInst>(I1) &&  I1->getDebugLoc() != I2->getDebugLoc())
+    // I1 and I2 are being combined into a single instruction.  Its debug
+    // location is the merged locations of the original instructions.
+    if (!isa<CallInst>(I1))
       I1->setDebugLoc(
           DILocation::getMergedLocation(I1->getDebugLoc(), I2->getDebugLoc()));