Auto merge of #466 - emilio:tpl, r=upsuper

ir: Fix is_in_non_fully_specialized_template check.

Fixes #462

r? @upsuper

Author: bors-servo

src/clang.rs

@@ -201,14 +201,14 @@ impl Cursor {
     }
 
     /// Is the referent a template specialization?
-    pub fn is_template(&self) -> bool {
+    pub fn is_template_specialization(&self) -> bool {
         self.specialized().is_some()
     }
 
     /// Is the referent a fully specialized template specialization without any
     /// remaining free template arguments?
     pub fn is_fully_specialized_template(&self) -> bool {
-        self.is_template() && self.num_template_args().unwrap_or(0) > 0
+        self.is_template_specialization() && self.num_template_args().unwrap_or(0) > 0
     }
 
     /// Is the referent a template specialization that still has remaining free
@@ -217,9 +217,17 @@ impl Cursor {
         if self.is_toplevel() {
             return false;
         }
+
         let parent = self.semantic_parent();
-        (parent.is_template() && !parent.is_fully_specialized_template()) ||
-        parent.is_in_non_fully_specialized_template()
+        if parent.is_fully_specialized_template() {
+            return false;
+        }
+
+        if !parent.is_template_like() {
+            return parent.is_in_non_fully_specialized_template();
+        }
+
+        return true;
     }
 
     /// Is this cursor pointing a valid referent?

src/ir/function.rs

@@ -93,7 +93,7 @@ fn get_abi(cc: CXCallingConv) -> abi::Abi {
 pub fn cursor_mangling(cursor: &clang::Cursor) -> Option<String> {
     // We early return here because libclang may crash in some case
     // if we pass in a variable inside a partial specialized template.
-    // See servo/rust-bindgen#67.
+    // See servo/rust-bindgen#67, and servo/rust-bindgen#462.
     if cursor.is_in_non_fully_specialized_template() {
         return None;
     }

tests/expectations/tests/constant-non-specialized-tp.rs

@@ -0,0 +1,24 @@
+/* automatically generated by rust-bindgen */
+
+
+#![allow(non_snake_case)]
+
+
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct Test<Args> {
+    pub _address: u8,
+    pub _phantom_0: ::std::marker::PhantomData<Args>,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct Outer<T> {
+    pub _address: u8,
+    pub _phantom_0: ::std::marker::PhantomData<T>,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct Outer_Inner<T> {
+    pub _address: u8,
+    pub _phantom_0: ::std::marker::PhantomData<T>,
+}

tests/headers/constant-non-specialized-tp.hpp

@@ -0,0 +1,15 @@
+// bindgen-flags: -- -std=c++11
+
+// This test ensure we protect ourselves from an LLVM crash.
+
+template <class... Args>
+struct Test {
+  static constexpr bool x[] = {Args::x...};
+};
+
+template<typename... T>
+struct Outer {
+  struct Inner {
+    static constexpr int value[] = { T::value... };
+  };
+};