---

yaml
---
r: 48495
b: refs/heads/snap-stage3
c: 95c0747
h: refs/heads/master
i:
  48493: 05e7a1c
  48491: 45af499
  48487: 7e7420a
  48479: 8839830
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 8c3728f839acd5bc1a3e1e110be832506777f746
+refs/heads/snap-stage3: 95c07479dd9c7a0438a749638987deb15977cd92
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/consts.rs

@@ -10,7 +10,7 @@
 
 use core::prelude::*;
 
-use lib::llvm::{llvm, ValueRef, True, TypeRef, False};
+use lib::llvm::{llvm, ValueRef, TypeRef, Bool, True, False};
 use middle::const_eval;
 use middle::trans::base;
 use middle::trans::base::get_insn_ctxt;
@@ -323,7 +323,7 @@ fn const_expr_unchecked(cx: @CrateContext, e: @ast::expr) -> ValueRef {
                    expr::cast_type_kind(ety)) {
 
               (expr::cast_integral, expr::cast_integral) => {
-                let s = if ty::type_is_signed(basety) { True } else { False };
+                let s = ty::type_is_signed(basety) as Bool;
                 llvm::LLVMConstIntCast(v, llty, s)
               }
               (expr::cast_integral, expr::cast_float) => {
@@ -340,6 +340,37 @@ fn const_expr_unchecked(cx: @CrateContext, e: @ast::expr) -> ValueRef {
                 if ty::type_is_signed(ety) { llvm::LLVMConstFPToSI(v, llty) }
                 else { llvm::LLVMConstFPToUI(v, llty) }
               }
+              (expr::cast_enum, expr::cast_integral) |
+              (expr::cast_enum, expr::cast_float)  => {
+                let def = ty::resolve_expr(cx.tcx, base);
+                let (enum_did, variant_did) = match def {
+                    ast::def_variant(enum_did, variant_did) => {
+                        (enum_did, variant_did)
+                    }
+                    _ => cx.sess.bug(~"enum cast source is not enum")
+                };
+                // Note that we know this is a C-like (nullary) enum
+                // variant or we wouldn't have gotten here
+                let variants = ty::enum_variants(cx.tcx, enum_did);
+                let iv = if variants.len() == 1 {
+                    // Univariants don't have a discriminant field,
+                    // because there's only one value it could have:
+                    C_integral(T_i64(),
+                               variants[0].disr_val as u64, True)
+                } else {
+                    base::get_discrim_val(cx, e.span, enum_did, variant_did)
+                };
+                let ety_cast = expr::cast_type_kind(ety);
+                match ety_cast {
+                    expr::cast_integral => {
+                        let s = ty::type_is_signed(ety) as Bool;
+                        llvm::LLVMConstIntCast(iv, llty, s)
+                    }
+                    expr::cast_float => llvm::LLVMConstUIToFP(iv, llty),
+                    _ => cx.sess.bug(~"enum cast destination is not \
+                                       integral or float")
+                }
+              }
               _ => {
                 cx.sess.impossible_case(e.span,
                                         ~"bad combination of types for cast")

branches/snap-stage3/src/librustc/middle/ty.rs

@@ -3040,7 +3040,7 @@ pub fn method_call_bounds(tcx: ctxt, method_map: typeck::method_map,
     }
 }
 
-fn resolve_expr(tcx: ctxt, expr: @ast::expr) -> ast::def {
+pub fn resolve_expr(tcx: ctxt, expr: @ast::expr) -> ast::def {
     match tcx.def_map.find(&expr.id) {
         Some(def) => def,
         None => {

branches/snap-stage3/src/test/run-pass/enum-cast.rs

@@ -0,0 +1,31 @@
+// Copyright 2013 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.
+
+enum A { A1, A2 }
+enum B { B1=0, B2=2 }
+
+fn main () {
+    const c1: int = A2 as int;
+    const c2: int = B2 as int;
+    const c3: float = A2 as float;
+    const c4: float = B2 as float;
+    let a1 = A2 as int;
+    let a2 = B2 as int;
+    let a3 = A2 as float;
+    let a4 = B2 as float;
+    assert(c1 == 1);
+    assert(c2 == 2);
+    assert(c3 == 1.0);
+    assert(c4 == 2.0);
+    assert(a1 == 1);
+    assert(a2 == 2);
+    assert(a3 == 1.0);
+    assert(a4 == 2.0);
+}