diff options
Diffstat (limited to 'lib/profile')
-rw-r--r-- | lib/profile/InstrProfilingFile.c | 28 | ||||
-rw-r--r-- | lib/profile/InstrProfilingUtil.c | 3 |
2 files changed, 19 insertions, 12 deletions
diff --git a/lib/profile/InstrProfilingFile.c b/lib/profile/InstrProfilingFile.c index d038bb9cb..ddfa39225 100644 --- a/lib/profile/InstrProfilingFile.c +++ b/lib/profile/InstrProfilingFile.c @@ -513,23 +513,29 @@ const char *__llvm_profile_get_path_prefix(void) { COMPILER_RT_VISIBILITY void __llvm_profile_initialize_file(void) { const char *EnvFilenamePat; - const char *SelectedPat = NULL; - ProfileNameSpecifier PNS = PNS_unknown; int hasCommandLineOverrider = (INSTR_PROF_PROFILE_NAME_VAR[0] != 0); EnvFilenamePat = getFilenamePatFromEnv(); - if (EnvFilenamePat) { - SelectedPat = EnvFilenamePat; - PNS = PNS_environment; - } else if (hasCommandLineOverrider) { - SelectedPat = INSTR_PROF_PROFILE_NAME_VAR; - PNS = PNS_command_line; + if (EnvFilenamePat) + parseAndSetFilename(EnvFilenamePat, PNS_environment, 0); + else if (hasCommandLineOverrider) { + const char *SelectedPat = INSTR_PROF_PROFILE_NAME_VAR; + + size_t PrefixLen; + int StripLen; + const char *Prefix = lprofGetPathPrefix(&StripLen, &PrefixLen); + if (Prefix != NULL) { + char *StripPat = + COMPILER_RT_ALLOCA(PrefixLen + 1 + strlen(SelectedPat) + 1); + lprofApplyPathPrefix(StripPat, SelectedPat, Prefix, PrefixLen, StripLen); + SelectedPat = StripPat; + } + + parseAndSetFilename(SelectedPat, PNS_command_line, Prefix ? 1 : 0); } else { - SelectedPat = NULL; - PNS = PNS_default; + parseAndSetFilename(NULL, PNS_default, 0); } - parseAndSetFilename(SelectedPat, PNS, 0); } /* This API is directly called by the user application code. It has the diff --git a/lib/profile/InstrProfilingUtil.c b/lib/profile/InstrProfilingUtil.c index fb68f30a5..bed97e526 100644 --- a/lib/profile/InstrProfilingUtil.c +++ b/lib/profile/InstrProfilingUtil.c @@ -196,7 +196,8 @@ lprofApplyPathPrefix(char *Dest, const char *PathStr, const char *Prefix, memcpy(Dest, Prefix, PrefixLen); - if (!IS_DIR_SEPARATOR(Prefix[PrefixLen - 1])) + if (!IS_DIR_SEPARATOR(Prefix[PrefixLen - 1]) && + !IS_DIR_SEPARATOR(StrippedPathStr[0])) Dest[PrefixLen++] = DIR_SEPARATOR; memcpy(Dest + PrefixLen, StrippedPathStr, strlen(StrippedPathStr) + 1); |