---

yaml
---
r: 233469
b: refs/heads/beta
c: 9b26895
h: refs/heads/master
i:
  233467: 6ec71be
v: v3

Author: huonw

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 4fe138cac07bff2cc4185a9a5a71c677f88f0562
+refs/heads/beta: 9b26895346029c817079033fe95727060b73f655
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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");