diff options
-rw-r--r-- | compiler-rt/lib/profile/InstrProfiling.h | 4 | ||||
-rw-r--r-- | compiler-rt/lib/profile/InstrProfilingFile.c | 8 | ||||
-rw-r--r-- | compiler-rt/test/profile/instrprof-error.c | 12 |
3 files changed, 21 insertions, 3 deletions
diff --git a/compiler-rt/lib/profile/InstrProfiling.h b/compiler-rt/lib/profile/InstrProfiling.h index 7ee41c3f36e..0aa24071ba6 100644 --- a/compiler-rt/lib/profile/InstrProfiling.h +++ b/compiler-rt/lib/profile/InstrProfiling.h @@ -163,4 +163,8 @@ uint64_t __llvm_profile_get_magic(void); /*! \brief Get the version of the file format. */ uint64_t __llvm_profile_get_version(void); +#define PROF_ERR(Format, ...) \ + if (getenv("LLVM_PROFILE_VERBOSE_ERRORS")) \ + fprintf(stderr, Format, __VA_ARGS__ ); + #endif /* PROFILE_INSTRPROFILING_H_ */ diff --git a/compiler-rt/lib/profile/InstrProfilingFile.c b/compiler-rt/lib/profile/InstrProfilingFile.c index 5663bab34de..8e9d2dab5b4 100644 --- a/compiler-rt/lib/profile/InstrProfilingFile.c +++ b/compiler-rt/lib/profile/InstrProfilingFile.c @@ -193,13 +193,15 @@ int __llvm_profile_write_file(void) { int rc; /* Check the filename. */ - if (!__llvm_profile_CurrentFilename) + if (!__llvm_profile_CurrentFilename) { + PROF_ERR("LLVM Profile: Failed to write file : %s\n", "Filename not set"); return -1; + } /* Write the file. */ rc = writeFileWithName(__llvm_profile_CurrentFilename); - if (rc && getenv("LLVM_PROFILE_VERBOSE_ERRORS")) - fprintf(stderr, "LLVM Profile: Failed to write file \"%s\": %s\n", + if (rc) + PROF_ERR("LLVM Profile: Failed to write file \"%s\": %s\n", __llvm_profile_CurrentFilename, strerror(errno)); return rc; } diff --git a/compiler-rt/test/profile/instrprof-error.c b/compiler-rt/test/profile/instrprof-error.c new file mode 100644 index 00000000000..4386d532187 --- /dev/null +++ b/compiler-rt/test/profile/instrprof-error.c @@ -0,0 +1,12 @@ +// RUN: %clang_profgen -o %t -O3 %s +// RUN: touch %t.profraw +// RUN: chmod -w %t.profraw +// RUN: LLVM_PROFILE_FILE=%t.profraw LLVM_PROFILE_VERBOSE_ERRORS=1 %run %t 1 2>&1 | FileCheck %s +// RUN: chmod +w %t.profraw + +int main(int argc, const char *argv[]) { + if (argc < 2) + return 1; + return 0; +} +// CHECK: LLVM Profile: Failed to write file |