Skip to content

Commit 9b72aa0

Browse files
committed
Revert "Update to ToT which removed std::error_code"
This reverts commit r18853. This was already fixed by the previous commit. Swift SVN r18855
1 parent f6ef780 commit 9b72aa0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Diff for: lib/Driver/Driver.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ static StringRef getOutputFilename(const JobAction *JA,
818818
// the top level.
819819
StringRef Stem = llvm::sys::path::stem(BaseName);
820820
StringRef Suffix = types::getTypeTempSuffix(JA->getType());
821-
llvm::error_code EC =
821+
std::error_code EC =
822822
llvm::sys::fs::createTemporaryFile(Stem, Suffix, Buffer);
823823
if (EC) {
824824
Diags.diagnose(SourceLoc(),

Diff for: lib/IRGen/IRGenDebugInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ llvm::DIFile IRGenDebugInfo::getOrCreateFile(const char *Filename) {
500500
StringRef File = BumpAllocatedString(llvm::sys::path::filename(Filename));
501501
llvm::SmallString<512> Path(Filename);
502502
llvm::sys::path::remove_filename(Path);
503-
llvm::error_code ec = llvm::sys::fs::make_absolute(Path);
503+
std::error_code ec = llvm::sys::fs::make_absolute(Path);
504504
// Basically ignore any error.
505505
assert(ec == std::error_code());
506506
(void)ec; // Silence the unused variable warning

Diff for: tools/driver/driver.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ int main(int argc_, const char **argv_) {
5454

5555
llvm::SmallVector<const char *, 256> argv;
5656
llvm::SpecificBumpPtrAllocator<char> ArgAllocator;
57-
llvm::error_code EC = llvm::sys::Process::GetArgumentVector(
57+
std::error_code EC = llvm::sys::Process::GetArgumentVector(
5858
argv, llvm::ArrayRef<const char *>(argv_, argc_), ArgAllocator);
5959
if (EC) {
6060
llvm::errs() << "error: couldn't get arguments: " << EC.message() << '\n';

0 commit comments

Comments
 (0)