Merge commit '7c861bcedf61' from llvm.org/main into next

Author: git apple-llvm automerger

llvm/lib/Support/Windows/Program.inc

@@ -220,8 +220,7 @@ static bool Execute(ProcessInfo &PI, StringRef Program,
       llvm::append_range(EnvBlock, EnvString);
       EnvBlock.push_back(0);
     }
-    // If an empty environment (*Env is size zero), we need to
-    // terminate with two nulls.
+    // Empty environments need to be terminated with two nulls.
     if (Env->size() == 0)
       EnvBlock.push_back(0);
     EnvBlock.push_back(0);