Find template definitions that don't want to be found

Author: fitzgen

src/ir/context.rs

@@ -184,7 +184,7 @@ impl<'ctx> BindgenContext<'ctx> {
                                           &options.clang_args,
                                           &[],
                                           parse_options)
-                .expect("TranslationUnit::parse");
+                .expect("TranslationUnit::parse failed");
 
         let root_module = Self::build_root_module(ItemId(0));
         let mut me = BindgenContext {

src/ir/template.rs

@@ -91,12 +91,13 @@ impl TemplateInstantiation {
                    -> TemplateInstantiation {
         use clang_sys::*;
 
-        let template_args: Vec<_> = ty.template_args()
-            .expect("If there weren't template args, then you shouldn't have \
-                     tried to instantiate a template!")
-            .filter(|t| t.kind() != CXType_Invalid)
-            .map(|t| Item::from_ty_or_ref(t, t.declaration(), None, ctx))
-            .collect();
+        let template_args = ty.template_args()
+            .map(|args| {
+                args.filter(|t| t.kind() != CXType_Invalid)
+                    .map(|t| Item::from_ty_or_ref(t, t.declaration(), None, ctx))
+                    .collect()
+            })
+            .unwrap_or(vec![]);
 
         let definition = ty.declaration()
             .specialized()
@@ -108,7 +109,11 @@ impl TemplateInstantiation {
                         return CXVisit_Break;
                     }
 
-                    CXVisit_Continue
+                    // Instantiations of template aliases might have the
+                    // TemplateRef to the template alias definition arbitrarily
+                    // deep, so we need to recurse here and not only visit
+                    // direct children.
+                    CXChildVisit_Recurse
                 });
 
                 template_ref.and_then(|cur| cur.referenced())

tests/headers/issue-544-stylo-creduce-2.hpp

@@ -0,0 +1,8 @@
+// bindgen-flags: -- -std=c++14
+
+template <typename T>
+struct Foo {
+    template <typename> using FirstAlias = typename T::Associated;
+    template <typename U> using SecondAlias = Foo<FirstAlias<U>>;
+    SecondAlias<int> member;
+};