---

yaml
---
r: 277401
b: refs/heads/try
c: d3c489c
h: refs/heads/master
i:
  277399: bef097c

Author: oli-obk

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: 9d7ed99c06bbce263c4de56e269b62b135c5a6e1
+refs/heads/try: d3c489c917c1086728001c94a98765e02171a201
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_passes/consts.rs

@@ -498,7 +498,6 @@ impl<'a, 'tcx, 'v> Visitor<'v> for CheckCrateVisitor<'a, 'tcx> {
                 Err(ConstEvalErr { kind: Math(ConstMathErr::Overflow(Op::Shl)), ..}) |
                 Err(ConstEvalErr { kind: IndexOpFeatureGated, ..}) => {},
                 Err(msg) => {
-                    self.qualif = self.qualif | ConstQualif::NOT_CONST;
                     self.tcx.sess.add_lint(CONST_ERR, ex.id,
                                            msg.span,
                                            msg.description().into_owned())

branches/try/src/test/compile-fail/const-err.rs

@@ -8,8 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// these errors are not actually "const_err", they occur in trans/consts
+// and are unconditional warnings that can't be denied or allowed
+
 #![feature(rustc_attrs)]
 #![allow(exceeding_bitshifts)]
+#![allow(const_err)]
 
 fn black_box<T>(_: T) {
     unimplemented!()
@@ -21,6 +25,7 @@ fn main() {
     //~^ WARN attempted to negate with overflow
     let b = 200u8 + 200u8 + 200u8;
     //~^ WARN attempted to add with overflow
+    //~| WARN attempted to add with overflow
     let c = 200u8 * 4;
     //~^ WARN attempted to multiply with overflow
     let d = 42u8 - (42u8 + 1);

branches/try/src/test/compile-fail/const-err2.rs

@@ -0,0 +1,34 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(rustc_attrs)]
+#![allow(exceeding_bitshifts)]
+#![deny(const_err)]
+
+fn black_box<T>(_: T) {
+    unimplemented!()
+}
+
+fn main() {
+    let a = -std::i8::MIN;
+    //~^ ERROR attempted to negate with overflow
+    let b = 200u8 + 200u8 + 200u8;
+    //~^ ERROR attempted to add with overflow
+    //~| ERROR attempted to add with overflow
+    let c = 200u8 * 4;
+    //~^ ERROR attempted to multiply with overflow
+    let d = 42u8 - (42u8 + 1);
+    //~^ ERROR attempted to subtract with overflow
+    let _e = [5u8][1];
+    black_box(a);
+    black_box(b);
+    black_box(c);
+    black_box(d);
+}