6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-23 17:24:48 +00:00
Code Issues Projects Releases Wiki Activity

Handle replacement into a position past the original member.

Browse Source 
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
This commit is contained in:
Rafael Espindola
2013-07-21 12:58:07 +00:00
parent 5d3041f99d
commit 02a1364bf8
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/Object/archive-replace-pos.test
View File

@ -11,3 +11,16 @@ RUN: llvm-ar t %t.a | FileCheck %s
CHECK: .foo CHECK: .foo
CHECK-NEXT: .zed CHECK-NEXT: .zed
CHECK-NEXT: .bar 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

4
tools/llvm-ar/llvm-ar.cpp
View File

@ -458,10 +458,10 @@ computeNewArchiveMembers(ArchiveOperation Operation,
int InsertPos = -1; int InsertPos = -1;
StringRef PosName = sys::path::filename(RelPos); StringRef PosName = sys::path::filename(RelPos);
if (OldArchive) { if (OldArchive) {
int Pos = 0;
for (object::Archive::child_iterator I = OldArchive->begin_children(), for (object::Archive::child_iterator I = OldArchive->begin_children(),
E = OldArchive->end_children(); E = OldArchive->end_children();
I != E; ++I, ++Pos) { I != E; ++I) {
int Pos = Ret.size();
StringRef Name; StringRef Name;
failIfError(I->getName(Name)); failIfError(I->getName(Name));
if (Name == PosName) { if (Name == PosName) {