commit d0ef39199551573d9d5f2372c686cf96a8226a47
author swift-ci <swift-ci@users.noreply.github.com> Tue Aug 29 18:14:49 2017 -0700
committer swift-ci <swift-ci@users.noreply.github.com> Tue Aug 29 18:14:49 2017 -0700
tree 80490cb45733ea466c61f771d3242549694488bb
parent 4214cd4f900196cc14ca1add3b9ce60eeef16935
parent 69520206bcec38139fc58af3cddd9bfccc2a15c3

Merge remote-tracking branch 'origin/swift-4.1-branch' into stable

lib/profile/InstrProfilingFile.c

diff --git a/lib/profile/InstrProfilingFile.c b/lib/profile/InstrProfilingFile.c
index 553baad..b36b550 100644
--- a/lib/profile/InstrProfilingFile.c
+++ b/lib/profile/InstrProfilingFile.c
@@ -574,8 +574,10 @@
 
   EnvFilenamePat = getFilenamePatFromEnv();
   if (EnvFilenamePat) {
-    SelectedPat = EnvFilenamePat;
-    PNS = PNS_environment;
+    /* Pass CopyFilenamePat = 1, to ensure that the filename would be valid 
+       at the  moment when __llvm_profile_write_file() gets executed. */
+    parseAndSetFilename(EnvFilenamePat, PNS_environment, 1);
+    return;
   } else if (hasCommandLineOverrider) {
     SelectedPat = INSTR_PROF_PROFILE_NAME_VAR;
     PNS = PNS_command_line;