From 41367e252a806c1dfa36479d09643b3ac93a7263 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Mon, 2 Feb 2015 19:51:18 +0000 Subject: [PATCH] [Orc] Make OrcMCJITReplacement::addObject calls transfer buffer ownership to the ObjectLinkingLayer. There are a two of overloads for addObject, one of which transfers ownership of the underlying buffer to OrcMCJITReplacement. This commit makes the ownership transfering version pass ownership down to the ObjectLinkingLayer in order to prevent the issue described in r227778. I think this commit will fix the sanitizer bot failures that necessitated the removal of the load-object-a.ll regression test in r227785, so I'm reinstating that test. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@227845 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/Orc/OrcMCJITReplacement.h | 9 +++++-- test/ExecutionEngine/OrcJIT/load-object-a.ll | 24 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 test/ExecutionEngine/OrcJIT/load-object-a.ll diff --git a/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h b/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h index 838f5dce97f..ddbc73251c7 100644 --- a/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h +++ b/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h @@ -154,8 +154,13 @@ public: std::tie(Obj, Buf) = O.takeBinary(); std::vector> Objs; Objs.push_back(std::move(Obj)); - ObjectLayer.addObjectSet(std::move(Objs), - llvm::make_unique(*this)); + auto H = + ObjectLayer.addObjectSet(std::move(Objs), + llvm::make_unique(*this)); + + std::vector> Bufs; + Bufs.push_back(std::move(Buf)); + ObjectLayer.takeOwnershipOfBuffers(H, std::move(Bufs)); } void addArchive(object::OwningBinary A) override { diff --git a/test/ExecutionEngine/OrcJIT/load-object-a.ll b/test/ExecutionEngine/OrcJIT/load-object-a.ll new file mode 100644 index 00000000000..080bf6cf584 --- /dev/null +++ b/test/ExecutionEngine/OrcJIT/load-object-a.ll @@ -0,0 +1,24 @@ +; This first line will generate the .o files for the next run line +; RUN: rm -rf %t.cachedir %t.cachedir2 %t.cachedir3 +; RUN: mkdir -p %t.cachedir %t.cachedir2 %t.cachedir3 +; RUN: %lli -extra-module=%p/Inputs/multi-module-b.ll -extra-module=%p/Inputs/multi-module-c.ll -enable-cache-manager -object-cache-dir=%t.cachedir %s + +; Collect generated objects. +; RUN: find %t.cachedir -type f -name 'multi-module-?.o' -exec mv -v '{}' %t.cachedir2 ';' + +; This line tests MCJIT object loading +; RUN: %lli -extra-object=%t.cachedir2/multi-module-b.o -extra-object=%t.cachedir2/multi-module-c.o %s + +; These lines put the object files into an archive +; RUN: llvm-ar r %t.cachedir3/load-object.a %t.cachedir2/multi-module-b.o +; RUN: llvm-ar r %t.cachedir3/load-object.a %t.cachedir2/multi-module-c.o + +; This line test MCJIT archive loading +; RUN: %lli -extra-archive=%t.cachedir3/load-object.a %s + +declare i32 @FB() + +define i32 @main() { + %r = call i32 @FB( ) ; [#uses=1] + ret i32 %r +} -- 2.34.1