Fix demangler API consumer builds

Author: plafosse

plugins/idb_import/CMakeLists.txt

@@ -12,6 +12,7 @@ file(GLOB API_SOURCES CONFIGURE_DEPENDS
         ${PROJECT_SOURCE_DIR}/../../rust/binaryninjacore-sys/Cargo.toml
         ${PROJECT_SOURCE_DIR}/../../rust/binaryninjacore-sys/src/*
         ${PROJECT_SOURCE_DIR}/../../rust/Cargo.toml
+        ${PROJECT_SOURCE_DIR}/../../rust/src/*.rs
         ${PROJECT_SOURCE_DIR}/../../rust/src/*/*.rs)
 
 if(CMAKE_BUILD_TYPE MATCHES Debug)

plugins/pdb-ng/CMakeLists.txt

@@ -60,6 +60,7 @@ file(GLOB API_SOURCES CONFIGURE_DEPENDS
 	${BN_API_SOURCE_DIR}/rust/binaryninjacore-sys/Cargo.toml
 	${BN_API_SOURCE_DIR}/rust/binaryninjacore-sys/src/*
 	${BN_API_SOURCE_DIR}/rust/Cargo.toml
+	${BN_API_SOURCE_DIR}/rust/src/*.rs
 	${BN_API_SOURCE_DIR}/rust/src/*/*.rs)
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY OUTPUT_FILE_PATH ${OUTPUT_FILE_PATH})

plugins/pdb-ng/src/symbol_parser.rs

@@ -1818,8 +1818,10 @@ impl<'a, S: Source<'a> + 'a> PDBParserInstance<'a, S> {
             &mut self.settings_query_opts.clone(),
         );
         let (mut t, mut name) = match demangle_ms(&self.arch, raw_name, simplify_templates) {
-            Some((name, Some(t))) => (Some(Conf::new(t, DEMANGLE_CONFIDENCE)), name),
-            Some((name, _)) => (None, name),
+            Some(result) => (
+                result.ty.map(|ty| Conf::new(ty, DEMANGLE_CONFIDENCE)),
+                result.name,
+            ),
             _ => (None, QualifiedName::new(vec![raw_name.clone()])),
         };
 

plugins/warp/src/convert/symbol.rs

@@ -1,4 +1,5 @@
 use binaryninja::binary_view::BinaryView;
+use binaryninja::demangle::{demangle_any, DemanglerConfig};
 use binaryninja::rc::Ref as BNRef;
 use binaryninja::symbol::Symbol as BNSymbol;
 use binaryninja::symbol::SymbolType as BNSymbolType;
@@ -75,17 +76,13 @@ pub fn to_bn_symbol_at_address(view: &BinaryView, symbol: &Symbol, addr: u64) ->
     let raw_name = symbol.name.as_str();
     let mut symbol_builder = BNSymbol::builder(symbol_type, &symbol.name, addr);
     // Demangle symbol name (short is with simplifications).
-    if let Some(arch) = view.default_arch() {
-        if let Some((full_name, _)) =
-            binaryninja::demangle::demangle_generic(&arch, raw_name, Some(view), false)
-        {
-            symbol_builder = symbol_builder.full_name(full_name);
-        }
-        if let Some((short_name, _)) =
-            binaryninja::demangle::demangle_generic(&arch, raw_name, Some(view), false)
-        {
-            symbol_builder = symbol_builder.short_name(short_name);
-        }
+    let full_config = DemanglerConfig::for_binary_view(view, false);
+    if let Some(result) = demangle_any(raw_name, &full_config) {
+        symbol_builder = symbol_builder.full_name(result.name);
+    }
+    let short_config = DemanglerConfig::for_binary_view(view, true);
+    if let Some(result) = demangle_any(raw_name, &short_config) {
+        symbol_builder = symbol_builder.short_name(result.name);
     }
     symbol_builder.create()
 }

plugins/workflow_objc/CMakeLists.txt

