From b86440f85f195b73c656092d4f5ecefcd19fec71 Mon Sep 17 00:00:00 2001 From: Valerii Hiora Date: Fri, 4 Jul 2014 10:40:21 +0300 Subject: [PATCH] Removed LLVM bug workaround MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was required to get iOS compilable but since that time a couple of changes were introduced which cause the same bug to re-appear and broke build anyway. Fixing all of them doesn’t look a viable alternative to me as it will pollute the code too much. So it should be fixed from LLVM side and I hope LLVM will upstream corresponding changes in a month. Meanwhile, who wants to play with Rust on iOS is better to use a fork which uses patched LLVM: https://github.com/vhbit/rust/tree/ios . It may lag behind master a bit, but it is Travis-checked to compile successfully. --- src/libnative/io/timer_unix.rs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/libnative/io/timer_unix.rs b/src/libnative/io/timer_unix.rs index 8d6563bafad..87c320e0457 100644 --- a/src/libnative/io/timer_unix.rs +++ b/src/libnative/io/timer_unix.rs @@ -93,20 +93,7 @@ pub fn now() -> u64 { } } - -// Note: although the last parameter isn't used there is no way now to -// convert it to unit type, because LLVM dies in SjLj preparation -// step (unfortunately iOS uses SjLJ exceptions) -// -// It's definitely a temporary workaround just to get it working. -// So far it looks like an LLVM issue and it was reported: -// http://llvm.org/bugs/show_bug.cgi?id=19855 -// Actually this issue is pretty common while compiling for armv7 iOS -// and in most cases it is simply solved by using --opt-level=2 (or -O) -// -// For this specific case unfortunately turning optimizations wasn't -// enough. -fn helper(input: libc::c_int, messages: Receiver, _: int) { +fn helper(input: libc::c_int, messages: Receiver, _: ()) { let mut set: c::fd_set = unsafe { mem::zeroed() }; let mut fd = FileDesc::new(input, true); @@ -218,7 +205,7 @@ impl Timer { pub fn new() -> IoResult { // See notes above regarding using int return value // instead of () - unsafe { HELPER.boot(|| {0}, helper); } + unsafe { HELPER.boot(|| {}, helper); } static mut ID: atomics::AtomicUint = atomics::INIT_ATOMIC_UINT; let id = unsafe { ID.fetch_add(1, atomics::Relaxed) };