[llvm] r228842 - Gold-plugin: Broaden scope of get/release_input_file to scope of Module.
Jan Wen Voung
jvoung at google.com
Wed Feb 11 08:12:50 PST 2015
Author: jvoung
Date: Wed Feb 11 10:12:50 2015
New Revision: 228842
URL: http://llvm.org/viewvc/llvm-project?rev=228842&view=rev
Log:
Gold-plugin: Broaden scope of get/release_input_file to scope of Module.
Summary:
Move calls to get_input_file and release_input_file out of
getModuleForFile(). Otherwise release_input_file may end up
unmapping a view of the file while the view is still being
used by the Module (on 32-bit hosts).
Fix for PR22482.
Test Plan: Add test using --no-map-whole-files.
Reviewers: rafael, nlewycky
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D7539
Added:
llvm/trunk/test/tools/gold/no-map-whole-file.ll
Modified:
llvm/trunk/tools/gold/gold-plugin.cpp
Added: llvm/trunk/test/tools/gold/no-map-whole-file.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/gold/no-map-whole-file.ll?rev=228842&view=auto
==============================================================================
--- llvm/trunk/test/tools/gold/no-map-whole-file.ll (added)
+++ llvm/trunk/test/tools/gold/no-map-whole-file.ll Wed Feb 11 10:12:50 2015
@@ -0,0 +1,9 @@
+; RUN: llvm-as -o %t.bc %s
+; RUN: ld -plugin %llvmshlibdir/LLVMgold.so -plugin-opt=emit-llvm \
+; RUN: --no-map-whole-files -r -o %t2.bc %t.bc
+; RUN: llvm-dis < %t2.bc -o - | FileCheck %s
+
+; CHECK: main
+define i32 @main() {
+ ret i32 0
+}
Modified: llvm/trunk/tools/gold/gold-plugin.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/gold-plugin.cpp?rev=228842&r1=228841&r2=228842&view=diff
==============================================================================
--- llvm/trunk/tools/gold/gold-plugin.cpp (original)
+++ llvm/trunk/tools/gold/gold-plugin.cpp Wed Feb 11 10:12:50 2015
@@ -560,11 +560,9 @@ static void freeSymName(ld_plugin_symbol
}
static std::unique_ptr<Module>
-getModuleForFile(LLVMContext &Context, claimed_file &F, raw_fd_ostream *ApiFile,
+getModuleForFile(LLVMContext &Context, claimed_file &F,
+ off_t Filesize, raw_fd_ostream *ApiFile,
StringSet<> &Internalize, StringSet<> &Maybe) {
- ld_plugin_input_file File;
- if (get_input_file(F.handle, &File) != LDPS_OK)
- message(LDPL_FATAL, "Failed to get file information");
if (get_symbols(F.handle, F.syms.size(), &F.syms[0]) != LDPS_OK)
message(LDPL_FATAL, "Failed to get symbol information");
@@ -573,7 +571,7 @@ getModuleForFile(LLVMContext &Context, c
if (get_view(F.handle, &View) != LDPS_OK)
message(LDPL_FATAL, "Failed to get a view of file");
- MemoryBufferRef BufferRef(StringRef((const char *)View, File.filesize), "");
+ MemoryBufferRef BufferRef(StringRef((const char *)View, Filesize), "");
ErrorOr<std::unique_ptr<object::IRObjectFile>> ObjOrErr =
object::IRObjectFile::create(BufferRef, Context);
@@ -581,9 +579,6 @@ getModuleForFile(LLVMContext &Context, c
message(LDPL_FATAL, "Could not read bitcode from file : %s",
EC.message().c_str());
- if (release_input_file(F.handle) != LDPS_OK)
- message(LDPL_FATAL, "Failed to release file information");
-
object::IRObjectFile &Obj = **ObjOrErr;
Module &M = Obj.getModule();
@@ -802,8 +797,12 @@ static ld_plugin_status allSymbolsReadHo
StringSet<> Internalize;
StringSet<> Maybe;
for (claimed_file &F : Modules) {
+ ld_plugin_input_file File;
+ if (get_input_file(F.handle, &File) != LDPS_OK)
+ message(LDPL_FATAL, "Failed to get file information");
std::unique_ptr<Module> M =
- getModuleForFile(Context, F, ApiFile, Internalize, Maybe);
+ getModuleForFile(Context, F, File.filesize, ApiFile,
+ Internalize, Maybe);
if (!options::triple.empty())
M->setTargetTriple(options::triple.c_str());
else if (M->getTargetTriple().empty()) {
@@ -812,6 +811,8 @@ static ld_plugin_status allSymbolsReadHo
if (L.linkInModule(M.get()))
message(LDPL_FATAL, "Failed to link module");
+ if (release_input_file(F.handle) != LDPS_OK)
+ message(LDPL_FATAL, "Failed to release file information");
}
for (const auto &Name : Internalize) {
More information about the llvm-commits
mailing list