---

yaml
---
r: 274655
b: refs/heads/stable
c: 79a6373
h: refs/heads/master
i:
  274653: 4039e48
  274651: 9cdbafa
  274647: ee6edb3
  274639: 8dd0804
  274623: e686104

Author: alexcrichton

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 73132caa0bb7d9e4eb7531cc729c4323adbdee54
+refs/heads/stable: 79a63735730c4da0c19c46f914f8dba37fea7b5a
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/librustc_back/target/windows_base.rs

@@ -84,7 +84,6 @@ pub fn opts() -> TargetOptions {
             "rsend.o".to_string()
         ),
         custom_unwind_resume: true,
-        exe_allocation_crate: super::maybe_jemalloc(),
 
         .. Default::default()
     }

branches/stable/src/librustc_back/target/x86_64_rumprun_netbsd.rs

@@ -21,6 +21,7 @@ pub fn target() -> Target {
     base.position_independent_executables = false;
     base.disable_redzone = true;
     base.no_default_libraries = false;
+    base.exe_allocation_crate = "alloc_system".to_string();
 
     Target {
         llvm_target: "x86_64-rumprun-netbsd".to_string(),

branches/stable/src/librustc_mir/build/expr/into.rs

@@ -63,7 +63,7 @@ impl<'a,'tcx> Builder<'a,'tcx> {
                 } else {
                     // Body of the `if` expression without an `else` clause must return `()`, thus
                     // we implicitly generate a `else {}` if it is not specified.
-                    this.cfg.push_assign_unit(else_block, expr_span, destination);
+                    this.cfg.push_assign_unit(else_block, expr_span, &Lvalue::ReturnPointer);
                     else_block
                 };