RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

[sancov] better input parameters validation

Browse Source 
Differential Revision: https://reviews.llvm.org/D30370

llvm-svn: 296900
This commit is contained in:
Mike Aizatsky 2017-03-03 18:22:20 +00:00
parent dd6a386236
commit df0432e5e2
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/tools/sancov/AArch64/print_coverage_pcs.test
View File

@ -1,4 +1,4 @@
REQUIRES: aarch64-registered-target
RUN: not sancov -print-coverage-pcs %p/../Inputs/test-linux_android_aarch64 2>&1 | FileCheck %s --check-prefix=AARCH64
AARCH64: Error: __sanitizer_cov* functions not found
AARCH64: ERROR: __sanitizer_cov* functions not found

6
test/tools/sancov/validation.test Normal file
View File

@ -0,0 +1,6 @@
REQUIRES: x86_64-linux
RUN: not sancov -covered-functions %p/Inputs/test-linux_x86_64 2>&1 | FileCheck --check-prefix=NOCFILE %s
NOCFILE: WARNING: No coverage file for {{.*}}test-linux_x86_64
NOCFILE: ERROR: No valid coverage files given.

17
tools/sancov/sancov.cc
View File

@ -180,7 +180,7 @@ struct CoverageStats {
// --------- ERROR HANDLING ---------
static void fail(const llvm::Twine &E) {
errs() << "Error: " << E << "\n";
errs() << "ERROR: " << E << "\n";
exit(1);
}
@ -192,7 +192,7 @@ static void failIf(bool B, const llvm::Twine &E) {
static void failIfError(std::error_code Error) {
if (!Error)
return;
errs() << "Error: " << Error.message() << "(" << Error.value() << ")\n";
errs() << "ERROR: " << Error.message() << "(" << Error.value() << ")\n";
exit(1);
}
@ -202,7 +202,7 @@ template <typename T> static void failIfError(const ErrorOr<T> &E) {
static void failIfError(Error Err) {
if (Err) {
logAllUnhandledErrors(std::move(Err), errs(), "Error: ");
logAllUnhandledErrors(std::move(Err), errs(), "ERROR: ");
exit(1);
}
}
@ -1086,6 +1086,9 @@ static void readAndPrintRawCoverage(const std::vector<std::string> &FileNames,
static std::unique_ptr<SymbolizedCoverage>
merge(const std::vector<std::unique_ptr<SymbolizedCoverage>> &Coverages) {
if (Coverages.empty())
return nullptr;
auto Result = make_unique<SymbolizedCoverage>();
for (size_t I = 0; I < Coverages.size(); ++I) {
@ -1168,11 +1171,17 @@ readSymbolizeAndMergeCmdArguments(std::vector<std::string> FileNames) {
CoverageByObjFile[Iter->second].push_back(FileName);
};
for (const auto &Pair : ObjFiles) {
auto FileName = Pair.second;
if (CoverageByObjFile.find(FileName) == CoverageByObjFile.end())
errs() << "WARNING: No coverage file for " << FileName << "\n";
}
// Read raw coverage and symbolize it.
for (const auto &Pair : CoverageByObjFile) {
if (findSanitizerCovFunctions(Pair.first).empty()) {
errs()
<< "Ignoring " << Pair.first
<< "WARNING: Ignoring " << Pair.first
<< " and its coverage because __sanitizer_cov* functions were not "
"found.\n";
continue;