diff options
| -rw-r--r-- | test/Object/archive-replace-pos.test | 13 | ||||
| -rw-r--r-- | tools/llvm-ar/llvm-ar.cpp | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/test/Object/archive-replace-pos.test b/test/Object/archive-replace-pos.test index 307f0709a7..0ba9b6dd28 100644 --- a/test/Object/archive-replace-pos.test +++ b/test/Object/archive-replace-pos.test @@ -11,3 +11,16 @@ RUN: llvm-ar t %t.a | FileCheck %s CHECK: .foo CHECK-NEXT: .zed CHECK-NEXT: .bar + +RUN: llvm-ar rc %t.a %t.foo %t.bar +RUN: llvm-ar t %t.a | FileCheck --check-prefix=CHECK2 %s + +CHECK2: .zed +CHECK2-NEXT: .foo +CHECK2-NEXT: .bar + +RUN: llvm-ar rca %t.foo %t.a %t.zed +RUN: llvm-ar t %t.a | FileCheck --check-prefix=CHECK3 %s +CHECK3: .foo +CHECK3-NEXT: .zed +CHECK3-NEXT: .bar 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) { |