@@ -81,6 +81,7 @@ file(GLOB_RECURSE API_SOURCES CONFIGURE_DEPENDS
         ${PROJECT_SOURCE_DIR}/../../rust/binaryninjacore-sys/Cargo.toml
         ${PROJECT_SOURCE_DIR}/../../rust/binaryninjacore-sys/src/*.rs
         ${PROJECT_SOURCE_DIR}/../../rust/Cargo.toml
+        ${PROJECT_SOURCE_DIR}/../../rust/src/*.rs
         ${PROJECT_SOURCE_DIR}/../../rust/src/*/*.rs)
 
 find_program(RUSTUP_PATH rustup REQUIRED HINTS ~/.cargo/bin)

plugins/workflow_swift/CMakeLists.txt

@@ -81,6 +81,7 @@ file(GLOB_RECURSE API_SOURCES CONFIGURE_DEPENDS
         ${PROJECT_SOURCE_DIR}/../../rust/binaryninjacore-sys/Cargo.toml
         ${PROJECT_SOURCE_DIR}/../../rust/binaryninjacore-sys/src/*.rs
         ${PROJECT_SOURCE_DIR}/../../rust/Cargo.toml
+        ${PROJECT_SOURCE_DIR}/../../rust/src/*.rs
         ${PROJECT_SOURCE_DIR}/../../rust/src/*/*.rs)
 
 find_program(RUSTUP_PATH rustup REQUIRED HINTS ~/.cargo/bin)

plugins/workflow_swift/src/demangler/mod.rs

@@ -2,12 +2,10 @@ mod function_type;
 mod name;
 mod type_reconstruction;
 
-use binaryninja::architecture::CoreArchitecture;
 use binaryninja::binary_view::BinaryView;
-use binaryninja::demangle::CustomDemangler;
-use binaryninja::rc::Ref;
+use binaryninja::demangle::{CustomDemangler, DemanglerConfig, DemanglerResult};
 use binaryninja::settings::{QueryOptions, Settings};
-use binaryninja::types::{QualifiedName, Type};
+use binaryninja::types::QualifiedName;
 
 fn should_extract_types(view: Option<&BinaryView>) -> bool {
     let mut opts = match view {
@@ -32,26 +30,27 @@ impl CustomDemangler for SwiftDemangler {
 
     fn demangle(
         &self,
-        arch: &CoreArchitecture,
         name: &str,
-        view: Option<Ref<BinaryView>>,
-        _simplify: bool,
-    ) -> Option<(QualifiedName, Option<Ref<Type>>)> {
+        config: &DemanglerConfig,
+    ) -> Option<DemanglerResult> {
         let ctx = swift_demangler::Context::new();
         let symbol = swift_demangler::Symbol::parse(&ctx, name)?;
 
-        if should_extract_types(view.as_deref()) {
-            let ty = function_type::build_function_type(&symbol, arch);
+        if should_extract_types(config.view.as_deref()) {
+            let ty = config
+                .platform
+                .as_ref()
+                .and_then(|platform| function_type::build_function_type(&symbol, &platform.arch()));
             let qname = if ty.is_some() {
                 name::build_short_name(&symbol)
             } else {
                 None
             }
             .unwrap_or_else(|| QualifiedName::from(symbol.display()));
-            Some((qname, ty))
+            Some(DemanglerResult::new(qname, ty))
         } else {
             let qname = QualifiedName::from(symbol.display());
-            Some((qname, None))
+            Some(DemanglerResult::new(qname, None))
         }
     }
 }

plugins/workflow_swift/src/lib.rs

@@ -30,5 +30,5 @@ pub extern "C" fn CorePluginInit() -> bool {
         }"#,
     );
 
-    Demangler::register("Swift", SwiftDemangler).is_some()
+    Demangler::register("Swift", SwiftDemangler)
 }

rust/src/rc.rs

@@ -318,14 +318,6 @@ where
 
 #[allow(private_bounds)]
 impl<P: CoreArrayProviderInner> ArrayGuard<P> {
-    pub(crate) unsafe fn new(raw: *mut P::Raw, count: usize, context: P::Context) -> Self {
-        Self {
-            contents: raw,
-            count,
-            context,
-        }
-    }
-
     #[inline]
     pub fn len(&self) -> usize {
         self.count