Make mangled name available to generated_xxx_override. Link name override no longer affected by generated name override.

bindgen-tests/tests/headers/generated_link_name_override.hpp

@@ -0,0 +1,10 @@
+// bindgen-parse-callbacks: prefix-link-name-
+// bindgen-parse-callbacks: remove-function-prefix-prefix_kept_in_link_name_only_
+// prefix-link-name- with no value just ensures that the items are always given the link_name attribute.
+
+extern const int prefix_kept_in_link_name_only_var_coolConstVariable_name; 
+
+extern int prefix_kept_in_link_name_only_var_coolVariable_name;
+
+void prefix_kept_in_link_name_only_function_coolFunction_name(const int x);
+

bindgen/callbacks.rs

@@ -258,6 +258,8 @@ pub enum TypeKind {
 pub struct ItemInfo<'a> {
     /// The name of the item
     pub name: &'a str,
+    /// The mangled name of the item, if available
+    pub mangled_name: Option<&'a str>,
     /// The kind of item
     pub kind: ItemKind,
 }

bindgen/ir/function.rs

@@ -784,25 +784,27 @@ impl ClangSubItemParser for Function {
             // but seems easy enough to handle it here.
             name.push_str("_destructor");
         }
+        let mangled_name = cursor_mangling(context, &cursor);
+
+        let link_name = context.options().last_callback(|callbacks| {
+            callbacks.generated_link_name_override(ItemInfo {
+                name: name.as_str(),
+                mangled_name: mangled_name.as_deref(),
+                kind: ItemKind::Function,
+            })
+        });
+
         if let Some(nm) = context.options().last_callback(|callbacks| {
             callbacks.generated_name_override(ItemInfo {
                 name: name.as_str(),
+                mangled_name: mangled_name.as_deref(),
                 kind: ItemKind::Function,
             })
         }) {
             name = nm;
         }
         assert!(!name.is_empty(), "Empty function name.");
 
-        let mangled_name = cursor_mangling(context, &cursor);
-
-        let link_name = context.options().last_callback(|callbacks| {
-            callbacks.generated_link_name_override(ItemInfo {
-                name: name.as_str(),
-                kind: ItemKind::Function,
-            })
-        });
-
         let function = Self::new(
             name.clone(),
             mangled_name,

bindgen/ir/var.rs

@@ -271,10 +271,21 @@ impl ClangSubItemParser for Var {
             }
             CXCursor_VarDecl => {
                 let mut name = cursor.spelling();
+                let mangling = cursor_mangling(ctx, &cursor);
+
+                let link_name = ctx.options().last_callback(|callbacks| {
+                    callbacks.generated_link_name_override(ItemInfo {
+                        name: name.as_str(),
+                        mangled_name: mangling.as_deref(),
+                        kind: ItemKind::Var,
+                    })
+                });
+
                 if cursor.linkage() == CXLinkage_External {
                     if let Some(nm) = ctx.options().last_callback(|callbacks| {
                         callbacks.generated_name_override(ItemInfo {
                             name: name.as_str(),
+                            mangled_name: mangling.as_deref(),
                             kind: ItemKind::Var,
                         })
                     }) {
@@ -289,13 +300,6 @@ impl ClangSubItemParser for Var {
                     return Err(ParseError::Continue);
                 }
 
-                let link_name = ctx.options().last_callback(|callbacks| {
-                    callbacks.generated_link_name_override(ItemInfo {
-                        name: name.as_str(),
-                        kind: ItemKind::Var,
-                    })
-                });
-
                 let ty = cursor.cur_type();
 
                 // TODO(emilio): do we have to special-case constant arrays in
@@ -364,7 +368,6 @@ impl ClangSubItemParser for Var {
                         .map(VarType::String)
                 };
 
-                let mangling = cursor_mangling(ctx, &cursor);
                 let var =
                     Var::new(name, mangling, link_name, ty, value, is_const);