maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[PECOFF] Fix the order of the Import Table entries. 

Test is coming after submitting http://llvm-reviews.chandlerc.com/D1719.

llvm-svn: 190983
This commit is contained in:
Rui Ueyama 2013-09-19 01:39:53 +00:00
parent 2956112308
commit 0397239f6b
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lld/lib/ReaderWriter/PECOFF/IdataPass.h
View File

@ -288,12 +288,20 @@ private:
new (_alloc) ImportDirectoryAtom(context, loadName, dllAtoms);
}
// Append vec2's elements at the end of vec1.
template <typename T, typename U>
void appendAtoms(vector<T *> &vec1, const vector<U *> &vec2) {
vec1.insert(vec1.end(), vec2.begin(), vec2.end());
}
void connectAtoms(Context &context) {
coff::connectAtomsWithLayoutEdge(context.importDirectories);
coff::connectAtomsWithLayoutEdge(context.importLookupTables);
coff::connectAtomsWithLayoutEdge(context.importAddressTables);
coff::connectAtomsWithLayoutEdge(context.hintNameAtoms);
coff::connectAtomsWithLayoutEdge(context.dllNameAtoms);
vector<COFFBaseDefinedAtom *> atoms;
appendAtoms(atoms, context.importDirectories);
appendAtoms(atoms, context.importLookupTables);
appendAtoms(atoms, context.importAddressTables);
appendAtoms(atoms, context.dllNameAtoms);
appendAtoms(atoms, context.hintNameAtoms);
coff::connectAtomsWithLayoutEdge(atoms);
}
/// The addresses of the import dirctory and the import address table needs to