Skip to content

Commit c35b2bd

Browse files
alexcrichtonalexcrichton
committed
trans: Move rust_try into the compiler
This commit moves the IR files in the distribution, rust_try.ll, rust_try_msvc_64.ll, and rust_try_msvc_32.ll into the compiler from the main distribution. There's a few reasons for this change: * LLVM changes its IR syntax from time to time, so it's very difficult to have these files build across many LLVM versions simultaneously. We'll likely want to retain this ability for quite some time into the future. * The implementation of these files is closely tied to the compiler and runtime itself, so it makes sense to fold it into a location which can do more platform-specific checks for various implementation details (such as MSVC 32 vs 64-bit). * This removes LLVM as a build-time dependency of the standard library. This may end up becoming very useful if we move towards building the standard library with Cargo. In the immediate future, however, this commit should restore compatibility with LLVM 3.5 and 3.6.
1 parent 39d4faf commit c35b2bd

25 files changed

+519
-328
lines changed

‎mk/rt.mk

-18
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,6 @@ NATIVE_DEPS_miniz_$(1) = miniz.c
5454
NATIVE_DEPS_rust_builtin_$(1) := rust_builtin.c \
5555
rust_android_dummy.c
5656
NATIVE_DEPS_rustrt_native_$(1) := arch/$$(HOST_$(1))/record_sp.S
57-
ifeq ($$(findstring msvc,$(1)),msvc)
58-
ifeq ($$(findstring i686,$(1)),i686)
59-
NATIVE_DEPS_rustrt_native_$(1) += rust_try_msvc_32.ll
60-
else
61-
NATIVE_DEPS_rustrt_native_$(1) += rust_try_msvc_64.ll
62-
endif
63-
else
64-
NATIVE_DEPS_rustrt_native_$(1) += rust_try.ll
65-
endif
6657
NATIVE_DEPS_rust_test_helpers_$(1) := rust_test_helpers.c
6758
NATIVE_DEPS_morestack_$(1) := arch/$$(HOST_$(1))/morestack.S
6859

@@ -76,14 +67,6 @@ NATIVE_DEPS_morestack_$(1) := arch/$$(HOST_$(1))/morestack.S
7667

7768
RT_OUTPUT_DIR_$(1) := $(1)/rt
7869

79-
$$(RT_OUTPUT_DIR_$(1))/%.o: $(S)src/rt/%.ll $$(MKFILE_DEPS) \
80-
$$(LLVM_CONFIG_$$(CFG_BUILD))
81-
@mkdir -p $$(@D)
82-
@$$(call E, compile: $$@)
83-
$$(Q)$$(LLC_$$(CFG_BUILD)) $$(CFG_LLC_FLAGS_$(1)) \
84-
-filetype=obj -mtriple=$$(CFG_LLVM_TARGET_$(1)) \
85-
-relocation-model=pic -o $$@ $$<
86-
8770
$$(RT_OUTPUT_DIR_$(1))/%.o: $(S)src/rt/%.c $$(MKFILE_DEPS)
8871
@mkdir -p $$(@D)
8972
@$$(call E, compile: $$@)
@@ -122,7 +105,6 @@ define THIRD_PARTY_LIB
122105
OBJS_$(2)_$(1) := $$(NATIVE_DEPS_$(2)_$(1):%=$$(RT_OUTPUT_DIR_$(1))/%)
123106
OBJS_$(2)_$(1) := $$(OBJS_$(2)_$(1):.c=.o)
124107
OBJS_$(2)_$(1) := $$(OBJS_$(2)_$(1):.cpp=.o)
125-
OBJS_$(2)_$(1) := $$(OBJS_$(2)_$(1):.ll=.o)
126108
OBJS_$(2)_$(1) := $$(OBJS_$(2)_$(1):.S=.o)
127109
NATIVE_$(2)_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),$(2))
128110
$$(RT_OUTPUT_DIR_$(1))/$$(NATIVE_$(2)_$(1)): $$(OBJS_$(2)_$(1))

