Auto merge of #613 - fitzgen:upsuper-libclang-4, r=emilio

Handle when we can't instantiate templates because we can't find a template definition

#594 + my review commetn about using opaque types

Author: bors-servo

src/ir/template.rs

@@ -88,7 +88,7 @@ impl TemplateInstantiation {
     /// Parse a `TemplateInstantiation` from a clang `Type`.
     pub fn from_ty(ty: &clang::Type,
                    ctx: &mut BindgenContext)
-                   -> TemplateInstantiation {
+                   -> Option<TemplateInstantiation> {
         use clang_sys::*;
 
         let template_args = ty.template_args()
@@ -100,6 +100,10 @@ impl TemplateInstantiation {
                     .collect()
             });
 
+        if ty.declaration().is_builtin() {
+            return None;
+        }
+
         let definition = ty.declaration()
             .specialized()
             .or_else(|| {
@@ -124,7 +128,7 @@ impl TemplateInstantiation {
         let template_definition =
             Item::from_ty_or_ref(definition.cur_type(), definition, None, ctx);
 
-        TemplateInstantiation::new(template_definition, template_args)
+        Some(TemplateInstantiation::new(template_definition, template_args))
     }
 
     /// Does this instantiation have a vtable?

src/ir/ty.rs

@@ -988,8 +988,10 @@ impl Type {
                       (ty.template_args().is_some() &&
                        ty_kind != CXType_Typedef) {
             // This is a template instantiation.
-            let inst = TemplateInstantiation::from_ty(&ty, ctx);
-            TypeKind::TemplateInstantiation(inst)
+            match TemplateInstantiation::from_ty(&ty, ctx) {
+                Some(inst) => TypeKind::TemplateInstantiation(inst),
+                None => TypeKind::Opaque,
+            }
         } else {
             match ty_kind {
                 CXType_Unexposed if *ty != canonical_ty &&

tests/expectations/tests/builtin-template.rs

@@ -0,0 +1,7 @@
+/* automatically generated by rust-bindgen */
+
+
+#![allow(non_snake_case)]
+
+
+pub type std_make_integer_sequence = u8;

tests/headers/builtin-template.hpp

@@ -0,0 +1,6 @@
+namespace std {
+template<class T, T... Ints>
+class integer_sequence;
+template<class T, T N>
+using make_integer_sequence = __make_integer_seq<integer_sequence, T, N>;
+}