---

yaml
---
r: 227038
b: refs/heads/master
c: 78eead6
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9af385bddb3076637ab299672c90702562644894
+refs/heads/master: 78eead63fa91dbe156236b547bb4290f02784712
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/librustc_trans/trans/intrinsic.rs

@@ -1426,5 +1426,24 @@ fn generic_simd_intrinsic<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
 
         return ShuffleVector(bcx, llargs[0], llargs[1], C_vector(&indices))
     }
-    C_null(llret_ty)
+
+    if name == "simd_insert" {
+        require!(arg_tys[0].is_simd(tcx),
+                 "SIMD insert intrinsic monomorphised for non-SIMD input type");
+
+        let elem_ty = arg_tys[0].simd_type(tcx);
+        require!(arg_tys[2] == elem_ty,
+                 "SIMD insert intrinsic monomorphised with inserted type not SIMD element type");
+        return InsertElement(bcx, llargs[0], llargs[2], llargs[1])
+    }
+    if name == "simd_extract" {
+        require!(arg_tys[0].is_simd(tcx),
+                 "SIMD insert intrinsic monomorphised for non-SIMD input type");
+
+        let elem_ty = arg_tys[0].simd_type(tcx);
+        require!(ret_ty == elem_ty,
+                 "SIMD insert intrinsic monomorphised with returned type not SIMD element type");
+        return ExtractElement(bcx, llargs[0], llargs[1])
+    }
+    bcx.sess().span_bug(call_info.span, "unknown SIMD intrinsic");
 }

trunk/src/librustc_typeck/check/mod.rs

@@ -5344,6 +5344,8 @@ pub fn check_intrinsic_type(ccx: &CrateCtxt, it: &ast::ForeignItem) {
             "simd_eq" | "simd_ne" | "simd_lt" | "simd_le" | "simd_gt" | "simd_ge" => {
                 (2, vec![param(ccx, 0), param(ccx, 0)], param(ccx, 1))
             }
+            "simd_insert" => (2, vec![param(ccx, 0), tcx.types.u32, param(ccx, 1)], param(ccx, 0)),
+            "simd_extract" => (2, vec![param(ccx, 0), tcx.types.u32], param(ccx, 1)),
             name if name.starts_with("simd_shuffle") => {
                 match name["simd_shuffle".len()..].parse() {
                     Ok(n) => {