‎src/libcore/intrinsics.rs

+6
Original file line numberDiff line numberDiff line change
@@ -602,4 +602,10 @@ extern "rust-intrinsic" {
602602
/// Returns the value of the discriminant for the variant in 'v',
603603
/// cast to a `u64`; if `T` has no discriminant, returns 0.
604604
pub fn discriminant_value<T>(v: &T) -> u64;
605+
606+
/// Rust's "try catch" construct which invokes the function pointer `f` with
607+
/// the data pointer `data`, returning the exception payload if an exception
608+
/// is thrown (aka the thread panics).
609+
#[cfg(not(stage0))]
610+
pub fn try(f: fn(*mut u8), data: *mut u8) -> *mut u8;
605611
}

‎src/librustc/middle/lang_items.rs

+2
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,8 @@ lets_do_this! {
326326
StartFnLangItem, "start", start_fn;
327327

328328
EhPersonalityLangItem, "eh_personality", eh_personality;
329+
EhPersonalityCatchLangItem, "eh_personality_catch", eh_personality_catch;
330+
MSVCTryFilterLangItem, "msvc_try_filter", msvc_try_filter;
329331

330332
ExchangeHeapLangItem, "exchange_heap", exchange_heap;
331333
OwnedBoxLangItem, "owned_box", owned_box;

‎src/librustc/middle/weak_lang_items.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl<'a, 'v> Visitor<'v> for Context<'a> {
119119
) }
120120

121121
weak_lang_items! {
122-
panic_fmt, PanicFmtLangItem, rust_begin_unwind;
122+
panic_fmt, PanicFmtLangItem, rust_begin_unwind;
123123
stack_exhausted, StackExhaustedLangItem, rust_stack_exhausted;
124124
eh_personality, EhPersonalityLangItem, rust_eh_personality;
125125
}

‎src/librustc_llvm/lib.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ pub enum DLLStorageClassTypes {
134134
}
135135

136136
bitflags! {
137-
flags Attribute : u32 {
137+
flags Attribute : u64 {
138138
const ZExt = 1 << 0,
139139
const SExt = 1 << 1,
140140
const NoReturn = 1 << 2,
@@ -161,6 +161,7 @@ bitflags! {
161161
const ReturnsTwice = 1 << 29,
162162
const UWTable = 1 << 30,
163163
const NonLazyBind = 1 << 31,
164+
const OptimizeNone = 1 << 42,
164165
}
165166
}
166167

@@ -2193,7 +2194,8 @@ pub fn ConstFCmp(pred: RealPredicate, v1: ValueRef, v2: ValueRef) -> ValueRef {
21932194

21942195
pub fn SetFunctionAttribute(fn_: ValueRef, attr: Attribute) {
21952196
unsafe {
2196-
LLVMAddFunctionAttribute(fn_, FunctionIndex as c_uint, attr.bits() as uint64_t)
2197+
LLVMAddFunctionAttribute(fn_, FunctionIndex as c_uint,
2198+
attr.bits() as uint64_t)
21972199
}
21982200
}
21992201

‎src/librustc_trans/trans/build.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1042,6 +1042,10 @@ pub fn LandingPad(cx: Block, ty: Type, pers_fn: ValueRef,
10421042
B(cx).landing_pad(ty, pers_fn, num_clauses, cx.fcx.llfn)
10431043
}
10441044

1045+
pub fn AddClause(cx: Block, landing_pad: ValueRef, clause: ValueRef) {
1046+
B(cx).add_clause(landing_pad, clause)
1047+
}
1048+
10451049
pub fn SetCleanup(cx: Block, landing_pad: ValueRef) {
10461050
B(cx).set_cleanup(landing_pad)
10471051
}

‎src/librustc_trans/trans/builder.rs

+6
Original file line numberDiff line numberDiff line change
@@ -937,6 +937,12 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
937937
}
938938
}
939939

940+
pub fn add_clause(&self, landing_pad: ValueRef, clause: ValueRef) {
941+
unsafe {
942+
llvm::LLVMAddClause(landing_pad, clause);
943+
}
944+
}
945+
940946
pub fn set_cleanup(&self, landing_pad: ValueRef) {
941947
self.count_insn("setcleanup");
942948
unsafe {

‎src/librustc_trans/trans/callee.rs

+9-8
Original file line numberDiff line numberDiff line change
@@ -620,16 +620,17 @@ pub fn trans_lang_call<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
620620
}, ArgVals(args), dest)
621621
}
622622

