Auto merge of #39812 - larsluthman:const-eval-bugfix, r=nrc

Fix type hint bug in eval_const_expr_partial() (issue #39548)

When evaluating const expressions for things like array lengths, rustc assumes that the operands in comparison expressions (a < b, a == b, a >= b etc) are booleans and sets their type hints accordingly, causing an incorrect compilation error in the case "(FOO < 4)" with "const FOO: i32 = 3" and a compiler panic in the case "(3 < 4)".

This fix makes sure that rustc does not assume anything about the types of those operands.

Author: bors

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::*;

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] = [];
+}