[llvm] r244461 - Fully apply David Blaikie suggestion and add comment explaining why.
Yaron Keren via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 10 09:53:30 PDT 2015
Author: yrnkrn
Date: Mon Aug 10 11:53:30 2015
New Revision: 244461
URL: http://llvm.org/viewvc/llvm-project?rev=244461&view=rev
Log:
Fully apply David Blaikie suggestion and add comment explaining why.
Modified:
llvm/trunk/tools/dsymutil/DwarfLinker.cpp
Modified: llvm/trunk/tools/dsymutil/DwarfLinker.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/DwarfLinker.cpp?rev=244461&r1=244460&r2=244461&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/DwarfLinker.cpp (original)
+++ llvm/trunk/tools/dsymutil/DwarfLinker.cpp Mon Aug 10 11:53:30 2015
@@ -2884,8 +2884,10 @@ void DwarfLinker::patchLineTableForUnit(
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();
- Seq.emplace_back(NextLine);
+ Seq.push_back(NextLine);
Seq.back().Address = StopAddress;
Seq.back().EndSequence = 1;
Seq.back().PrologueEnd = 0;
More information about the llvm-commits
mailing list