[PATCH] D112297: [LTO] Fix assertion failed when flushing bitcode incrementally for LTO output.

Xu Mingjie via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Thu Oct 28 19:55:01 PDT 2021


Enna1 updated this revision to Diff 383221.
Enna1 edited the summary of this revision.
Enna1 added a comment.

Update patch.
Introduce an is_regular_file check in raw_fd_stream constructor, if not a regular file, return an error code. And BitcodeWriter will fallback use raw_fd_ostream.
This looks good under my tests.
Thanks @stephan.yichao.zhao


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D112297/new/

https://reviews.llvm.org/D112297

Files:
  lld/test/ELF/lto/emit-llvm_assertion_failure.ll
  llvm/lib/Support/raw_ostream.cpp


Index: llvm/lib/Support/raw_ostream.cpp
===================================================================
--- llvm/lib/Support/raw_ostream.cpp
+++ llvm/lib/Support/raw_ostream.cpp
@@ -914,8 +914,9 @@
   if (EC)
     return;
 
-  // Do not support non-seekable files.
-  if (!supportsSeeking())
+  sys::fs::file_status Status;
+  EC = status(get_fd(), Status);
+  if (EC || Status.type() != sys::fs::file_type::regular_file)
     EC = std::make_error_code(std::errc::invalid_argument);
 }
 
Index: lld/test/ELF/lto/emit-llvm_assertion_failure.ll
===================================================================
--- /dev/null
+++ lld/test/ELF/lto/emit-llvm_assertion_failure.ll
@@ -0,0 +1,14 @@
+; Make sure that if --plugin-opt=emit-llvm is enabled and the output
+; is /dev/null, it should not cause a assertion failure in bitcode writer.
+
+; REQUIRES: x86
+
+; RUN: opt -module-hash -module-summary %s -o %t.o
+; RUN: ld.lld --plugin-opt=emit-llvm -mllvm -bitcode-flush-threshold=0 -o /dev/null %t.o
+
+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 @main() {
+  ret void
+}


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D112297.383221.patch
Type: text/x-patch
Size: 1187 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211029/c37921ee/attachment.bin>


More information about the llvm-commits mailing list