623-
/// This behemoth of a function translates function calls. Unfortunately, in order to generate more
624-
/// efficient LLVM output at -O0, it has quite a complex signature (refactoring this into two
625-
/// functions seems like a good idea).
623+
/// This behemoth of a function translates function calls. Unfortunately, in
624+
/// order to generate more efficient LLVM output at -O0, it has quite a complex
625+
/// signature (refactoring this into two functions seems like a good idea).
626626
///
627-
/// In particular, for lang items, it is invoked with a dest of None, and in that case the return
628-
/// value contains the result of the fn. The lang item must not return a structural type or else
629-
/// all heck breaks loose.
627+
/// In particular, for lang items, it is invoked with a dest of None, and in
628+
/// that case the return value contains the result of the fn. The lang item must
629+
/// not return a structural type or else all heck breaks loose.
630630
///
631-
/// For non-lang items, `dest` is always Some, and hence the result is written into memory
632-
/// somewhere. Nonetheless we return the actual return value of the function.
631+
/// For non-lang items, `dest` is always Some, and hence the result is written
632+
/// into memory somewhere. Nonetheless we return the actual return value of the
633+
/// function.
633634
pub fn trans_call_inner<'a, 'blk, 'tcx, F>(bcx: Block<'blk, 'tcx>,
634635
debug_loc: DebugLoc,
635636
get_callee: F,

‎src/librustc_trans/trans/cleanup.rs

+2-50
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,9 @@ pub use self::Heap::*;
122122
use llvm::{BasicBlockRef, ValueRef};
123123
use trans::base;
124124
use trans::build;
125-
use trans::callee;
126125
use trans::common;
127-
use trans::common::{Block, FunctionContext, ExprId, NodeIdAndSpan};
126+
use trans::common::{Block, FunctionContext, NodeIdAndSpan};
128127
use trans::debuginfo::{DebugLoc, ToDebugLoc};
129-
use trans::declare;
130128
use trans::glue;
131129
use middle::region;
132130
use trans::type_::Type;
@@ -833,53 +831,7 @@ impl<'blk, 'tcx> CleanupHelperMethods<'blk, 'tcx> for FunctionContext<'blk, 'tcx
833831
&[Type::i8p(self.ccx), Type::i32(self.ccx)],
834832
false);
835833

