---

yaml
---
r: 93154
b: refs/heads/try
c: dadb6f0
h: refs/heads/master
v: v3

Author: reedlepee123

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: b477f7a7b74615bba9ab3074082f9cc76a24e8a3
+refs/heads/try: dadb6f0cd9fa7e4b402a0107358acb34002d4895
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/mk/platform.mk

@@ -204,7 +204,7 @@ CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
 CFG_LIB_DSYM_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib.dSYM
 CFG_GCCISH_CFLAGS_x86_64-apple-darwin := -Wall -Werror -g -fPIC -m64 -arch x86_64
 CFG_GCCISH_CXXFLAGS_x86_64-apple-darwin := -fno-rtti
-CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -pthread  -framework CoreServices -m64
+CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -pthread  -framework CoreServices -Wl,-no_compact_unwind -m64
 CFG_GCCISH_DEF_FLAG_x86_64-apple-darwin := -Wl,-exported_symbols_list,
 CFG_GCCISH_PRE_LIB_FLAGS_x86_64-apple-darwin :=
 CFG_GCCISH_POST_LIB_FLAGS_x86_64-apple-darwin :=
@@ -230,7 +230,7 @@ CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib
 CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM
 CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386
 CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti
-CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -pthread  -framework CoreServices -m32
+CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -pthread  -framework CoreServices -Wl,-no_compact_unwind -m32
 CFG_GCCISH_DEF_FLAG_i686-apple-darwin := -Wl,-exported_symbols_list,
 CFG_GCCISH_PRE_LIB_FLAGS_i686-apple-darwin :=
 CFG_GCCISH_POST_LIB_FLAGS_i686-apple-darwin :=

branches/try/src/librustc/back/link.rs

@@ -1112,6 +1112,14 @@ pub fn link_args(sess: Session,
                        ~"-Wl,-rpath,/usr/local/lib/gcc44"]);
     }
 
+    // OS X 10.6 introduced 'compact unwind info', which is produced by the
+    // linker from the dwarf unwind info. Unfortunately, it does not seem to
+    // understand how to unwind our __morestack frame, so we have to turn it
+    // off. This has impacted some other projects like GHC.
+    if sess.targ_cfg.os == session::OsMacos {
+        args.push(~"-Wl,-no_compact_unwind");
+    }
+
     // Stack growth requires statically linking a __morestack function
     args.push(~"-lmorestack");
 

branches/try/src/librustc/front/feature_gate.rs

@@ -35,7 +35,6 @@ static KNOWN_FEATURES: &'static [(&'static str, Status)] = &[
     ("struct_variant", Active),
     ("once_fns", Active),
     ("asm", Active),
-    ("managed_boxes", Active),
 
     // These are used to test this portion of the compiler, they don't actually
     // mean anything
@@ -138,15 +137,6 @@ impl Visitor<()> for Context {
                                    experimental and likely to be removed");
 
             },
-            // NOTE: enable after snapshot
-            ast::ty_box(_) if false => {
-                self.gate_feature("managed_boxes", t.span, "The managed box syntax may be replaced \
-                                                            by a library type, and a garbage \
-                                                            collector is not yet implemented. \
-                                                            Consider using the `std::rc` module \
-                                                            as it performs much better as a \
-                                                            reference counting implementation.");
-            }
             _ => {}
         }
 

branches/try/src/libstd/str.rs

@@ -997,6 +997,7 @@ pub fn utf8_char_width(b: u8) -> uint {
 /// the utf8 bytes of a string.
 pub struct CharRange {
     /// Current `char`
+	/// This field should be public making it private causes error while compiling!!
     ch: char,
 
     /// Index of the first byte of the next `char`

branches/try/src/rt/arch/i386/morestack.S

@@ -62,9 +62,9 @@
 	is that OS X 10.6+ uses its own 'compact unwind info',
 	an undocumented format generated by the linker from
 	the DWARF CFI. This compact unwind info doesn't correctly
-	capture the nuance of the __morestack frame, so we need to
-	prevent the linker from attempting to convert its DWARF unwind
-	information.
+	capture the nuance of the __morestack frame, and as a
+	result all of our linking on OS X uses the -no_compact_unwind
+	flag.
 */
 
 .text
@@ -118,15 +118,6 @@ MORESTACK:
         // FIXME(#9854) these cfi directives don't work on windows.
 
 	pushl %ebp
-
-#if defined(__APPLE__)
-	// The pattern of the return address being saved twice to the same location
-	// tells the OS X linker that it should not attempt to convert the DWARF
-	// unwind information to the compact format.
-	.cfi_offset %eip, -4
-	.cfi_offset %eip, -4
-#endif
-
 	// The CFA is 20 bytes above the register that it is
 	// associated with for this frame (which will be %ebp)
 	.cfi_def_cfa_offset 20

branches/try/src/rt/arch/x86_64/morestack.S

@@ -43,15 +43,6 @@ MORESTACK:
 	// bytes greater than a normal frame, to allow the unwinder
 	// to skip the partial frame of the original function.
 	.cfi_def_cfa_offset 24
-
-#if defined(__APPLE__)
-	// The pattern of the return address being saved twice to the same location
-	// tells the OS X linker that it should not attempt to convert the DWARF
-	// unwind information to the compact format.
-	.cfi_offset %rip, -8
-	.cfi_offset %rip, -8
-#endif
-
 	// %rbp is -24 bytes from the CFA
 	.cfi_offset %rbp, -24
 	movq %rsp, %rbp