From: Yaron Keren <yaron.keren@gmail.com>
Date: Mon, 10 Aug 2015 18:27:51 +0000 (+0000)
Subject: Recommit r244470+ r244471 together, the bot failed between them.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ad3b336f112dc5c1910e386f4953ba9a2cc0b48;p=platform%2Fupstream%2Fllvm.git

Recommit r244470+ r244471 together, the bot failed between them.

llvm-svn: 244476
---

diff --git a/llvm/tools/dsymutil/DwarfLinker.cpp b/llvm/tools/dsymutil/DwarfLinker.cpp
index 95f4ae4..4231b14 100644
--- a/llvm/tools/dsymutil/DwarfLinker.cpp
+++ b/llvm/tools/dsymutil/DwarfLinker.cpp
@@ -2884,15 +2884,13 @@ void DwarfLinker::patchLineTableForUnit(CompileUnit &Unit,
       if (StopAddress != -1ULL && !Seq.empty()) {
         // Insert end sequence row with the computed end address, but
         // the same line as the previous one.
-        // Do not collapse the next two statements as the push_back operation
-        // may reallocate the vector and invalidate the iterator Seq.back().
         auto NextLine = Seq.back();
+        NextLine.Address = StopAddress;
+        NextLine.EndSequence = 1;
+        NextLine.PrologueEnd = 0;
+        NextLine.BasicBlock = 0;
+        NextLine.EpilogueBegin = 0;
         Seq.push_back(NextLine);
-        Seq.back().Address = StopAddress;
-        Seq.back().EndSequence = 1;
-        Seq.back().PrologueEnd = 0;
-        Seq.back().BasicBlock = 0;
-        Seq.back().EpilogueBegin = 0;
         insertLineSequence(Seq, NewRows);
       }