---

yaml
---
r: 233463
b: refs/heads/beta
c: 5889127
h: refs/heads/master
i:
  233461: 0b3fd11
  233459: cc1ad3e
  233455: f6ce0c7
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: cb1eb9d0c41739fc6abf4361c263013004463072
+refs/heads/beta: 58891278a322f5e09ea0b9da762e37b57fc39d1f
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/mk/crates.mk

@@ -75,7 +75,7 @@ DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_bo
 
 DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back \
 	                log syntax serialize rustc_llvm rustc_platform_intrinsics
-DEPS_rustc_typeck := rustc syntax
+DEPS_rustc_typeck := rustc syntax rustc_platform_intrinsics
 DEPS_rustc_borrowck := rustc log graphviz syntax
 DEPS_rustc_resolve := rustc log syntax
 DEPS_rustc_privacy := rustc log syntax

branches/beta/src/librustc_platform_intrinsics/lib.rs

@@ -28,7 +28,7 @@ pub struct Intrinsic {
     pub definition: IntrinsicDef,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Hash, Eq, PartialEq)]
 pub enum Type {
     Integer(u8),
     Float(u8),

branches/beta/src/librustc_typeck/check/mod.rs

@@ -84,6 +84,7 @@ use self::TupleArgumentsFlag::*;
 use astconv::{self, ast_region_to_region, ast_ty_to_ty, AstConv, PathParamMode};
 use check::_match::pat_ctxt;
 use fmt_macros::{Parser, Piece, Position};
+use intrinsics;
 use middle::astconv_util::{check_path_args, NO_TPS, NO_REGIONS};
 use middle::def;
 use middle::infer;
@@ -109,7 +110,7 @@ use util::nodemap::{DefIdMap, FnvHashMap, NodeMap};
 use util::lev_distance::lev_distance;
 
 use std::cell::{Cell, Ref, RefCell};
-use std::collections::HashSet;
+use std::collections::{HashSet, HashMap};
 use std::iter;
 use std::mem::replace;
 use std::slice;
@@ -5386,16 +5387,18 @@ pub fn check_intrinsic_type(ccx: &CrateCtxt, it: &ast::ForeignItem) {
                 (0, vec![tcx.mk_fn(None, fn_ty), mut_u8], mut_u8)
             }
 
-            name if name.starts_with("x86_") ||
-                    name.starts_with("arm_") ||
-                    name.starts_with("aarch64_") => {
-                // FIXME: skip checking these for now
-                return
-            }
             ref other => {
-                span_err!(tcx.sess, it.span, E0093,
-                    "unrecognized intrinsic function: `{}`", *other);
-                return;
+                match intrinsics::Intrinsic::find(tcx, other) {
+                    Some(intr) => {
+                        check_platform_intrinsic_type(ccx, intr, it);
+                        return
+                    }
+                    None => {
+                        span_err!(tcx.sess, it.span, E0093,
+                                  "unrecognized intrinsic function: `{}`", *other);
+                        return;
+                    }
+                }
             }
         };
         (n_tps, inputs, ty::FnConverging(output))
@@ -5429,3 +5432,97 @@ pub fn check_intrinsic_type(ccx: &CrateCtxt, it: &ast::ForeignItem) {
             });
     }
 }
