Skip to content

Commit

Permalink
[LTO] onfig::addSaveTemps: clear ResolutionFile upon an error
Browse files Browse the repository at this point in the history
Otherwise ld.lld -save-temps will crash when writing to ResolutionFile.

llvm-lto2 -save-temps does not crash because it exits immediately.

Reviewed By: evgeny777

Differential Revision: https://reviews.llvm.org/D75426
  • Loading branch information
MaskRay committed Mar 3, 2020
1 parent 20ce8af commit 08ff4dc
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
16 changes: 16 additions & 0 deletions lld/test/ELF/lto/resolution-err.ll
@@ -0,0 +1,16 @@
; UNSUPPORTED: system-windows
; REQUIRES: shell
; RUN: llvm-as %s -o %t.bc
; RUN: touch %t.resolution.txt
; RUN: chmod -w %t.resolution.txt
; RUN: not ld.lld -save-temps %t.bc -o %t 2>&1 | FileCheck %s
; RUN: rm -f %t.resolution.txt

; CHECK: error: {{[Pp]}}ermission denied{{$}}

target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"

define void @_start() {
ret void
}
4 changes: 3 additions & 1 deletion llvm/lib/LTO/LTOBackend.cpp
Expand Up @@ -61,8 +61,10 @@ Error Config::addSaveTemps(std::string OutputFileName,
std::error_code EC;
ResolutionFile = std::make_unique<raw_fd_ostream>(
OutputFileName + "resolution.txt", EC, sys::fs::OpenFlags::OF_Text);
if (EC)
if (EC) {
ResolutionFile.reset();
return errorCodeToError(EC);
}

auto setHook = [&](std::string PathSuffix, ModuleHookFn &Hook) {
// Keep track of the hook provided by the linker, which also needs to run.
Expand Down

0 comments on commit 08ff4dc

Please sign in to comment.