---

yaml
---
r: 226239
b: refs/heads/snap-stage3
c: 20aa27b
h: refs/heads/master
i:
  226237: a004429
  226235: 257182a
  226231: e0092c6
  226223: 3e98bd9
  226207: 0681940
  226175: c2b9d7e
v: v3

Author: pnkfelix

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: e5d90d98402475b6e154ce216f9efcb80da1a747
-refs/heads/snap-stage3: 9ef61f1ee0690b4fb04192a283113901d5764b32
+refs/heads/snap-stage3: 20aa27b7bca3504f6a7672cc88e17a9c286cec4b
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/snap-stage3/src/librustc/session/config.rs

@@ -594,6 +594,8 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
           "Force drop flag checks on or off"),
     trace_macros: bool = (false, parse_bool,
           "For every macro invocation, print its name and arguments"),
+    disable_nonzeroing_move_hints: bool = (false, parse_bool,
+          "Force nonzeroing move optimization off"),
 }
 
 pub fn default_lib_output() -> CrateType {

branches/snap-stage3/src/librustc/session/mod.rs

@@ -272,6 +272,9 @@ impl Session {
     pub fn print_enum_sizes(&self) -> bool {
         self.opts.debugging_opts.print_enum_sizes
     }
+    pub fn nonzeroing_move_hints(&self) -> bool {
+        !self.opts.debugging_opts.disable_nonzeroing_move_hints
+    }
     pub fn sysroot<'a>(&'a self) -> &'a Path {
         match self.opts.maybe_sysroot {
             Some (ref sysroot) => sysroot,