Merge pull request #197 from jan-auer/block-invoke

Demangle invocation block symbols

Author: Saldivarcher

examples/cppfilt.rs

@@ -21,9 +21,12 @@ fn find_mangled(haystack: &[u8]) -> Option<usize> {
 
     for i in 0..haystack.len() - 1 {
         if haystack[i] == b'_' {
-            let next = haystack[i + 1];
-            if next == b'Z' || next == b'_' && haystack.get(i + 2) == Some(&b'Z') {
-                return Some(i);
+            match (haystack[i + 1], haystack.get(i + 2), haystack.get(i + 3), haystack.get(i + 4)) {
+                (b'Z', _, _, _)
+                | (b'_', Some(b'Z'), _, _)
+                | (b'_', Some(b'_'), Some(b'Z'), _) => return Some(i),
+                | (b'_', Some(b'_'), Some(b'_'), Some(b'Z')) => return Some(i),
+                _ => (),
             }
         }
     }

src/ast.rs

@@ -1296,12 +1296,21 @@ macro_rules! define_vocabulary {
 ///
 /// ```text
 /// <mangled-name> ::= _Z <encoding> [<clone-suffix>]*
+///                ::= ___Z <encoding> <block_invoke>
+///                ::= <type>
+///
+/// <block_invoke> ::= _block_invoke
+///                ::= _block_invoke<decimal-digit>+
+///                ::= _block_invoke_<decimal-digit>+
 /// ```
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum MangledName {
     /// The encoding of the mangled symbol name.
     Encoding(Encoding, Vec<CloneSuffix>),
 
+    /// The encoding of the mangled symbol name.
+    BlockInvoke(Encoding, Option<isize>),
+
     /// A top-level type. Technically not allowed by the standard, however in
     /// practice this can happen, and is tested for by libiberty.
     Type(TypeHandle),
@@ -1326,6 +1335,23 @@ impl Parse for MangledName {
             return Ok((MangledName::Encoding(encoding, clone_suffixes), tail));
         }
 
+        if let Ok(tail) = consume(b"___Z", input).or_else(|_| consume(b"____Z", input)) {
+            let (encoding, tail) = Encoding::parse(ctx, subs, tail)?;
+            let tail = consume(b"_block_invoke", tail)?;
+
+            let tail_opt = match consume(b"_", tail) {
+                Ok(tail) => Some(parse_number(10, false, tail)?),
+                Err(_) => parse_number(10, false, tail).ok(),
+            };
+
+            let (digits, tail) = match tail_opt {
+                Some((digits, tail)) => (Some(digits), tail),
+                None => (None, tail),
+            };
+
+            return Ok((MangledName::BlockInvoke(encoding, digits), tail));
+        }
+
         if let Ok(tail) = consume(b"_GLOBAL_", input) {
             let (global_ctor_dtor, tail) = GlobalCtorDtor::parse(ctx, subs, tail)?;
             return Ok((MangledName::GlobalCtorDtor(global_ctor_dtor), tail));
@@ -1359,6 +1385,11 @@ where
                 }
                 Ok(())
             },
+            MangledName::BlockInvoke(ref enc, _) => {
+                write!(ctx, "invocation function for block in ")?;
+                enc.demangle(ctx, scope)?;
+                Ok(())
+            }
             MangledName::Type(ref ty) => ty.demangle(ctx, scope),
             MangledName::GlobalCtorDtor(ref gcd) => gcd.demangle(ctx, scope),
         }

tests/tests.rs

@@ -506,3 +506,8 @@ demangles!(
     _ZNK1QssERKS_,
     "Q::operator<=>(Q const&) const"
 );
+// Taken from https://git.llvm.org/klaus/libcxxabi/commit/5dd173b3792e868a7ebfa699d156f24075eafc01.diff
+demangles!(
+    ___ZN19URLConnectionClient33_clientInterface_cancelConnectionEP16dispatch_queue_sU13block_pointerFvvE_block_invoke14,
+    "invocation function for block in URLConnectionClient::_clientInterface_cancelConnection(dispatch_queue_s*, void () block_pointer)"
+);