[lld] r330145 - Resubmit "Fix some incorrect fields in our generated PDBs."
Zachary Turner via llvm-commits
llvm-commits at lists.llvm.org
Mon Apr 16 11:17:13 PDT 2018
Author: zturner
Date: Mon Apr 16 11:17:13 2018
New Revision: 330145
URL: http://llvm.org/viewvc/llvm-project?rev=330145&view=rev
Log:
Resubmit "Fix some incorrect fields in our generated PDBs."
This fixes the failing tests. They simply hadn't been updated
to match the new output resulting from this patch.
Modified:
lld/trunk/COFF/PDB.cpp
lld/trunk/test/COFF/pdb-source-lines.test
lld/trunk/test/COFF/pdb.test
Modified: lld/trunk/COFF/PDB.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/PDB.cpp?rev=330145&r1=330144&r2=330145&view=diff
==============================================================================
--- lld/trunk/COFF/PDB.cpp (original)
+++ lld/trunk/COFF/PDB.cpp Mon Apr 16 11:17:13 2018
@@ -978,6 +978,23 @@ void PDBLinker::addNatvisFiles() {
}
}
+static codeview::CPUType toCodeViewMachine(COFF::MachineTypes Machine) {
+ switch (Machine) {
+ case COFF::IMAGE_FILE_MACHINE_AMD64:
+ return codeview::CPUType::X64;
+ case COFF::IMAGE_FILE_MACHINE_ARM:
+ return codeview::CPUType::ARM7;
+ case COFF::IMAGE_FILE_MACHINE_ARM64:
+ return codeview::CPUType::ARM64;
+ case COFF::IMAGE_FILE_MACHINE_ARMNT:
+ return codeview::CPUType::ARMNT;
+ case COFF::IMAGE_FILE_MACHINE_I386:
+ return codeview::CPUType::Intel80386;
+ default:
+ llvm_unreachable("Unsupported CPU Type");
+ }
+}
+
static void addCommonLinkerModuleSymbols(StringRef Path,
pdb::DbiModuleDescriptorBuilder &Mod,
BumpPtrAllocator &Allocator) {
@@ -988,7 +1005,7 @@ static void addCommonLinkerModuleSymbols
ONS.Name = "* Linker *";
ONS.Signature = 0;
- CS.Machine = Config->is64() ? CPUType::X64 : CPUType::Intel80386;
+ CS.Machine = toCodeViewMachine(Config->Machine);
// Interestingly, if we set the string to 0.0.0.0, then when trying to view
// local variables WinDbg emits an error that private symbols are not present.
// By setting this to a valid MSVC linker version string, local variables are
@@ -1085,6 +1102,13 @@ void PDBLinker::initialize(const llvm::c
pdb::DbiStreamBuilder &DbiBuilder = Builder.getDbiBuilder();
DbiBuilder.setAge(BuildId.PDB70.Age);
DbiBuilder.setVersionHeader(pdb::PdbDbiV70);
+ DbiBuilder.setMachineType(Config->is64() ? pdb::PDB_Machine::Amd64
+ : pdb::PDB_Machine::x86);
+ // Technically we are not link.exe 14.11, but there are known cases where
+ // debugging tools on Windows expect Microsoft-specific version numbers or
+ // they fail to work at all. Since we know we produce PDBs that are
+ // compatible with LINK 14.11, we set that version number here.
+ DbiBuilder.setBuildNumber(14, 11);
}
void PDBLinker::addSectionContrib(pdb::DbiModuleDescriptorBuilder &LinkerModule,
Modified: lld/trunk/test/COFF/pdb-source-lines.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/pdb-source-lines.test?rev=330145&r1=330144&r2=330145&view=diff
==============================================================================
--- lld/trunk/test/COFF/pdb-source-lines.test (original)
+++ lld/trunk/test/COFF/pdb-source-lines.test Mon Apr 16 11:17:13 2018
@@ -26,11 +26,11 @@ RUN: llvm-pdbutil pdb2yaml -modules -mod
CHECK-LABEL: DbiStream:
CHECK-NEXT: VerHeader: V70
CHECK-NEXT: Age: 1
-CHECK-NEXT: BuildNumber: 0
+CHECK-NEXT: BuildNumber: 36363
CHECK-NEXT: PdbDllVersion: 0
CHECK-NEXT: PdbDllRbld: 0
CHECK-NEXT: Flags: 0
-CHECK-NEXT: MachineType: x86
+CHECK-NEXT: MachineType: Amd64
CHECK-NEXT: Modules:
CHECK-LABEL: - Module: {{.*}}pdb_lines_1.obj
Modified: lld/trunk/test/COFF/pdb.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/pdb.test?rev=330145&r1=330144&r2=330145&view=diff
==============================================================================
--- lld/trunk/test/COFF/pdb.test (original)
+++ lld/trunk/test/COFF/pdb.test Mon Apr 16 11:17:13 2018
@@ -34,11 +34,11 @@
# CHECK-NEXT: DbiStream:
# CHECK-NEXT: VerHeader: V70
# CHECK-NEXT: Age: 1
-# CHECK-NEXT: BuildNumber: 0
+# CHECK-NEXT: BuildNumber: 36363
# CHECK-NEXT: PdbDllVersion: 0
# CHECK-NEXT: PdbDllRbld: 0
# CHECK-NEXT: Flags: 0
-# CHECK-NEXT: MachineType: x86
+# CHECK-NEXT: MachineType: Amd64
# CHECK-NEXT: TpiStream:
# CHECK-NEXT: Version: VC80
# CHECK-NEXT: Records:
More information about the llvm-commits
mailing list