From 0119e384918f54c7e694bb19befeed9b7397f787 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Fri, 7 Sep 2018 23:36:08 +0000 Subject: [PATCH] Fix some of the PDB tests. They were unintentionally calling DIA directly, which requires Windows. We need to pass the -native flag, and this then required fixing up one or two tests. llvm-svn: 341731 --- llvm/lib/DebugInfo/PDB/Native/NativeCompilandSymbol.cpp | 2 -- llvm/test/DebugInfo/PDB/Native/pdb-native-compilands.test | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/llvm/lib/DebugInfo/PDB/Native/NativeCompilandSymbol.cpp b/llvm/lib/DebugInfo/PDB/Native/NativeCompilandSymbol.cpp index 7856da38..14c976f 100644 --- a/llvm/lib/DebugInfo/PDB/Native/NativeCompilandSymbol.cpp +++ b/llvm/lib/DebugInfo/PDB/Native/NativeCompilandSymbol.cpp @@ -26,8 +26,6 @@ PDB_SymType NativeCompilandSymbol::getSymTag() const { void NativeCompilandSymbol::dump(raw_ostream &OS, int Indent) const { NativeRawSymbol::dump(OS, Indent); - dumpSymbolField(OS, "baseType", static_cast(getBuiltinType()), - Indent); dumpSymbolField(OS, "lexicalParentId", 0, Indent); dumpSymbolField(OS, "libraryName", getLibraryName(), Indent); dumpSymbolField(OS, "name", getName(), Indent); diff --git a/llvm/test/DebugInfo/PDB/Native/pdb-native-compilands.test b/llvm/test/DebugInfo/PDB/Native/pdb-native-compilands.test index 028e337..7dca036 100644 --- a/llvm/test/DebugInfo/PDB/Native/pdb-native-compilands.test +++ b/llvm/test/DebugInfo/PDB/Native/pdb-native-compilands.test @@ -3,7 +3,7 @@ ; RUN: | FileCheck -check-prefix=EMPTY %s ; RUN: llvm-pdbutil pretty -native -compilands %p/../Inputs/big-read.pdb \ ; RUN: | FileCheck -check-prefix=BIGREAD %s -; RUN: llvm-pdbutil diadump -compilands %p/../Inputs/empty.pdb \ +; RUN: llvm-pdbutil diadump -native -compilands %p/../Inputs/empty.pdb \ ; RUN: | FileCheck -check-prefix=DUMP %s ; Reference output was generated with the DIA reader to ensure that the @@ -67,9 +67,9 @@ BIGREAD: api-ms-win-crt-heap-l1-1-0.dll BIGREAD: * Linker * DUMP: { -DUMP-NEXT: symIndexId: 1 +DUMP-NEXT: symIndexId: 2 DUMP-NEXT: symTag: 2 -DUMP-NEXT: lexicalParentId: 2 +DUMP-NEXT: lexicalParentId: 0 DUMP-NEXT: libraryName: d:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj DUMP-NEXT: name: d:\src\llvm\test\DebugInfo\PDB\Inputs\empty.obj DUMP-NEXT: editAndContinueEnabled: 0 @@ -77,7 +77,7 @@ DUMP-NEXT: } DUMP-NEXT: { DUMP-NEXT: symIndexId: 3 DUMP-NEXT: symTag: 2 -DUMP-NEXT: lexicalParentId: 2 +DUMP-NEXT: lexicalParentId: 0 DUMP-NEXT: libraryName: DUMP-NEXT: name: * Linker * DUMP-NEXT: editAndContinueEnabled: 0 -- 2.7.4