---

yaml
---
r: 232470
b: refs/heads/try
c: 9b26895
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 4fe138cac07bff2cc4185a9a5a71c677f88f0562
+refs/heads/try: 9b26895346029c817079033fe95727060b73f655
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_trans/trans/intrinsic.rs

@@ -1457,13 +1457,73 @@ fn generic_simd_intrinsic<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
         if in_ == out { return llargs[0]; }
 
         match (&in_.sty, &out.sty) {
+            (&ty::TyInt(lhs), &ty::TyInt(rhs)) => {
+                match (lhs, rhs) {
+                    (ast::TyI8, ast::TyI8) |
+                    (ast::TyI16, ast::TyI16) |
+                    (ast::TyI32, ast::TyI32) |
+                    (ast::TyI64, ast::TyI64) => return llargs[0],
+
+                    (ast::TyI8, ast::TyI16) |
+                    (ast::TyI8, ast::TyI32) |
+                    (ast::TyI8, ast::TyI64) |
+                    (ast::TyI16, ast::TyI32) |
+                    (ast::TyI16, ast::TyI64) |
+                    (ast::TyI32, ast::TyI64) => return SExt(bcx, llargs[0], llret_ty),
+
+                    (ast::TyI16, ast::TyI8) |
+                    (ast::TyI32, ast::TyI8) |
+                    (ast::TyI32, ast::TyI16) |
+                    (ast::TyI64, ast::TyI8) |
+                    (ast::TyI64, ast::TyI16) |
+                    (ast::TyI64, ast::TyI32) => return Trunc(bcx, llargs[0], llret_ty),
+                    _ => {}
+                }
+            }
+            (&ty::TyUint(lhs), &ty::TyUint(rhs)) => {
+                match (lhs, rhs) {
+                    (ast::TyU8, ast::TyU8) |
+                    (ast::TyU16, ast::TyU16) |
+                    (ast::TyU32, ast::TyU32) |
+                    (ast::TyU64, ast::TyU64) => return llargs[0],
+
+                    (ast::TyU8, ast::TyU16) |
+                    (ast::TyU8, ast::TyU32) |
+                    (ast::TyU8, ast::TyU64) |
+                    (ast::TyU16, ast::TyU32) |
+                    (ast::TyU16, ast::TyU64) |
+                    (ast::TyU32, ast::TyU64) => return ZExt(bcx, llargs[0], llret_ty),
+
+                    (ast::TyU16, ast::TyU8) |
+                    (ast::TyU32, ast::TyU8) |
+                    (ast::TyU32, ast::TyU16) |
+                    (ast::TyU64, ast::TyU8) |
+                    (ast::TyU64, ast::TyU16) |
+                    (ast::TyU64, ast::TyU32) => return Trunc(bcx, llargs[0], llret_ty),
+                    _ => {}
+                }
+            }
             (&ty::TyInt(lhs), &ty::TyUint(rhs)) => {
                 match (lhs, rhs) {
                     (ast::TyI8, ast::TyU8) |
                     (ast::TyI16, ast::TyU16) |
                     (ast::TyI32, ast::TyU32) |
                     (ast::TyI64, ast::TyU64) => return llargs[0],
-                    _ => {},
+
+                    (ast::TyI8, ast::TyU16) |
+                    (ast::TyI8, ast::TyU32) |
+                    (ast::TyI8, ast::TyU64) |
+                    (ast::TyI16, ast::TyU32) |
+                    (ast::TyI16, ast::TyU64) |
+                    (ast::TyI32, ast::TyU64) => return SExt(bcx, llargs[0], llret_ty),
+
+                    (ast::TyI16, ast::TyU8) |
+                    (ast::TyI32, ast::TyU8) |
+                    (ast::TyI32, ast::TyU16) |
+                    (ast::TyI64, ast::TyU8) |
+                    (ast::TyI64, ast::TyU16) |
+                    (ast::TyI64, ast::TyU32) => return Trunc(bcx, llargs[0], llret_ty),
+                    _ => {}
                 }
             }
             (&ty::TyUint(lhs), &ty::TyInt(rhs)) => {
@@ -1472,26 +1532,43 @@ fn generic_simd_intrinsic<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
                     (ast::TyU16, ast::TyI16) |
                     (ast::TyU32, ast::TyI32) |
                     (ast::TyU64, ast::TyI64) => return llargs[0],
-                    _ => {},
+
+                    (ast::TyU8, ast::TyI16) |
+                    (ast::TyU8, ast::TyI32) |
+                    (ast::TyU8, ast::TyI64) |
+                    (ast::TyU16, ast::TyI32) |
+                    (ast::TyU16, ast::TyI64) |
+                    (ast::TyU32, ast::TyI64) => return ZExt(bcx, llargs[0], llret_ty),
+
+                    (ast::TyU16, ast::TyI8) |
+                    (ast::TyU32, ast::TyI8) |
+                    (ast::TyU32, ast::TyI16) |
+                    (ast::TyU64, ast::TyI8) |
+                    (ast::TyU64, ast::TyI16) |
+                    (ast::TyU64, ast::TyI32) => return Trunc(bcx, llargs[0], llret_ty),
+                    _ => {}
                 }
             }
-            (&ty::TyInt(ast::TyI32), &ty::TyFloat(ast::TyF32)) |
-            (&ty::TyInt(ast::TyI64), &ty::TyFloat(ast::TyF64)) => {
+
+            (&ty::TyInt(_), &ty::TyFloat(_)) => {
                 return SIToFP(bcx, llargs[0], llret_ty)
             }
-            (&ty::TyUint(ast::TyU32), &ty::TyFloat(ast::TyF32)) |
-            (&ty::TyUint(ast::TyU64), &ty::TyFloat(ast::TyF64)) => {
+            (&ty::TyUint(_), &ty::TyFloat(_)) => {
                 return UIToFP(bcx, llargs[0], llret_ty)
             }
 
-            (&ty::TyFloat(ast::TyF32), &ty::TyInt(ast::TyI32)) |
-            (&ty::TyFloat(ast::TyF64), &ty::TyInt(ast::TyI64)) => {
+            (&ty::TyFloat(_), &ty::TyInt(_)) => {
                 return FPToSI(bcx, llargs[0], llret_ty)
             }
-            (&ty::TyFloat(ast::TyF32), &ty::TyUint(ast::TyU32)) |
-            (&ty::TyFloat(ast::TyF64), &ty::TyUint(ast::TyU64)) => {
+            (&ty::TyFloat(_), &ty::TyUint(_)) => {
                 return FPToUI(bcx, llargs[0], llret_ty)
             }
+            (&ty::TyFloat(ast::TyF32), &ty::TyFloat(ast::TyF64)) => {
+                return FPExt(bcx, llargs[0], llret_ty)
+            }
+            (&ty::TyFloat(ast::TyF64), &ty::TyFloat(ast::TyF32)) => {
+                return FPTrunc(bcx, llargs[0], llret_ty)
+            }
             _ => {}
         }
         require!(false, "SIMD cast intrinsic monomorphised with incompatible cast");