diff options
5 files changed, 40 insertions, 30 deletions
diff --git a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-expected-unprotected.s b/llvm/test/tools/llvm-cfi-verify/X86/blacklist-expected-unprotected.s index fbcfcc2a7cc..c7a3daa0776 100644 --- a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-expected-unprotected.s +++ b/llvm/test/tools/llvm-cfi-verify/X86/blacklist-expected-unprotected.s @@ -5,7 +5,7 @@ # CHECK-LABEL: U # CHECK-NEXT: tiny.cc:11 -# CHECK-NEXT: BLACKLIST MATCH, 'src' +# CHECK-NEXT: {{^Blacklist Match:.*blacklist\.txt:1$}} # CHECK-NEXT: ====> Expected Unprotected # CHECK: Expected Protected: 0 (0.00%) diff --git a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-match-fun.s b/llvm/test/tools/llvm-cfi-verify/X86/blacklist-match-fun.s index 3ea829395c4..f46fb926c5f 100644 --- a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-match-fun.s +++ b/llvm/test/tools/llvm-cfi-verify/X86/blacklist-match-fun.s @@ -5,7 +5,7 @@ # CHECK-LABEL: U # CHECK-NEXT: tiny.cc:11 -# CHECK-NEXT: BLACKLIST MATCH, 'fun' +# CHECK-NEXT: {{^Blacklist Match:.*blacklist\.txt:1$}} # CHECK-NEXT: ====> Expected Unprotected # CHECK: Expected Protected: 0 (0.00%) diff --git a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-unexpected-protected.s b/llvm/test/tools/llvm-cfi-verify/X86/blacklist-unexpected-protected.s index c6ddf2b5d11..0fd412416a9 100644 --- a/llvm/test/tools/llvm-cfi-verify/X86/blacklist-unexpected-protected.s +++ b/llvm/test/tools/llvm-cfi-verify/X86/blacklist-unexpected-protected.s @@ -5,7 +5,7 @@ # CHECK-LABEL: P # CHECK-NEXT: tiny.cc:11 -# CHECK-NEXT: BLACKLIST MATCH, 'src' +# CHECK-NEXT: {{^Blacklist Match:.*blacklist\.txt:1$}} # CHECK-NEXT: ====> Unexpected Protected # CHECK: Expected Protected: 0 (0.00%) diff --git a/llvm/tools/llvm-cfi-verify/lib/FileAnalysis.cpp b/llvm/tools/llvm-cfi-verify/lib/FileAnalysis.cpp index 0d4e1f497ff..863bbfb045e 100644 --- a/llvm/tools/llvm-cfi-verify/lib/FileAnalysis.cpp +++ b/llvm/tools/llvm-cfi-verify/lib/FileAnalysis.cpp @@ -370,21 +370,6 @@ void FileAnalysis::parseSectionContents(ArrayRef<uint8_t> SectionBytes, InstrMeta.InstructionSize = InstructionSize; InstrMeta.Valid = ValidInstruction; - // Check if this instruction exists in the range of the DWARF metadata. - if (!IgnoreDWARFFlag) { - auto LineInfo = - Symbolizer->symbolizeCode(Object->getFileName(), VMAddress); - if (!LineInfo) { - handleAllErrors(LineInfo.takeError(), [](const ErrorInfoBase &E) { - errs() << "Symbolizer failed to get line: " << E.message() << "\n"; - }); - continue; - } - - if (LineInfo->FileName == "<invalid>") - continue; - } - addInstruction(InstrMeta); if (!ValidInstruction) @@ -406,6 +391,21 @@ void FileAnalysis::parseSectionContents(ArrayRef<uint8_t> SectionBytes, if (!usesRegisterOperand(InstrMeta)) continue; + // Check if this instruction exists in the range of the DWARF metadata. + if (!IgnoreDWARFFlag) { + auto LineInfo = + Symbolizer->symbolizeCode(Object->getFileName(), VMAddress); + if (!LineInfo) { + handleAllErrors(LineInfo.takeError(), [](const ErrorInfoBase &E) { + errs() << "Symbolizer failed to get line: " << E.message() << "\n"; + }); + continue; + } + + if (LineInfo->FileName == "<invalid>") + continue; + } + IndirectInstructions.insert(VMAddress); } } diff --git a/llvm/tools/llvm-cfi-verify/llvm-cfi-verify.cpp b/llvm/tools/llvm-cfi-verify/llvm-cfi-verify.cpp index 3b4a5c155d0..01f03158d6b 100644 --- a/llvm/tools/llvm-cfi-verify/llvm-cfi-verify.cpp +++ b/llvm/tools/llvm-cfi-verify/llvm-cfi-verify.cpp @@ -47,6 +47,7 @@ void printIndirectCFInstructions(FileAnalysis &Analysis, uint64_t UnexpectedUnprotected = 0; symbolize::LLVMSymbolizer &Symbolizer = Analysis.getSymbolizer(); + std::map<unsigned, uint64_t> BlameCounter; for (uint64_t Address : Analysis.getIndirectInstructions()) { const auto &InstrMeta = Analysis.getInstructionOrDie(Address); @@ -97,20 +98,20 @@ void printIndirectCFInstructions(FileAnalysis &Analysis, continue; } - bool MatchesBlacklistRule = false; - if (SpecialCaseList->inSection("cfi-icall", "src", LineInfo.FileName) || - SpecialCaseList->inSection("cfi-vcall", "src", LineInfo.FileName)) { - outs() << "BLACKLIST MATCH, 'src'\n"; - MatchesBlacklistRule = true; + unsigned BlameLine = 0; + for (auto &K : {"cfi-icall", "cfi-vcall"}) { + if (!BlameLine) + BlameLine = + SpecialCaseList->inSectionBlame(K, "src", LineInfo.FileName); + if (!BlameLine) + BlameLine = + SpecialCaseList->inSectionBlame(K, "fun", LineInfo.FunctionName); } - if (SpecialCaseList->inSection("cfi-icall", "fun", LineInfo.FunctionName) || - SpecialCaseList->inSection("cfi-vcall", "fun", LineInfo.FunctionName)) { - outs() << "BLACKLIST MATCH, 'fun'\n"; - MatchesBlacklistRule = true; - } - - if (MatchesBlacklistRule) { + if (BlameLine) { + outs() << "Blacklist Match: " << BlacklistFilename << ":" << BlameLine + << "\n"; + BlameCounter[BlameLine]++; if (CFIProtected) { UnexpectedProtected++; outs() << "====> Unexpected Protected\n"; @@ -149,6 +150,15 @@ void printIndirectCFInstructions(FileAnalysis &Analysis, ((double)ExpectedUnprotected) / IndirectCFInstructions, UnexpectedUnprotected, ((double)UnexpectedUnprotected) / IndirectCFInstructions); + + if (!SpecialCaseList) + return; + + outs() << "Blacklist Results:\n"; + for (const auto &KV : BlameCounter) { + outs() << " " << BlacklistFilename << ":" << KV.first << " affects " + << KV.second << " indirect CF instructions.\n"; + } } int main(int argc, char **argv) { |
