auto merge of #6193 : youknowone/rust/static-string, r=sanxiyn

diff --combined src/librustc/middle/trans/base.rs
index 0505a5e328e93500647cad86770cfc7f9f3b8576,87e347d2004085779131a6d020bf04f4884020f7..b5029ee6bd7d1e85d3bac0c9006f1153804c0de6
--- 1/src/librustc/middle/trans/base.rs
--- 2/src/librustc/middle/trans/base.rs
+++ b/src/librustc/middle/trans/base.rs
@@@ -1125,10 -1125,11 +1125,11 @@@ pub fn init_local(bcx: block, local: @a
      }
  
      let llptr = match bcx.fcx.lllocals.find(&local.node.id) {
-       Some(&local_mem(v)) => v,
-       _ => { bcx.tcx().sess.span_bug(local.span,
-                         ~"init_local: Someone forgot to document why it's\
-                          safe to assume local.node.init must be local_mem!");
+         Some(&local_mem(v)) => v,
+         _ => {
+             bcx.tcx().sess.span_bug(local.span,
+                                     "init_local: Someone forgot to document why it's\
+                                      safe to assume local.node.init must be local_mem!");
          }
      };
  
@@@ -2071,7 -2072,6 +2072,7 @@@ pub fn trans_tuple_struct(ccx: @CrateCo
      let bcx = copy_args_to_allocas(fcx, bcx, fn_args, raw_llargs, arg_tys);
  
      let repr = adt::represent_type(ccx, tup_ty);
 +    adt::trans_start_init(bcx, repr, fcx.llretptr.get(), 0);
  
      for fields.eachi |i, field| {
          let lldestptr = adt::trans_field_ptr(bcx,