averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Macros] Small changes for review

Browse Source
This commit is contained in:
Rintaro Ishizaki
2023-02-22 17:41:43 -08:00
parent c5a737f9ba
commit c6387a5450
6 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Basic/Program.cpp
View File

@@ -59,7 +59,6 @@ toNullTerminatedCStringArray(ArrayRef<StringRef> array,
llvm::BumpPtrAllocator &Alloc) {
size_t size = array.size();
const char **result = Alloc.Allocate<const char *>(size + 1);
const char **ptr = result;
for (size_t i = 0; i < size; ++i) {
result[i] = NullTerminatedStringRef(array[i], Alloc).data();
}
@@ -155,8 +154,7 @@ swift::ExecuteWithPipe(llvm::StringRef program,
dup2(p2.write, STDOUT_FILENO);
// Execute the program.
if (env.has_value()) {
const char **envp = toNullTerminatedCStringArray(*env, Alloc);
if (envp) {
execve(progCStr, const_cast<char **>(argv), const_cast<char **>(envp));
} else {
execv(progCStr, const_cast<char **>(argv));