836-
// The exception handling personality function.
837-
//
838-
// If our compilation unit has the `eh_personality` lang item somewhere
839-
// within it, then we just need to translate that. Otherwise, we're
840-
// building an rlib which will depend on some upstream implementation of
841-
// this function, so we just codegen a generic reference to it. We don't
842-
// specify any of the types for the function, we just make it a symbol
843-
// that LLVM can later use.
844-
//
845-
// Note that MSVC is a little special here in that we don't use the
846-
// `eh_personality` lang item at all. Currently LLVM has support for
847-
// both Dwarf and SEH unwind mechanisms for MSVC targets and uses the
848-
// *name of the personality function* to decide what kind of unwind side
849-
// tables/landing pads to emit. It looks like Dwarf is used by default,
850-
// injecting a dependency on the `_Unwind_Resume` symbol for resuming
851-
// an "exception", but for MSVC we want to force SEH. This means that we
852-
// can't actually have the personality function be our standard
853-
// `rust_eh_personality` function, but rather we wired it up to the
854-
// CRT's custom personality function, which forces LLVM to consider
855-
// landing pads as "landing pads for SEH".
856-
let target = &self.ccx.sess().target.target;
857-
let llpersonality = match pad_bcx.tcx().lang_items.eh_personality() {
858-
Some(def_id) if !target.options.is_like_msvc => {
859-
callee::trans_fn_ref(pad_bcx.ccx(), def_id, ExprId(0),
860-
pad_bcx.fcx.param_substs).val
861-
}
862-
_ => {
863-
let mut personality = self.ccx.eh_personality().borrow_mut();
864-
match *personality {
865-
Some(llpersonality) => llpersonality,
866-
None => {
867-
let name = if !target.options.is_like_msvc {
868-
"rust_eh_personality"
869-
} else if target.arch == "x86" {
870-
"_except_handler3"
871-
} else {
872-
"__C_specific_handler"
873-
};
874-
let fty = Type::variadic_func(&[], &Type::i32(self.ccx));
875-
let f = declare::declare_cfn(self.ccx, name, fty,
876-
self.ccx.tcx().types.i32);
877-
*personality = Some(f);
878-
f
879-
}
880-
}
881-
}
882-
};
834+
let llpersonality = pad_bcx.fcx.eh_personality();
883835

884836
// The only landing pad clause will be 'cleanup'
885837
let llretval = build::LandingPad(pad_bcx, llretty, llpersonality, 1);

‎src/librustc_trans/trans/closure.rs

+6-10
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,10 @@ pub fn get_or_create_declaration_if_closure<'a, 'tcx>(ccx: &CrateContext<'a, 'tc
163163
mangle_internal_name_by_path_and_seq(path, "closure")
164164
});
165165

166-
// Currently there’s only a single user of get_or_create_declaration_if_closure and it
167-
// unconditionally defines the function, therefore we use define_* here.
168-
let llfn = declare::define_internal_rust_fn(ccx, &symbol[..], function_type).unwrap_or_else(||{
169-
ccx.sess().bug(&format!("symbol `{}` already defined", symbol));
170-
});
166+
// Currently there’s only a single user of
167+
// get_or_create_declaration_if_closure and it unconditionally defines the
168+
// function, therefore we use define_* here.
169+
let llfn = declare::define_internal_rust_fn(ccx, &symbol[..], function_type);
171170

