From 02a1364bf8ede511ad603e5aa99ea7dbf11f0609 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Sun, 21 Jul 2013 12:58:07 +0000 Subject: Handle replacement into a position past the original member. We were incorrectly computing where to insert a member if it was replacing a previous member that was before the insert point. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186792 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-ar/llvm-ar.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/llvm-ar') diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 4ade562ad8..b1c8986134 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -458,10 +458,10 @@ computeNewArchiveMembers(ArchiveOperation Operation, int InsertPos = -1; StringRef PosName = sys::path::filename(RelPos); if (OldArchive) { - int Pos = 0; for (object::Archive::child_iterator I = OldArchive->begin_children(), E = OldArchive->end_children(); - I != E; ++I, ++Pos) { + I != E; ++I) { + int Pos = Ret.size(); StringRef Name; failIfError(I->getName(Name)); if (Name == PosName) { -- cgit v1.2.3