[PATCH] D75426: [LTO] onfig::addSaveTemps: clear ResolutionFile upon an error

[Fangrui Song via Phabricator via llvm-commits]

MaskRay created this revision.
MaskRay added reviewers: evgeny777, grimar, ruiu, tejohnson.
Herald added subscribers: llvm-commits, dang, dexonsmith, steven_wu, hiraditya, inglorion, emaste.
Herald added a reviewer: espindola.
Herald added a project: LLVM.

Otherwise ld.lld -save-temps will crash when writing to ResolutionFile.

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


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D75426

Files:
  lld/test/ELF/lto/resolution-err.ll
  llvm/lib/LTO/LTOBackend.cpp


Index: llvm/lib/LTO/LTOBackend.cpp
===================================================================
--- llvm/lib/LTO/LTOBackend.cpp
+++ llvm/lib/LTO/LTOBackend.cpp
@@ -61,8 +61,10 @@
   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.
Index: lld/test/ELF/lto/resolution-err.ll
===================================================================
--- /dev/null
+++ 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
+}


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D75426.247513.patch
Type: text/x-patch
Size: 1232 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200301/2a08ad6a/attachment.bin>