172171
// set an inline hint for all closures
173172
attributes::inline(llfn, attributes::InlineAttr::Hint);
@@ -388,11 +387,8 @@ fn trans_fn_once_adapter_shim<'a, 'tcx>(
388387

389388
// Create the by-value helper.
390389
let function_name = link::mangle_internal_name_by_type_and_seq(ccx, llonce_fn_ty, "once_shim");
391-
let lloncefn = declare::define_internal_rust_fn(ccx, &function_name[..], llonce_fn_ty)
392-
.unwrap_or_else(||{
393-
ccx.sess().bug(&format!("symbol `{}` already defined", function_name));
394-
});
395-
390+
let lloncefn = declare::define_internal_rust_fn(ccx, &function_name,
391+
llonce_fn_ty);
396392
let sig = tcx.erase_late_bound_regions(&llonce_bare_fn_ty.sig);
397393
let (block_arena, fcx): (TypedArena<_>, FunctionContext);
398394
block_arena = TypedArena::new();

‎src/librustc_trans/trans/common.rs

+51
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use middle::lang_items::LangItem;
2525
use middle::subst::{self, Substs};
2626
use trans::base;
2727
use trans::build;
28+
use trans::callee;
2829
use trans::cleanup;
2930
use trans::consts;
3031
use trans::datum;
@@ -479,6 +480,56 @@ impl<'a, 'tcx> FunctionContext<'a, 'tcx> {
479480
pub fn type_needs_drop(&self, ty: Ty<'tcx>) -> bool {
480481
type_needs_drop_given_env(self.ccx.tcx(), ty, &self.param_env)
481482
}
483+
484+
pub fn eh_personality(&self) -> ValueRef {
485+
// The exception handling personality function.
486+
//
487+
// If our compilation unit has the `eh_personality` lang item somewhere
488+
// within it, then we just need to translate that. Otherwise, we're
489+
// building an rlib which will depend on some upstream implementation of
490+
// this function, so we just codegen a generic reference to it. We don't
491+
// specify any of the types for the function, we just make it a symbol
492+
// that LLVM can later use.
493+
//
494+
// Note that MSVC is a little special here in that we don't use the
495+
// `eh_personality` lang item at all. Currently LLVM has support for
496+
// both Dwarf and SEH unwind mechanisms for MSVC targets and uses the
497+
// *name of the personality function* to decide what kind of unwind side
498+
// tables/landing pads to emit. It looks like Dwarf is used by default,
499+
// injecting a dependency on the `_Unwind_Resume` symbol for resuming
500+
// an "exception", but for MSVC we want to force SEH. This means that we
501+
// can't actually have the personality function be our standard
502+
// `rust_eh_personality` function, but rather we wired it up to the
503+
// CRT's custom personality function, which forces LLVM to consider
504+
// landing pads as "landing pads for SEH".
505+
let target = &self.ccx.sess().target.target;
506+
match self.ccx.tcx().lang_items.eh_personality() {
507+
Some(def_id) if !target.options.is_like_msvc => {
508+
callee::trans_fn_ref(self.ccx, def_id, ExprId(0),
509+
self.param_substs).val
510+
}
511+
_ => {
512+
let mut personality = self.ccx.eh_personality().borrow_mut();
513+
match *personality {
514+
Some(llpersonality) => llpersonality,
515+
None => {
516+
let name = if !target.options.is_like_msvc {
517+
"rust_eh_personality"
518+
} else if target.arch == "x86" {
519+
"_except_handler3"
520+
} else {
521+
"__C_specific_handler"
522+
};
523+
let fty = Type::variadic_func(&[], &Type::i32(self.ccx));
524+
let f = declare::declare_cfn(self.ccx, name, fty,
525+
self.ccx.tcx().types.i32);
526+
*personality = Some(f);
527+
f
528+
}
529+
}
530+
}
531+
}
532+
}
482533
}
483534

484535
// Basic block context. We create a block context for each basic block

‎src/librustc_trans/trans/context.rs

+7
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ pub struct LocalCrateContext<'tcx> {
142142
dbg_cx: Option<debuginfo::CrateDebugContext<'tcx>>,
143143

144144
eh_personality: RefCell<Option<ValueRef>>,
145+
rust_try_fn: RefCell<Option<ValueRef>>,
145146

146147
intrinsics: RefCell<FnvHashMap<&'static str, ValueRef>>,
147148

@@ -461,6 +462,7 @@ impl<'tcx> LocalCrateContext<'tcx> {
461462
closure_vals: RefCell::new(FnvHashMap()),
462463
dbg_cx: dbg_cx,
463464
eh_personality: RefCell::new(None),
465+
rust_try_fn: RefCell::new(None),
464466
intrinsics: RefCell::new(FnvHashMap()),
465467
n_llvm_insns: Cell::new(0),
466468
trait_cache: RefCell::new(FnvHashMap()),
@@ -726,6 +728,10 @@ impl<'b, 'tcx> CrateContext<'b, 'tcx> {
726728
&self.local.eh_personality
727729
}
728730

731+
pub fn rust_try_fn<'a>(&'a self) -> &'a RefCell<Option<ValueRef>> {
732+
&self.local.rust_try_fn
733+
}
734+
729735
fn intrinsics<'a>(&'a self) -> &'a RefCell<FnvHashMap<&'static str, ValueRef>> {
730736
&self.local.intrinsics
731737
}
@@ -923,6 +929,7 @@ fn declare_intrinsic(ccx: &CrateContext, key: & &'static str) -> Option<ValueRef
923929
ifn!("llvm.lifetime.end", fn(t_i64, i8p) -> void);
924930

925931
ifn!("llvm.expect.i1", fn(i1, i1) -> i1);
932+
ifn!("llvm.eh.typeid.for", fn(i8p) -> t_i32);
926933

927934
// Some intrinsics were introduced in later versions of LLVM, but they have
928935
// fallbacks in libc or libm and such.

‎src/librustc_trans/trans/declare.rs

+11-10
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ pub fn define_global(ccx: &CrateContext, name: &str, ty: Type) -> Option<ValueRe
176176
/// return None if the name already has a definition associated with it. In that
177177
/// case an error should be reported to the user, because it usually happens due
178178
/// to user’s fault (e.g. misuse of #[no_mangle] or #[export_name] attributes).
179-
pub fn define_fn(ccx: &CrateContext, name: &str, callconv: llvm::CallConv, fn_type: Type,
180-
output: ty::FnOutput) -> Option<ValueRef> {
179+
pub fn define_fn(ccx: &CrateContext, name: &str, callconv: llvm::CallConv,
180+
fn_type: Type, output: ty::FnOutput) -> Option<ValueRef> {
181181
if get_defined_value(ccx, name).is_some() {
182182
None
183183
} else {
@@ -224,20 +224,21 @@ pub fn define_rust_fn<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>, name: &str,
224224
/// Declare a Rust function with an intention to define it.
225225
///
226226
/// Use this function when you intend to define a function. This function will
227-
/// return None if the name already has a definition associated with it. In that
228-
/// case an error should be reported to the user, because it usually happens due
229-
/// to user’s fault (e.g. misuse of #[no_mangle] or #[export_name] attributes).
230-
pub fn define_internal_rust_fn<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>, name: &str,
231-
fn_type: ty::Ty<'tcx>) -> Option<ValueRef> {
227+
/// return panic if the name already has a definition associated with it. This
228+
/// can happen with #[no_mangle] or #[export_name], for example.
229+
pub fn define_internal_rust_fn<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
230+
name: &str,
231+
fn_type: ty::Ty<'tcx>) -> ValueRef {
232232
if get_defined_value(ccx, name).is_some() {
233-
None
233+
ccx.sess().fatal(&format!("symbol `{}` already defined", name))
234234
} else {
235-
Some(declare_internal_rust_fn(ccx, name, fn_type))
235+
declare_internal_rust_fn(ccx, name, fn_type)
236236
}
237237
}
238238

239239

240-
/// Get defined or externally defined (AvailableExternally linkage) value by name.
240+
/// Get defined or externally defined (AvailableExternally linkage) value by
241+
/// name.
241242
fn get_defined_value(ccx: &CrateContext, name: &str) -> Option<ValueRef> {
242243
debug!("get_defined_value(name={:?})", name);
243244
let namebuf = CString::new(name).unwrap_or_else(|_|{

‎src/librustc_trans/trans/foreign.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -627,9 +627,7 @@ pub fn trans_rust_fn_with_foreign_abi<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
627627
ccx.tcx().map.path_to_string(id),
628628
id, t);
629629

630-
let llfn = declare::define_internal_rust_fn(ccx, &ps[..], t).unwrap_or_else(||{
631-
ccx.sess().bug(&format!("symbol `{}` already defined", ps));
632-
});
630+
let llfn = declare::define_internal_rust_fn(ccx, &ps, t);
633631
attributes::from_fn_attrs(ccx, attrs, llfn);
634632
base::trans_fn(ccx, decl, body, llfn, param_substs, id, &[]);
635633
llfn

0 commit comments

Comments
 (0)