+
+fn check_platform_intrinsic_type(ccx: &CrateCtxt,
+                                 expected: intrinsics::Intrinsic, it: &ast::ForeignItem) {
+    let tcx = ccx.tcx;
+    let i_ty = tcx.lookup_item_type(local_def(it.id));
+    let i_n_tps = i_ty.generics.types.len(subst::FnSpace);
+    if i_n_tps != 0 {
+        tcx.sess.span_err(it.span,
+                          &format!("intrinsic has wrong number of type parameters: \
+                                    found {}, expected 0",
+                                   i_n_tps));
+        return
+    }
+
+    let mut structural_to_nomimal = HashMap::new();
+
+    let sig = tcx.no_late_bound_regions(i_ty.ty.fn_sig()).unwrap();
+    for (i, (expected_arg, arg)) in expected.inputs.iter().zip(&sig.inputs).enumerate() {
+        match_types(tcx, &format!("argument {}", i + 1), it.span,
+                    &mut structural_to_nomimal, expected_arg, arg);
+    }
+    match_types(tcx, "return value", it.span, &mut structural_to_nomimal,
+                &expected.output, sig.output.unwrap());
+
+    // walk the expected type and the actual type in lock step, checking they're
+    // the same, in a kinda-structural way, i.e. `Vector`s have to be simd structs with
+    // exactly the right element type
+    fn match_types<'tcx, 'a>(tcx: &ty::ctxt<'tcx>,
+                             position: &str,
+                             span: Span,
+                             structural_to_nominal: &mut HashMap<&'a intrinsics::Type,
+                                                                 ty::Ty<'tcx>>,
+                             expected: &'a intrinsics::Type, t: ty::Ty<'tcx>) {
+        use intrinsics::Type::*;
+        match *expected {
+            Integer(bits) => match (bits, &t.sty) {
+                (8, &ty::TyInt(ast::TyI8)) | (8, &ty::TyUint(ast::TyU8)) |
+                (16, &ty::TyInt(ast::TyI16)) | (16, &ty::TyUint(ast::TyU16)) |
+                (32, &ty::TyInt(ast::TyI32)) | (32, &ty::TyUint(ast::TyU32)) |
+                (64, &ty::TyInt(ast::TyI64)) | (64, &ty::TyUint(ast::TyU64)) => {},
+                _ => tcx.sess.span_err(span,
+                                       &format!("intrinsic {} has wrong type: found `{}`, \
+                                                 expected `i{n}` or `u{n}`",
+                                                position,
+                                                t, n = bits)),
+            },
+            Float(bits) => match (bits, &t.sty) {
+                (32, &ty::TyFloat(ast::TyF32)) |
+                (64, &ty::TyFloat(ast::TyF64)) => {},
+                _ => tcx.sess.span_err(span,
+                                       &format!("intrinsic {} has wrong type: found `{}`, \
+                                                 expected `f{n}`",
+                                                position,
+                                                t, n = bits)),
+            },
+            Pointer(_) => unimplemented!(),
+            Vector(ref inner_expected, len) => {
+                if t.is_simd(tcx) {
+                    let t_len = t.simd_size(tcx);
+                    if len as usize != t_len {
+                        tcx.sess.span_err(span,
+                                          &format!("intrinsic {} has wrong type: found \
+                                                    vector with length {}, expected length {}",
+                                                   position,
+                                                   t_len, len));
+                        return;
+                    }
+                    let t_ty = t.simd_type(tcx);
+                    {
+                        let previous = structural_to_nominal.entry(expected).or_insert(t);
+                        if *previous != t {
+                            tcx.sess.span_err(span,
+                                              &format!("intrinsic {} has wrong type: found `{}`, \
+                                                        but already seen this vector type as `{}`",
+                                                       position, t, previous));
+                            return;
+                        }
+                    }
+                    match_types(tcx,
+                                position,
+                                span,
+                                structural_to_nominal,
+                                inner_expected,
+                                t_ty)
+                } else {
+                    tcx.sess.span_err(span,
+                                      &format!("intrinsic {} has wrong type: found non-simd type {}, \
+                                               expected simd type",
+                                               position, t));
+                }
+            }
+        }
+    }
+}

branches/beta/src/librustc_typeck/lib.rs

@@ -96,6 +96,7 @@ This API is completely unstable and subject to change.
 extern crate arena;
 extern crate fmt_macros;
 extern crate rustc;
+extern crate rustc_platform_intrinsics as intrinsics;
 
 pub use rustc::lint;
 pub use rustc::metadata;