---

yaml
---
r: 4937
b: refs/heads/master
c: 1cb8501
h: refs/heads/master
i:
  4935: bb41698
v: v3

Author: catamorphism

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9f9ec69724a0e65d930091f0fc9f512cf69a72b
+refs/heads/master: 1cb85015c397cefa9de7653a98b7572ef511e0ef

trunk/doc/rust.texi

@@ -9,7 +9,7 @@ CFG_DSYMUTIL := true
 
 ifeq ($(CFG_OSTYPE), FreeBSD)
   CFG_LIB_NAME=lib$(1).so
-  CFG_GCCISH_CFLAGS += -fPIC -march=i686 -I/usr/local/include -O2
+  CFG_GCCISH_CFLAGS += -fPIC -march=i686 -I/usr/local/include
   CFG_GCCISH_LINK_FLAGS += -shared -fPIC -lpthread -lrt
   ifeq ($(CFG_CPUTYPE), x86_64)
     CFG_GCCISH_CFLAGS += -m32
@@ -22,7 +22,7 @@ endif
 
 ifeq ($(CFG_OSTYPE), Linux)
   CFG_LIB_NAME=lib$(1).so
-  CFG_GCCISH_CFLAGS += -fPIC -march=i686 -O2
+  CFG_GCCISH_CFLAGS += -fPIC -march=i686
   CFG_GCCISH_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt
   CFG_GCCISH_DEF_FLAG := -Wl,--export-dynamic,--dynamic-list=
   CFG_GCCISH_PRE_LIB_FLAGS := -Wl,-whole-archive
@@ -48,8 +48,8 @@ ifeq ($(CFG_OSTYPE), Darwin)
   # approaches welcome!
   #
   # NB: Currently GCC's optimizer breaks rustrt (task-comm-1 hangs) on Darwin.
-  CFG_GCC_CFLAGS += -m32 -O2
-  CFG_CLANG_CFLAGS += -m32 -O2
+  CFG_GCC_CFLAGS += -m32
+  CFG_CLANG_CFLAGS += -m32
   ifeq ($(CFG_CPUTYPE), x86_64)
     CFG_GCCISH_CFLAGS += -arch i386
     CFG_GCCISH_LINK_FLAGS += -arch i386
@@ -63,6 +63,13 @@ ifneq ($(findstring MINGW,$(CFG_OSTYPE)),)
   CFG_WINDOWSY := 1
 endif
 
+ifdef CFG_DISABLE_OPTIMIZE_CXX
+  $(info cfg: disabling C++ optimization (CFG_DISABLE_OPTIMIZE_CXX))
+  CFG_GCCISH_CFLAGS += -O0
+else
+  CFG_GCCISH_CFLAGS += -O2
+endif
+
 CFG_TESTLIB=$(CFG_BUILD_DIR)/$(strip \
  $(if $(findstring stage0,$(1)), \
        stage0/lib, \
@@ -94,7 +101,7 @@ ifdef CFG_UNIXY
       CFG_VALGRIND += wine
     endif
 
-    CFG_GCCISH_CFLAGS := -fno-strict-aliasing -march=i586 -O2
+    CFG_GCCISH_CFLAGS := -fno-strict-aliasing -march=i586
     CFG_GCCISH_PRE_LIB_FLAGS :=
     CFG_GCCISH_POST_LIB_FLAGS :=
     CFG_GCCISH_DEF_FLAG :=
@@ -130,7 +137,7 @@ ifdef CFG_WINDOWSY
     CFG_PATH_MUNGE := $(strip perl -i.bak -p             \
                              -e 's@\\(\S)@/\1@go;'       \
                              -e 's@^/([a-zA-Z])/@\1:/@o;')
-    CFG_GCCISH_CFLAGS += -march=i686 -O2
+    CFG_GCCISH_CFLAGS += -march=i686
     CFG_GCCISH_LINK_FLAGS += -shared -fPIC
   endif
 

trunk/mk/platform.mk

@@ -60,7 +60,8 @@ const tydesc_field_cmp_glue: int = 10;
 const tydesc_field_shape: int = 11;
 const tydesc_field_shape_tables: int = 12;
 const tydesc_field_n_params: int = 13;
-const n_tydesc_fields: int = 14;
+const tydesc_field_obj_params: int = 14;
+const n_tydesc_fields: int = 15;
 
 const cmp_glue_op_eq: uint = 0u;
 

trunk/src/comp/back/abi.rs

@@ -43,6 +43,7 @@ type upcalls =
      ivec_spill: ValueRef,
      ivec_resize_shared: ValueRef,
      ivec_spill_shared: ValueRef,
+     ivec_push: ValueRef,
      cmp_type: ValueRef,
      log_type: ValueRef,
      dynastack_mark: ValueRef,
@@ -90,7 +91,7 @@ fn declare_upcalls(_tn: type_names, tydesc_type: TypeRef,
           get_type_desc:
               d("get_type_desc",
                 [T_ptr(T_nil()), T_size_t(), T_size_t(), T_size_t(),
-                 T_ptr(T_ptr(tydesc_type))], T_ptr(tydesc_type)),
+                 T_ptr(T_ptr(tydesc_type)), T_int()], T_ptr(tydesc_type)),
           ivec_resize:
               d("ivec_resize", [T_ptr(T_opaque_ivec()), T_int()], T_void()),
           ivec_spill:
@@ -101,6 +102,9 @@ fn declare_upcalls(_tn: type_names, tydesc_type: TypeRef,
           ivec_spill_shared:
               d("ivec_spill_shared", [T_ptr(T_opaque_ivec()), T_int()],
                 T_void()),
+          ivec_push:
+              d("ivec_push", [T_ptr(T_opaque_ivec()), T_ptr(tydesc_type),
+                              T_ptr(T_i8())], T_void()),
           cmp_type:
               dr("cmp_type",
                  [T_ptr(T_i1()), taskptr_type, T_ptr(tydesc_type),

trunk/src/comp/back/upcall.rs

@@ -108,7 +108,7 @@ fn parse_input_src(sess: session::session, cfg: &ast::crate_cfg, infile: str)
     ret {crate: crate, src: src};
 }
 
-fn time<T>(do_it: bool, what: str, thunk: fn() -> T) -> T {
+fn time<@T>(do_it: bool, what: str, thunk: fn() -> T) -> T {
     if !do_it { ret thunk(); }
     let start = std::time::precise_time_s();
     let rv = thunk();

trunk/src/comp/driver/rustc.rs

@@ -189,7 +189,7 @@ fn require_unique_names(sess: &session::session, metas: &[@ast::meta_item]) {
     }
 }
 
-fn span<T>(item: &T) -> ast::spanned<T> {
+fn span<@T>(item: &T) -> ast::spanned<T> {
     ret {node: item, span: ast_util::dummy_sp()};
 }
 

trunk/src/comp/front/attr.rs

@@ -170,7 +170,7 @@ fn mk_test_module(cx: &test_ctxt) -> @ast::item {
     ret @item;
 }
 
-fn nospan<T>(t: &T) -> ast::spanned<T> {
+fn nospan<@T>(t: &T) -> ast::spanned<T> {
     ret {node: t, span: dummy_sp()};
 }