Skip to content

Commit da9172a

Browse files
borsbors
committed
auto merge of #7040 : alexcrichton/rust/issue-6511-threadsafe-llvm, r=graydon
This is a reopening of #6570, and almost fixes #6511. Note that this doesn't actually enable building a threadsafe LLVM, because that will require an LLVM rebuild which will be bundled with the upgrades in #6713. What this does do, however, is removes all thread-unsafe usage of LLVM from the compiler.
2 parents d0b1979 + 5c5095d commit da9172a

File tree

14 files changed

+212
-165
lines changed

14 files changed

+212
-165
lines changed

‎src/librustc/back/link.rs‎

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ pub mod jit {
103103
use back::link::llvm_err;
104104
use driver::session::Session;
105105
use lib::llvm::llvm;
106-
use lib::llvm::{ModuleRef, PassManagerRef};
106+
use lib::llvm::{ModuleRef, PassManagerRef, ContextRef};
107107
use metadata::cstore;
108108

109109
use core::cast;
@@ -126,6 +126,7 @@ pub mod jit {
126126

127127
pub fn exec(sess: Session,
128128
pm: PassManagerRef,
129+
c: ContextRef,
129130
m: ModuleRef,
130131
opt: c_int,
131132
stacks: bool) {
@@ -154,26 +155,43 @@ pub mod jit {
154155
});
155156
}
156157

157-
// The execute function will return a void pointer
158-
// to the _rust_main function. We can do closure
159-
// magic here to turn it straight into a callable rust
160-
// closure. It will also cleanup the memory manager
161-
// for us.
162-
163-
let entry = llvm::LLVMRustExecuteJIT(manager,
164-
pm, m, opt, stacks);
165-
166-
if ptr::is_null(entry) {
167-
llvm_err(sess, ~"Could not JIT");
168-
} else {
169-
let closure = Closure {
170-
code: entry,
171-
env: ptr::null()
172-
};
173-
let func: &fn() = cast::transmute(closure);
158+
// We custom-build a JIT execution engine via some rust wrappers
159+
// first. This wrappers takes ownership of the module passed in.
160+
let ee = llvm::LLVMRustBuildJIT(manager, pm, m, opt, stacks);
161+
if ee.is_null() {
162+
llvm::LLVMContextDispose(c);
163+
llvm_err(sess, ~"Could not create the JIT");
164+
}
174165

175-
func();
166+
// Next, we need to get a handle on the _rust_main function by
167+
// looking up it's corresponding ValueRef and then requesting that
168+
// the execution engine compiles the function.
169+
let fun = do str::as_c_str("_rust_main") |entry| {
170+
llvm::LLVMGetNamedFunction(m, entry)
171+
};
172+
if fun.is_null() {
173+
llvm::LLVMDisposeExecutionEngine(ee);
174+
llvm::LLVMContextDispose(c);
175+
llvm_err(sess, ~"Could not find _rust_main in the JIT");
176176
}
177+
178+
// Finally, once we have the pointer to the code, we can do some
179+
// closure magic here to turn it straight into a callable rust
180+
// closure
181+
let code = llvm::LLVMGetPointerToGlobal(ee, fun);
182+
assert!(!code.is_null());
183+
let closure = Closure {
184+
code: code,
185+
env: ptr::null()
186+
};
187+
let func: &fn() = cast::transmute(closure);
188+
func();
189+
190+
// Sadly, there currently is no interface to re-use this execution
191+
// engine, so it's disposed of here along with the context to
192+
// prevent leaks.
193+
llvm::LLVMDisposeExecutionEngine(ee);
194+
llvm::LLVMContextDispose(c);
177195
}
178196
}
179197
}
@@ -190,6 +208,7 @@ pub mod write {
190208
use driver::session;
191209
use lib::llvm::llvm;
192210
use lib::llvm::{ModuleRef, mk_pass_manager, mk_target_data};
211+
use lib::llvm::{False, ContextRef};
193212
use lib;
194213

195214
use back::passes;
@@ -208,6 +227,7 @@ pub mod write {
208227
}
209228

210229
pub fn run_passes(sess: Session,
230+
llcx: ContextRef,
211231
llmod: ModuleRef,
212232
output_type: output_type,
213233
output: &Path) {
@@ -282,7 +302,7 @@ pub mod write {
282302
// JIT execution takes ownership of the module,
283303
// so don't dispose and return.
284304

285-
jit::exec(sess, pm.llpm, llmod, CodeGenOptLevel, true);
305+
jit::exec(sess, pm.llpm, llcx, llmod, CodeGenOptLevel, true);
286306

287307
if sess.time_llvm_passes() {
288308
llvm::LLVMRustPrintPassTimings();
@@ -350,6 +370,7 @@ pub mod write {
350370
// Clean up and return
351371

352372
llvm::LLVMDisposeModule(llmod);
373+
llvm::LLVMContextDispose(llcx);
353374
if sess.time_llvm_passes() {
354375
llvm::LLVMRustPrintPassTimings();
355376
}
@@ -368,6 +389,7 @@ pub mod write {
368389
}
369390

370391
llvm::LLVMDisposeModule(llmod);
392+
llvm::LLVMContextDispose(llcx);
371393
if sess.time_llvm_passes() { llvm::LLVMRustPrintPassTimings(); }
372394
}
373395
}

‎src/librustc/driver/driver.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ pub fn compile_rest(sess: Session,
217217

218218
let mut crate = crate_opt.unwrap();
219219

220-
let (llmod, link_meta) = {
220+
let (llcx, llmod, link_meta) = {
221221
crate = time(time_passes, ~"intrinsic injection", ||
222222
front::intrinsic_inject::inject_intrinsic(sess, crate));
223223

@@ -340,14 +340,14 @@ pub fn compile_rest(sess: Session,
340340
let obj_filename = outputs.obj_filename.with_filetype("s");
341341

342342
time(time_passes, ~"LLVM passes", ||
343-
link::write::run_passes(sess, llmod, output_type,
344-
&obj_filename));
343+
link::write::run_passes(sess, llcx, llmod, output_type,
344+
&obj_filename));
345345

346346
link::write::run_ndk(sess, &obj_filename, &outputs.obj_filename);
347347
} else {
348348
time(time_passes, ~"LLVM passes", ||
349-
link::write::run_passes(sess, llmod, sess.opts.output_type,
350-
&outputs.obj_filename));
349+
link::write::run_passes(sess, llcx, llmod, sess.opts.output_type,
350+
&outputs.obj_filename));
351351
}
352352

353353
let stop_after_codegen =

‎src/librustc/lib/llvm.rs‎

Lines changed: 18 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ pub enum BasicBlock_opaque {}
205205
pub type BasicBlockRef = *BasicBlock_opaque;
206206
pub enum Builder_opaque {}
207207
pub type BuilderRef = *Builder_opaque;
208+
pub enum ExecutionEngine_opaque {}
209+
pub type ExecutionEngineRef = *ExecutionEngine_opaque;
208210
pub enum MemoryBuffer_opaque {}
209211
pub type MemoryBufferRef = *MemoryBuffer_opaque;
210212
pub enum PassManager_opaque {}
@@ -223,7 +225,7 @@ pub enum Pass_opaque {}
223225
pub type PassRef = *Pass_opaque;
224226

225227
pub mod llvm {
226-
use super::{AtomicBinOp, AtomicOrdering, BasicBlockRef};
228+
use super::{AtomicBinOp, AtomicOrdering, BasicBlockRef, ExecutionEngineRef};
227229
use super::{Bool, BuilderRef, ContextRef, MemoryBufferRef, ModuleRef};
228230
use super::{ObjectFileRef, Opcode, PassManagerRef, PassManagerBuilderRef};
229231
use super::{SectionIteratorRef, TargetDataRef, TypeKind, TypeRef, UseRef};
@@ -239,23 +241,21 @@ pub mod llvm {
239241
#[fast_ffi]
240242
pub unsafe fn LLVMContextCreate() -> ContextRef;
241243
#[fast_ffi]
242-
pub unsafe fn LLVMGetGlobalContext() -> ContextRef;
243-
#[fast_ffi]
244244
pub unsafe fn LLVMContextDispose(C: ContextRef);
245245
#[fast_ffi]
246246
pub unsafe fn LLVMGetMDKindIDInContext(C: ContextRef,
247247
Name: *c_char,
248248
SLen: c_uint)
249249
-> c_uint;
250-
#[fast_ffi]
251-
pub unsafe fn LLVMGetMDKindID(Name: *c_char, SLen: c_uint) -> c_uint;
252250

253251
/* Create and destroy modules. */
254252
#[fast_ffi]
255253
pub unsafe fn LLVMModuleCreateWithNameInContext(ModuleID: *c_char,
256254
C: ContextRef)
257255
-> ModuleRef;
258256
#[fast_ffi]
257+
pub unsafe fn LLVMGetModuleContext(M: ModuleRef) -> ContextRef;
258+
#[fast_ffi]
259259
pub unsafe fn LLVMDisposeModule(M: ModuleRef);
260260

261261
/** Data layout. See Module::getDataLayout. */
@@ -300,18 +300,6 @@ pub mod llvm {
300300
pub unsafe fn LLVMIntTypeInContext(C: ContextRef,
301301
NumBits: c_uint) -> TypeRef;
302302

303-
#[fast_ffi]
304-
pub unsafe fn LLVMInt1Type() -> TypeRef;
305-
#[fast_ffi]
306-
pub unsafe fn LLVMInt8Type() -> TypeRef;
307-
#[fast_ffi]
308-
pub unsafe fn LLVMInt16Type() -> TypeRef;
309-
#[fast_ffi]
310-
pub unsafe fn LLVMInt32Type() -> TypeRef;
311-
#[fast_ffi]
312-
pub unsafe fn LLVMInt64Type() -> TypeRef;
313-
#[fast_ffi]
314-
pub unsafe fn LLVMIntType(NumBits: c_uint) -> TypeRef;
315303
#[fast_ffi]
316304
pub unsafe fn LLVMGetIntTypeWidth(IntegerTy: TypeRef) -> c_uint;
317305

@@ -327,17 +315,6 @@ pub mod llvm {
327315
#[fast_ffi]
328316
pub unsafe fn LLVMPPCFP128TypeInContext(C: ContextRef) -> TypeRef;
329317

330-
#[fast_ffi]
331-
pub unsafe fn LLVMFloatType() -> TypeRef;
332-
#[fast_ffi]
333-
pub unsafe fn LLVMDoubleType() -> TypeRef;
334-
#[fast_ffi]
335-
pub unsafe fn LLVMX86FP80Type() -> TypeRef;
336-
#[fast_ffi]
337-
pub unsafe fn LLVMFP128Type() -> TypeRef;
338-
#[fast_ffi]
339-
pub unsafe fn LLVMPPCFP128Type() -> TypeRef;
340-
341318
/* Operations on function types */
342319
#[fast_ffi]
343320
pub unsafe fn LLVMFunctionType(ReturnType: TypeRef,
@@ -361,11 +338,6 @@ pub mod llvm {
361338
ElementCount: c_uint,
362339
Packed: Bool) -> TypeRef;
363340
#[fast_ffi]
364-
pub unsafe fn LLVMStructType(ElementTypes: *TypeRef,
365-
ElementCount: c_uint,
366-
Packed: Bool)
367-
-> TypeRef;
368-
#[fast_ffi]
369341
pub unsafe fn LLVMCountStructElementTypes(StructTy: TypeRef)
370342
-> c_uint;
371343
#[fast_ffi]
@@ -393,6 +365,10 @@ pub mod llvm {
393365
pub unsafe fn LLVMGetPointerAddressSpace(PointerTy: TypeRef)
394366
-> c_uint;
395367
#[fast_ffi]
368+
pub unsafe fn LLVMGetPointerToGlobal(EE: ExecutionEngineRef,
369+
V: ValueRef)
370+
-> *();
371+
#[fast_ffi]
396372
pub unsafe fn LLVMGetVectorSize(VectorTy: TypeRef) -> c_uint;
397373

398374
/* Operations on other types */
@@ -403,13 +379,6 @@ pub mod llvm {
403379
#[fast_ffi]
404380
pub unsafe fn LLVMMetadataTypeInContext(C: ContextRef) -> TypeRef;
405381

406-
#[fast_ffi]
407-
pub unsafe fn LLVMVoidType() -> TypeRef;
408-
#[fast_ffi]
409-
pub unsafe fn LLVMLabelType() -> TypeRef;
410-
#[fast_ffi]
411-
pub unsafe fn LLVMMetadataType() -> TypeRef;
412-
413382
/* Operations on all values */
414383
#[fast_ffi]
415384
pub unsafe fn LLVMTypeOf(Val: ValueRef) -> TypeRef;
@@ -482,15 +451,11 @@ pub mod llvm {
482451
SLen: c_uint)
483452
-> ValueRef;
484453
#[fast_ffi]
485-
pub unsafe fn LLVMMDString(Str: *c_char, SLen: c_uint) -> ValueRef;
486-
#[fast_ffi]
487454
pub unsafe fn LLVMMDNodeInContext(C: ContextRef,
488455
Vals: *ValueRef,
489456
Count: c_uint)
490457
-> ValueRef;
491458
#[fast_ffi]
492-
pub unsafe fn LLVMMDNode(Vals: *ValueRef, Count: c_uint) -> ValueRef;
493-
#[fast_ffi]
494459
pub unsafe fn LLVMAddNamedMetadataOperand(M: ModuleRef, Str: *c_char,
495460
Val: ValueRef);
496461

@@ -544,20 +509,11 @@ pub mod llvm {
544509
Packed: Bool) -> ValueRef;
545510

546511
#[fast_ffi]
547-
pub unsafe fn LLVMConstString(Str: *c_char,
548-
Length: c_uint,
549-
DontNullTerminate: Bool)
550-
-> ValueRef;
551-
#[fast_ffi]
552512
pub unsafe fn LLVMConstArray(ElementTy: TypeRef,
553513
ConstantVals: *ValueRef,
554514
Length: c_uint)
555515
-> ValueRef;
556516
#[fast_ffi]
557-
pub unsafe fn LLVMConstStruct(ConstantVals: *ValueRef,
558-
Count: c_uint,
559-
Packed: Bool) -> ValueRef;
560-
#[fast_ffi]
561517
pub unsafe fn LLVMConstVector(ScalarConstantVals: *ValueRef,
562518
Size: c_uint) -> ValueRef;
563519

@@ -970,15 +926,6 @@ pub mod llvm {
970926
BB: BasicBlockRef,
971927
Name: *c_char)
972928
-> BasicBlockRef;
973-
974-
#[fast_ffi]
975-
pub unsafe fn LLVMAppendBasicBlock(Fn: ValueRef,
976-
Name: *c_char)
977-
-> BasicBlockRef;
978-
#[fast_ffi]
979-
pub unsafe fn LLVMInsertBasicBlock(InsertBeforeBB: BasicBlockRef,
980-
Name: *c_char)
981-
-> BasicBlockRef;
982929
#[fast_ffi]
983930
pub unsafe fn LLVMDeleteBasicBlock(BB: BasicBlockRef);
984931

@@ -1039,8 +986,6 @@ pub mod llvm {
1039986
#[fast_ffi]
1040987
pub unsafe fn LLVMCreateBuilderInContext(C: ContextRef) -> BuilderRef;
1041988
#[fast_ffi]
1042-
pub unsafe fn LLVMCreateBuilder() -> BuilderRef;
1043-
#[fast_ffi]
1044989
pub unsafe fn LLVMPositionBuilder(Builder: BuilderRef,
1045990
Block: BasicBlockRef,
1046991
Instr: ValueRef);
@@ -1064,6 +1009,8 @@ pub mod llvm {
10641009
Name: *c_char);
10651010
#[fast_ffi]
10661011
pub unsafe fn LLVMDisposeBuilder(Builder: BuilderRef);
1012+
#[fast_ffi]
1013+
pub unsafe fn LLVMDisposeExecutionEngine(EE: ExecutionEngineRef);
10671014

10681015
/* Metadata */
10691016
#[fast_ffi]
@@ -1880,11 +1827,11 @@ pub mod llvm {
18801827

18811828
/** Execute the JIT engine. */
18821829
#[fast_ffi]
1883-
pub unsafe fn LLVMRustExecuteJIT(MM: *(),
1830+
pub unsafe fn LLVMRustBuildJIT(MM: *(),
18841831
PM: PassManagerRef,
18851832
M: ModuleRef,
18861833
OptLevel: c_int,
1887-
EnableSegmentedStacks: bool) -> *();
1834+
EnableSegmentedStacks: bool) -> ExecutionEngineRef;
18881835

18891836
/** Parses the bitcode in the given memory buffer. */
18901837
#[fast_ffi]
@@ -1893,7 +1840,8 @@ pub mod llvm {
18931840

18941841
/** Parses LLVM asm in the given file */
18951842
#[fast_ffi]
1896-
pub unsafe fn LLVMRustParseAssemblyFile(Filename: *c_char)
1843+
pub unsafe fn LLVMRustParseAssemblyFile(Filename: *c_char,
1844+
C: ContextRef)
18971845
-> ModuleRef;
18981846

18991847
#[fast_ffi]
@@ -1909,6 +1857,9 @@ pub mod llvm {
19091857
#[fast_ffi]
19101858
pub unsafe fn LLVMRustPrintPassTimings();
19111859

1860+
#[fast_ffi]
1861+
pub unsafe fn LLVMRustStartMultithreading() -> bool;
1862+
19121863
#[fast_ffi]
19131864
pub unsafe fn LLVMStructCreateNamed(C: ContextRef, Name: *c_char)
19141865
-> TypeRef;

0 commit comments

Comments
 (0)