Use litsupport.shellcommand to set LLVM_PROFILE_FILE

Differential Revision: https://reviews.llvm.org/D121225

Author: MatzeB

litsupport/modules/profilegen.py

@@ -7,9 +7,10 @@ def _mutateCommandline(context, commandline):
     """Adjust runscript to set a different value to the LLVM_PROFILE_FILE
     environment variable for each execution."""
     profilefile = context.tmpBase + ".profraw"
-    prefix = "env LLVM_PROFILE_FILE=%s " % profilefile
     context.profilefiles.append(profilefile)
-    return prefix + commandline
+    cmd = shellcommand.parse(commandline)
+    cmd.envvars.update({"LLVM_PROFILE_FILE": profilefile})
+    return cmd.toCommandline()
 
 
 def _mutateScript(context, script):

litsupport/shellcommand.py

@@ -32,12 +32,12 @@ def toCommandline(self):
         if self.workdir is not None:
             result += "cd %s && " % quote(self.workdir)
 
-        res_list = [self.executable] + self.arguments
-        result += " ".join(map(quote, res_list))
-
         for key, value in self.envvars.items():
             result += "%s=%s " % (key, quote(value))
 
+        res_list = [self.executable] + self.arguments
+        result += " ".join(map(quote, res_list))
+
         if self.stdin is not None:
             result += " < %s" % quote(self.stdin)
         if self.stdout is not None: