OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[coff] remove_dots from /PDBPATH but not /PDBALTPATH. 

This more closely matches the behavior of link.exe, and also
simplifies the code slightly.

llvm-svn: 336882
This commit is contained in:
Zachary Turner 2018-07-12 03:22:39 +00:00
parent fdf13ef342
commit e2ce2a5c86
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lld/COFF/Driver.cpp
View File

@ -1384,7 +1384,12 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
// /pdbaltpath flag was passed. // /pdbaltpath flag was passed.
if (Config->PDBAltPath.empty()) { if (Config->PDBAltPath.empty()) {
Config->PDBAltPath = Config->PDBPath; Config->PDBAltPath = Config->PDBPath;
// It's important to make the path absolute and remove dots. This path
// will eventually be written into the PE header, and certain Microsoft
// tools won't work correctly if these assumptions are not held.
sys::fs::make_absolute(Config->PDBAltPath); sys::fs::make_absolute(Config->PDBAltPath);
sys::path::remove_dots(Config->PDBAltPath);
} }
} }

11
lld/COFF/Writer.cpp
View File

@ -122,7 +122,7 @@ private:
class CVDebugRecordChunk : public Chunk { class CVDebugRecordChunk : public Chunk {
public: public:
size_t getSize() const override { size_t getSize() const override {
return sizeof(codeview::DebugInfo) + Path.size() + 1; return sizeof(codeview::DebugInfo) + Config->PDBAltPath.size() + 1;
} }
void writeTo(uint8_t *B) const override { void writeTo(uint8_t *B) const override {
@ -132,12 +132,11 @@ public:
// variable sized field (PDB Path) // variable sized field (PDB Path)
char *P = reinterpret_cast<char *>(B + OutputSectionOff + sizeof(*BuildId)); char *P = reinterpret_cast<char *>(B + OutputSectionOff + sizeof(*BuildId));
if (!Path.empty()) if (!Config->PDBAltPath.empty())
memcpy(P, Path.data(), Path.size()); memcpy(P, Config->PDBAltPath.data(), Config->PDBAltPath.size());
P[Path.size()] = '\0'; P[Config->PDBAltPath.size()] = '\0';
} }
SmallString<128> Path;
mutable codeview::DebugInfo *BuildId = nullptr; mutable codeview::DebugInfo *BuildId = nullptr;
}; };
@ -510,8 +509,6 @@ void Writer::createMiscChunks() {
// if we're ultimately not going to write CodeView data to the PDB. // if we're ultimately not going to write CodeView data to the PDB.
auto *CVChunk = make<CVDebugRecordChunk>(); auto *CVChunk = make<CVDebugRecordChunk>();
BuildId = CVChunk; BuildId = CVChunk;
CVChunk->Path = Config->PDBAltPath;
llvm::sys::path::remove_dots(CVChunk->Path);
DebugRecords.push_back(CVChunk); DebugRecords.push_back(CVChunk);
RdataSec->addChunk(DebugDirectory); RdataSec->addChunk(DebugDirectory);