Skip to content

enum: add support hash name for unnamed enum #3258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions bindgen-tests/tests/expectations/tests/enum_unnamed.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions bindgen-tests/tests/headers/enum_unnamed.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// bindgen-flags: --hash-unnamed-enum

enum {
A = 1,
B = 2
};
enum {
C = -3,
D = 4,
};
13 changes: 13 additions & 0 deletions bindgen/ir/enum_ty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,19 @@ impl Enum {
ctx.options().default_enum_style
}
}
/// generate hash from enum variants
pub(crate) fn variants_name_hash(&self) -> u64 {
use std::collections::hash_map::DefaultHasher;
use std::hash::{Hash, Hasher};

let mut hasher = DefaultHasher::new();

for variant in self.variants() {
variant.name().hash(&mut hasher);
}

hasher.finish()
}
}

/// A single enum variant, to be contained only in an enum.
Expand Down
20 changes: 19 additions & 1 deletion bindgen/ir/ty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,25 @@ impl Type {
.sanitized_name(ctx)
.map(|name| format!("{prefix}_{name}").into())
} else {
self.name().map(Self::sanitize_name)
match self.name() {
Some(name) => Some(Self::sanitize_name(name)),
None => match self.kind() {
TypeKind::Enum(inner) => {
if ctx.options().hash_unnamed_enum {
Some(
format!(
"bindgen_enum_{:x}",
inner.variants_name_hash()
)
.into(),
)
} else {
None
}
}
_ => None,
},
}
}
}

Expand Down
4 changes: 4 additions & 0 deletions bindgen/options/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,8 @@ struct BindgenCommand {
/// Do not prepend the enum name to constant or newtype variants.
#[arg(long)]
no_prepend_enum_name: bool,
#[arg(long)]
hash_unnamed_enum: bool,
/// Do not try to detect default include paths
#[arg(long)]
no_include_path_detection: bool,
Expand Down Expand Up @@ -611,6 +613,7 @@ where
ignore_methods,
no_convert_floats,
no_prepend_enum_name,
hash_unnamed_enum,
no_include_path_detection,
fit_macro_constant_types,
opaque_type,
Expand Down Expand Up @@ -898,6 +901,7 @@ where
with_derive_ord => Builder::derive_ord,
no_derive_default => |b, _| b.derive_default(false),
no_prepend_enum_name => |b, _| b.prepend_enum_name(false),
hash_unnamed_enum => |b,_|b.hash_unnamed_enum(),
no_include_path_detection => |b, _| b.detect_include_paths(false),
fit_macro_constant_types => Builder::fit_macro_constants,
time_phases,
Expand Down
13 changes: 13 additions & 0 deletions bindgen/options/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2283,4 +2283,17 @@ options! {
},
as_args: "--generate-private-functions",
},
/// use hash name for unnamed enum
hash_unnamed_enum: bool {
default: false,
methods: {
/// Generate a hash-based name for unnamed enums,
/// using the hash of their variant names.
pub fn hash_unnamed_enum(mut self) -> Self {
self.options.hash_unnamed_enum = true;
self
}
},
as_args: "--hash-unnamed-enum",
}
}
Loading