From c8dd1e8c163e332b9b7b0a7b98b1e93c64a10270 Mon Sep 17 00:00:00 2001
From: Lars Luthman <mail@larsluthman.net>
Date: Mon, 13 Feb 2017 12:42:13 +0100
Subject: [PATCH 1/2] Fix type hint bug in eval_const_expr_partial().
---
src/librustc_const_eval/eval.rs | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/librustc_const_eval/eval.rs b/src/librustc_const_eval/eval.rs
index af4f63a05613e..bb7fa40774eb4 100644
--- a/src/librustc_const_eval/eval.rs
+++ b/src/librustc_const_eval/eval.rs
@@ -519,15 +519,23 @@ fn eval_const_expr_partial<'a, 'tcx>(cx: &ConstContext<'a, 'tcx>,
}
hir::ExprUnary(hir::UnDeref, _) => signal!(e, UnimplementedConstVal("deref operation")),
hir::ExprBinary(op, ref a, ref b) => {
- let b_ty = match op.node {
- hir::BiShl | hir::BiShr => ty_hint.erase_hint(),
- _ => ty_hint
+ // Use the same type hint for the operands as for the whole
+ // expression, except when the operation is a shift, in which
+ // case we use no type hint for the RHS, and when the operation
+ // is a comparison, in which case we use no type hint for
+ // either operand.
+ let (a_ty, b_ty) = match op.node {
+ hir::BiShl | hir::BiShr => (ty_hint, ty_hint.erase_hint()),
+ hir::BiEq | hir::BiLe | hir::BiLt |
+ hir::BiNe | hir::BiGe | hir::BiGt =>
+ (ty_hint.erase_hint(), ty_hint.erase_hint()),
+ _ => (ty_hint, ty_hint)
};
// technically, if we don't have type hints, but integral eval
// gives us a type through a type-suffix, cast or const def type
// we need to re-eval the other value of the BinOp if it was
// not inferred
- match (cx.eval(a, ty_hint)?,
+ match (cx.eval(a, a_ty)?,
cx.eval(b, b_ty)?) {
(Float(a), Float(b)) => {
use std::cmp::Ordering::*;
From 3a209dd4f16c12c1ecdb452e83129a17a72c30ac Mon Sep 17 00:00:00 2001
From: Lars Luthman <mail@larsluthman.net>
Date: Tue, 14 Feb 2017 15:02:07 +0100
Subject: [PATCH 2/2] Added regression test for #39548.
---
src/test/run-pass/issue-39548.rs | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 src/test/run-pass/issue-39548.rs
diff --git a/src/test/run-pass/issue-39548.rs b/src/test/run-pass/issue-39548.rs
new file mode 100644
index 0000000000000..9f6855566f089
--- /dev/null
+++ b/src/test/run-pass/issue-39548.rs
@@ -0,0 +1,14 @@
+// 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.
+
+
+fn main() {
+ let _ : [(); ((1 < 2) == false) as usize] = [];
+}