Snap for 7862349 from 4040043277d7f673b9c6c474f6e44593abf9a330 to t-keystone-qcom-release
Change-Id: I95786e1f107150fd4cb60883492d02e4354bd006
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
new file mode 100644
index 0000000..8ef633d
--- /dev/null
+++ b/.cargo_vcs_info.json
@@ -0,0 +1,5 @@
+{
+ "git": {
+ "sha1": "f540792067ab84d0f47164b29d7db5c7ba3b367d"
+ }
+}
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..4d8ed7e
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,97 @@
+// This file is generated by cargo2android.py --config cargo2android.json.
+// Do not modify this file as changes will be overridden on upgrade.
+
+
+
+package {
+ default_applicable_licenses: [
+ "external_rust_crates_rustc-demangle-capi_license",
+ ],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+// See: http://go/android-license-faq
+license {
+ name: "external_rust_crates_rustc-demangle-capi_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-MIT",
+ ],
+ license_text: [
+ "LICENSE-APACHE",
+ "LICENSE-MIT",
+ ],
+}
+
+rust_ffi_static {
+ name: "librustc_demangle_static",
+ stem: "librustc_demangle",
+ host_supported: true,
+ crate_name: "rustc_demangle",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.1.0",
+ srcs: ["src/lib.rs"],
+ edition: "2015",
+ rustlibs: [
+ "librustc_demangle",
+ ],
+ include_dirs: [
+ "include",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.runtime",
+ "com.android.art.debug",
+ "com.android.art",
+ ],
+ native_bridge_supported: true,
+ product_available: true,
+ recovery_available: true,
+ vendor_available: true,
+ vendor_ramdisk_available: true,
+ ramdisk_available: true,
+ min_sdk_version: "S",
+}
+
+rust_defaults {
+ name: "rustc-demangle-capi_test_defaults",
+ crate_name: "rustc_demangle",
+ srcs: ["src/lib.rs"],
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2015",
+ rustlibs: [
+ "librustc_demangle",
+ ],
+}
+
+rust_test_host {
+ name: "rustc-demangle-capi_host_test_src_lib",
+ defaults: ["rustc-demangle-capi_test_defaults"],
+ test_options: {
+ unit_test: true,
+ },
+}
+
+rust_test {
+ name: "rustc-demangle-capi_device_test_src_lib",
+ defaults: ["rustc-demangle-capi_test_defaults"],
+}
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..9ab660e
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,25 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "rustc-demangle-capi"
+version = "0.1.0"
+authors = ["Torste Aikio <zokier@gmail.com>"]
+description = "C API for the `rustc-demangle` crate\n"
+license = "MIT/Apache-2.0"
+repository = "https://github.com/alexcrichton/rustc-demangle"
+
+[lib]
+name = "rustc_demangle"
+crate-type = ["staticlib"]
+[dependencies.rustc-demangle]
+version = "0.1.16"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
new file mode 100644
index 0000000..a59a768
--- /dev/null
+++ b/Cargo.toml.orig
@@ -0,0 +1,16 @@
+[package]
+name = "rustc-demangle-capi"
+version = "0.1.0"
+authors = ["Torste Aikio <zokier@gmail.com>"]
+description = """
+C API for the `rustc-demangle` crate
+"""
+license = "MIT/Apache-2.0"
+repository = "https://github.com/alexcrichton/rustc-demangle"
+
+[lib]
+name = "rustc_demangle"
+crate-type = ["staticlib", "cdylib"]
+
+[dependencies]
+rustc-demangle = { version = "0.1.16", path = "../.." }
diff --git a/LICENSE b/LICENSE
new file mode 120000
index 0000000..6b579aa
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1 @@
+LICENSE-APACHE
\ No newline at end of file
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
new file mode 100644
index 0000000..16fe87b
--- /dev/null
+++ b/LICENSE-APACHE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/LICENSE-MIT b/LICENSE-MIT
new file mode 100644
index 0000000..39e0ed6
--- /dev/null
+++ b/LICENSE-MIT
@@ -0,0 +1,25 @@
+Copyright (c) 2014 Alex Crichton
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..62d8c92
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,20 @@
+name: "rustc-demangle-capi"
+description: "C API for the `rustc-demangle` crate"
+third_party {
+ url {
+ type: HOMEPAGE
+ value: "https://crates.io/crates/rustc-demangle-capi"
+ }
+ url {
+ type: ARCHIVE
+ value: "https://static.crates.io/crates/rustc-demangle-capi/rustc-demangle-capi-0.1.0.crate"
+ }
+ version: "0.1.0"
+ # Dual-licensed, using the least restrictive per go/thirdpartylicenses#same.
+ license_type: NOTICE
+ last_upgrade_date {
+ year: 2021
+ month: 8
+ day: 17
+ }
+}
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_APACHE2
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..45dc4dd
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1 @@
+include platform/prebuilts/rust:master:/OWNERS
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..0ffad29
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,8 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+ "presubmit": [
+ {
+ "name": "rustc-demangle-capi_device_test_src_lib"
+ }
+ ]
+}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..2353fe7
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,21 @@
+{
+ "run": true,
+ "exported_c_header_dir": [
+ "include"
+ ],
+ "native_bridge_supported": true,
+ "product_available": true,
+ "recovery_available": true,
+ "vendor_available": true,
+ "vendor_ramdisk_available": true,
+ "ramdisk_available": true,
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.runtime",
+ "com.android.art.debug",
+ "com.android.art"
+ ],
+ "min_sdk_version": "S",
+ "device": true,
+ "tests": true
+}
diff --git a/include/rustc_demangle.h b/include/rustc_demangle.h
new file mode 100644
index 0000000..e7ee2ca
--- /dev/null
+++ b/include/rustc_demangle.h
@@ -0,0 +1,17 @@
+#ifndef RUST_DEMANGLE_H_
+#define RUST_DEMANGLE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// For size_t
+#include <stddef.h>
+
+char *rustc_demangle(const char *mangled, char *out, size_t *len, int *status);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // RUSTC_DEMANGLE_H_
diff --git a/patches/0001-Suppress-cdylib-build.patch b/patches/0001-Suppress-cdylib-build.patch
new file mode 100644
index 0000000..2524040
--- /dev/null
+++ b/patches/0001-Suppress-cdylib-build.patch
@@ -0,0 +1,30 @@
+From 8106a52ecca371216903fb7b5077409ee1d31ee0 Mon Sep 17 00:00:00 2001
+From: Matthew Maurer <mmaurer@google.com>
+Date: Mon, 16 Aug 2021 14:05:54 -0700
+Subject: [PATCH] Suppress cdylib build
+
+Currently, cdylibs aren't allowed in certain contexts until support for
+vendor snapshots is added. Since rustc-demangle-capi is needed in those
+environments, we prevent cdylib from being generated during the
+cargo2android scan.
+
+Change-Id: I1deb453a8095bc69f963e765b28333752ec483ff
+---
+ Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 5828d25..9ab660e 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -20,6 +20,6 @@ repository = "https://github.com/alexcrichton/rustc-demangle"
+
+ [lib]
+ name = "rustc_demangle"
+-crate-type = ["staticlib", "cdylib"]
++crate-type = ["staticlib"]
+ [dependencies.rustc-demangle]
+ version = "0.1.16"
+--
+2.33.0.rc1.237.g0d66db33f3-goog
+
diff --git a/patches/0002-Adjust-API-to-match-__cxa_demangle.patch b/patches/0002-Adjust-API-to-match-__cxa_demangle.patch
new file mode 100644
index 0000000..b54d49a
--- /dev/null
+++ b/patches/0002-Adjust-API-to-match-__cxa_demangle.patch
@@ -0,0 +1,435 @@
+From 290b3379f60c0578174861c6ac8fb93f1ce83a3f Mon Sep 17 00:00:00 2001
+From: Matthew Maurer <mmaurer@google.com>
+Date: Tue, 17 Aug 2021 10:50:56 -0700
+Subject: [PATCH] Adjust API to match __cxa_demangle
+
+Bug: 178565008
+Test: cargo test + generate tombstone
+Change-Id: Iaf76af67a7f3a6323e926075a8ecd08b1d381db0
+---
+ include/rustc_demangle.h | 9 +-
+ src/lib.rs | 339 +++++++++++++++++++++++++++------------
+ 2 files changed, 238 insertions(+), 110 deletions(-)
+
+diff --git a/include/rustc_demangle.h b/include/rustc_demangle.h
+index 61c4aa1..e7ee2ca 100644
+--- a/include/rustc_demangle.h
++++ b/include/rustc_demangle.h
+@@ -5,11 +5,10 @@
+ extern "C" {
+ #endif
+
+-// Demangles symbol given in `mangled` argument into `out` buffer
+-//
+-// Returns 0 if `mangled` is not Rust symbol or if `out` buffer is too small
+-// Returns 1 otherwise
+-int rustc_demangle(const char *mangled, char *out, size_t out_size);
++// For size_t
++#include <stddef.h>
++
++char *rustc_demangle(const char *mangled, char *out, size_t *len, int *status);
+
+ #ifdef __cplusplus
+ }
+diff --git a/src/lib.rs b/src/lib.rs
+index 51e3103..7610145 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -1,160 +1,289 @@
+ extern crate rustc_demangle;
+
++use std::alloc::{GlobalAlloc, Layout, System};
+ use std::io::Write;
+ use std::os::raw::{c_char, c_int};
++use std::ptr;
++use std::result;
++
++type Result<T> = result::Result<T, Status>;
++
++/// Convenience function to set return status if a location was provided.
++unsafe fn set_status(status: *mut c_int, val: c_int) {
++ if !status.is_null() {
++ *status = val;
++ }
++}
++
++/// Region from the system allocator for demangler output. We use the
++/// system allocator because the intended client is C/C++ code which
++/// may not be using the Rust allocator.
++struct SystemBuffer {
++ buf: *mut u8,
++ size: usize,
++ size_out: *mut usize,
++}
++
++impl SystemBuffer {
++ const DEFAULT_BUFFER_SIZE: usize = 1024;
++ fn new(size: usize) -> Result<Self> {
++ let buf = unsafe { System.alloc_zeroed(Layout::from_size_align_unchecked(size, 1)) };
++ if buf.is_null() {
++ Err(Status::AllocFailure)
++ } else {
++ Ok(Self {
++ buf,
++ size,
++ size_out: ptr::null_mut(),
++ })
++ }
++ }
++ /// Safety: If buf is non-null, size must be non-null and point to the
++ /// non-zero size of the buffer provided in buf.
++ /// Takes ownership of the buffer passed in (and may reallocate it).
++ /// size must outlive the resulting buffer if non-null.
++ unsafe fn from_raw(buf: *mut c_char, size: *mut usize) -> Result<Self> {
++ if buf.is_null() {
++ if !size.is_null() {
++ *size = Self::DEFAULT_BUFFER_SIZE;
++ }
++ let fresh = Self::new(Self::DEFAULT_BUFFER_SIZE)?;
++ Ok(Self {
++ size_out: size,
++ ..fresh
++ })
++ } else {
++ Ok(Self {
++ buf: buf as *mut u8,
++ size: *size,
++ size_out: size,
++ })
++ }
++ }
++ fn as_mut_slice(&mut self) -> &mut [u8] {
++ unsafe { std::slice::from_raw_parts_mut(self.buf, self.size) }
++ }
++ fn resize(&mut self) -> Result<()> {
++ let new_size = self.size * 2;
++ let new_buf = unsafe {
++ System.realloc(
++ self.buf,
++ Layout::from_size_align_unchecked(self.size, 1),
++ new_size,
++ )
++ };
++ if new_buf.is_null() {
++ Err(Status::AllocFailure)
++ } else {
++ self.buf = new_buf;
++ self.size = new_size;
++ if !self.size_out.is_null() {
++ unsafe {
++ *self.size_out = new_size;
++ }
++ }
++ Ok(())
++ }
++ }
++}
+
+ /// C-style interface for demangling.
+-/// Demangles symbol given in `mangled` argument into `out` buffer
++/// Demangles symbol given in `mangled` argument into `out` buffer.
++///
++/// This interface is a drop-in replacement for `__cxa_demangle`, but for
++/// Rust demangling.
++///
++/// If `out` is null, a buffer will be allocated using the system allocator
++/// to contain the results.
++/// If `out` is non-null, `out_size` must be a pointer to the current size
++/// of the buffer, and `out` must come from the system allocator.
++/// If `out_size` is non-null, the size of the output buffer will be written
++/// to it.
++///
++/// If `status` is non-null, it will be set to one of the following values:
++/// * 0: Demangling succeeded
++/// * -1: Allocation failure
++/// * -2: Name did not demangle
++/// * -3: Invalid arguments
++///
++/// Returns null if `mangled` is not Rust symbol or demangling failed.
++/// Returns the buffer containing the demangled symbol name otherwise.
+ ///
+ /// Unsafe as it handles buffers by raw pointers.
+ ///
+-/// Returns 0 if `mangled` is not Rust symbol or if `out` buffer is too small
+-/// Returns 1 otherwise
++/// For non-null `out`, `out_size` represents a slight deviation from the
++/// `__cxa_demangle` behavior. For `__cxa_demangle`, the buffer must be at
++/// *least* the provided size. For `rustc_demangle`, it must be the exact
++/// buffer size because it is used in the reconstruction of the `Layout`
++/// for use with `::realloc`.
+ #[no_mangle]
+ pub unsafe extern "C" fn rustc_demangle(
+ mangled: *const c_char,
+ out: *mut c_char,
+- out_size: usize,
+-) -> c_int {
++ out_size: *mut usize,
++ status: *mut c_int,
++) -> *mut c_char {
++ match rustc_demangle_native(mangled, out, out_size) {
++ Ok(demangled) => {
++ set_status(status, 0);
++ demangled
++ }
++ Err(e) => {
++ set_status(status, e as c_int);
++ ptr::null_mut()
++ }
++ }
++}
++
++enum Status {
++ AllocFailure = -1,
++ DemangleFailure = -2,
++ InvalidArgs = -3,
++}
++
++unsafe fn rustc_demangle_native(
++ mangled: *const c_char,
++ out: *mut c_char,
++ out_size: *mut usize,
++) -> Result<*mut c_char> {
++ if mangled.is_null() {
++ return Err(Status::InvalidArgs);
++ }
+ let mangled_str = match std::ffi::CStr::from_ptr(mangled).to_str() {
+ Ok(s) => s,
+- Err(_) => return 0,
++ Err(_) => return Err(Status::InvalidArgs),
+ };
++
++ if !out.is_null() {
++ if out_size.is_null() {
++ return Err(Status::InvalidArgs);
++ }
++ if *out_size == 0 {
++ return Err(Status::InvalidArgs);
++ }
++ }
++
++ let mut out_buf = SystemBuffer::from_raw(out, out_size)?;
++
+ match rustc_demangle::try_demangle(mangled_str) {
+ Ok(demangle) => {
+- let mut out_slice = std::slice::from_raw_parts_mut(out as *mut u8, out_size);
+- match write!(out_slice, "{:#}\0", demangle) {
+- Ok(_) => return 1,
+- Err(_) => return 0,
++ while write!(out_buf.as_mut_slice(), "{:#}\0", demangle).is_err() {
++ out_buf.resize()?;
+ }
++ Ok(out_buf.as_mut_slice().as_mut_ptr() as *mut c_char)
+ }
+- Err(_) => return 0,
++ Err(_) => Err(Status::DemangleFailure),
+ }
+ }
+
+ #[cfg(test)]
+ mod tests {
+- use std;
+- use std::os::raw::c_char;
++ use std::alloc::{GlobalAlloc, Layout, System};
++ use std::os::raw::{c_char, c_int};
++ use std::ptr;
++
++ struct DemangleResult {
++ out_buf: *mut u8,
++ out_size: usize,
++ status: c_int,
++ }
++
++ impl Drop for DemangleResult {
++ fn drop(&mut self) {
++ if !self.out_buf.is_null() {
++ unsafe {
++ System.dealloc(
++ self.out_buf,
++ Layout::from_size_align_unchecked(self.out_size, 1),
++ );
++ }
++ }
++ }
++ }
++
++ impl DemangleResult {
++ fn as_slice(&self) -> &[u8] {
++ unsafe { std::slice::from_raw_parts(self.out_buf, self.out_size) }
++ }
++ }
++
++ fn demangle(mangled: &str, alloc_size: usize) -> DemangleResult {
++ unsafe { raw_demangle(mangled.as_ptr() as *const c_char, alloc_size) }
++ }
++
++ unsafe fn raw_demangle(mangled: *const c_char, alloc_size: usize) -> DemangleResult {
++ let mut out_size: usize = alloc_size;
++ let mut status: c_int = 0;
++ let out_buf: *mut c_char = if out_size != 0 {
++ System.alloc(Layout::from_size_align_unchecked(out_size, 1)) as *mut c_char
++ } else {
++ ptr::null_mut()
++ };
++ ptr::write_bytes(out_buf, '*' as u8, out_size);
++
++ let res = super::rustc_demangle(mangled, out_buf, &mut out_size, &mut status);
++ DemangleResult {
++ out_buf: res as *mut u8,
++ out_size,
++ status,
++ }
++ }
++
+ #[test]
+ fn demangle_c_str_large() {
+- let mangled = "_ZN4testE\0";
+- let mut out_buf: Vec<u8> = vec![42; 8];
+- let res = unsafe {
+- super::rustc_demangle(
+- mangled.as_ptr() as *const c_char,
+- out_buf.as_mut_ptr() as *mut c_char,
+- 8,
+- )
+- };
+- assert_eq!(res, 1);
+- let out_str = std::str::from_utf8(&out_buf[..5]).unwrap();
++ let res = demangle("_ZN4testE\0", 8);
++ assert_eq!(res.status, 0);
++ let out_str = core::str::from_utf8(&res.as_slice()[..5]).unwrap();
+ assert_eq!(out_str, "test\0");
+ }
+
+ #[test]
+ fn demangle_c_str_exact() {
+- let mangled = "_ZN4testE\0";
+- let mut out_buf: Vec<u8> = vec![42; 8];
+- let res = unsafe {
+- super::rustc_demangle(
+- mangled.as_ptr() as *const c_char,
+- out_buf.as_mut_ptr() as *mut c_char,
+- 5,
+- )
+- };
+- assert_eq!(res, 1);
+- let out_str = std::str::from_utf8(&out_buf).unwrap();
++ let res = demangle("_ZN4testE\0", 8);
++ assert_eq!(res.status, 0);
++ // No reallocation necessary, so our * fill should be present
++ let out_str = core::str::from_utf8(res.as_slice()).unwrap();
+ assert_eq!(out_str, "test\0***");
+ }
+
+ #[test]
+ fn demangle_c_str_small() {
+- let mangled = "_ZN4testE\0";
+- let mut out_buf: Vec<u8> = vec![42; 8];
+- let res = unsafe {
+- super::rustc_demangle(
+- mangled.as_ptr() as *const c_char,
+- out_buf.as_mut_ptr() as *mut c_char,
+- 4,
+- )
+- };
+- assert_eq!(res, 0);
+- let out_str = std::str::from_utf8(&out_buf[4..]).unwrap();
+- assert_eq!(out_str, "****");
+- }
+-
+- #[test]
+- fn demangle_c_str_smaller() {
+- let mangled = "_ZN4testE\0";
+- let mut out_buf: Vec<u8> = vec![42; 8];
+- let res = unsafe {
+- super::rustc_demangle(
+- mangled.as_ptr() as *const c_char,
+- out_buf.as_mut_ptr() as *mut c_char,
+- 3,
+- )
+- };
+- assert_eq!(res, 0);
+- let out_str = std::str::from_utf8(&out_buf[3..]).unwrap();
+- assert_eq!(out_str, "*****");
++ let res = demangle("_ZN4testE\0", 4);
++ assert_eq!(res.status, 0);
++ // demangle should have realloced
++ assert_ne!(res.out_size, 4);
++ // Only check the start, since the reallocation means our * fill may
++ // be absent.
++ let out_str = core::str::from_utf8(&res.as_slice()[..5]).unwrap();
++ assert_eq!(out_str, "test\0");
+ }
+
+ #[test]
+- fn demangle_c_str_zero() {
+- let mangled = "_ZN4testE\0";
+- let mut out_buf: Vec<u8> = vec![42; 8];
+- let res = unsafe {
+- super::rustc_demangle(
+- mangled.as_ptr() as *const c_char,
+- out_buf.as_mut_ptr() as *mut c_char,
+- 0,
+- )
+- };
+- assert_eq!(res, 0);
+- let out_str = std::str::from_utf8(&out_buf).unwrap();
+- assert_eq!(out_str, "********");
++ fn demangle_c_str_alloc() {
++ let res = demangle("_ZN4testE\0", 0);
++ assert_eq!(res.status, 0);
++ // demangle should have allocated
++ assert_ne!(res.out_size, 0);
++ let out_str = core::str::from_utf8(&res.as_slice()[..5]).unwrap();
++ assert_eq!(out_str, "test\0");
+ }
+
+ #[test]
+ fn demangle_c_str_not_rust_symbol() {
+- let mangled = "la la la\0";
+- let mut out_buf: Vec<u8> = vec![42; 8];
+- let res = unsafe {
+- super::rustc_demangle(
+- mangled.as_ptr() as *const c_char,
+- out_buf.as_mut_ptr() as *mut c_char,
+- 8,
+- )
+- };
+- assert_eq!(res, 0);
++ let res = demangle("la la la\0", 8);
++ assert_eq!(res.status, -2);
+ }
+
+ #[test]
+ fn demangle_c_str_null() {
+- let mangled = "\0";
+- let mut out_buf: Vec<u8> = vec![42; 8];
+- let res = unsafe {
+- super::rustc_demangle(
+- mangled.as_ptr() as *const c_char,
+- out_buf.as_mut_ptr() as *mut c_char,
+- 8,
+- )
+- };
+- assert_eq!(res, 0);
++ let res = demangle("\0", 8);
++ assert_eq!(res.status, -2);
+ }
+
+ #[test]
+ fn demangle_c_str_invalid_utf8() {
+ let mangled = [116, 101, 115, 116, 165, 0];
+- let mut out_buf: Vec<u8> = vec![42; 8];
+- let res = unsafe {
+- super::rustc_demangle(
+- mangled.as_ptr() as *const c_char,
+- out_buf.as_mut_ptr() as *mut c_char,
+- 8,
+- )
+- };
+- assert_eq!(res, 0);
++ let res = unsafe { raw_demangle(mangled.as_ptr() as *const c_char, 8) };
++ assert_eq!(res.status, -2);
+ }
+ }
+--
+2.33.0.rc1.237.g0d66db33f3-goog
+
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000..7610145
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,289 @@
+extern crate rustc_demangle;
+
+use std::alloc::{GlobalAlloc, Layout, System};
+use std::io::Write;
+use std::os::raw::{c_char, c_int};
+use std::ptr;
+use std::result;
+
+type Result<T> = result::Result<T, Status>;
+
+/// Convenience function to set return status if a location was provided.
+unsafe fn set_status(status: *mut c_int, val: c_int) {
+ if !status.is_null() {
+ *status = val;
+ }
+}
+
+/// Region from the system allocator for demangler output. We use the
+/// system allocator because the intended client is C/C++ code which
+/// may not be using the Rust allocator.
+struct SystemBuffer {
+ buf: *mut u8,
+ size: usize,
+ size_out: *mut usize,
+}
+
+impl SystemBuffer {
+ const DEFAULT_BUFFER_SIZE: usize = 1024;
+ fn new(size: usize) -> Result<Self> {
+ let buf = unsafe { System.alloc_zeroed(Layout::from_size_align_unchecked(size, 1)) };
+ if buf.is_null() {
+ Err(Status::AllocFailure)
+ } else {
+ Ok(Self {
+ buf,
+ size,
+ size_out: ptr::null_mut(),
+ })
+ }
+ }
+ /// Safety: If buf is non-null, size must be non-null and point to the
+ /// non-zero size of the buffer provided in buf.
+ /// Takes ownership of the buffer passed in (and may reallocate it).
+ /// size must outlive the resulting buffer if non-null.
+ unsafe fn from_raw(buf: *mut c_char, size: *mut usize) -> Result<Self> {
+ if buf.is_null() {
+ if !size.is_null() {
+ *size = Self::DEFAULT_BUFFER_SIZE;
+ }
+ let fresh = Self::new(Self::DEFAULT_BUFFER_SIZE)?;
+ Ok(Self {
+ size_out: size,
+ ..fresh
+ })
+ } else {
+ Ok(Self {
+ buf: buf as *mut u8,
+ size: *size,
+ size_out: size,
+ })
+ }
+ }
+ fn as_mut_slice(&mut self) -> &mut [u8] {
+ unsafe { std::slice::from_raw_parts_mut(self.buf, self.size) }
+ }
+ fn resize(&mut self) -> Result<()> {
+ let new_size = self.size * 2;
+ let new_buf = unsafe {
+ System.realloc(
+ self.buf,
+ Layout::from_size_align_unchecked(self.size, 1),
+ new_size,
+ )
+ };
+ if new_buf.is_null() {
+ Err(Status::AllocFailure)
+ } else {
+ self.buf = new_buf;
+ self.size = new_size;
+ if !self.size_out.is_null() {
+ unsafe {
+ *self.size_out = new_size;
+ }
+ }
+ Ok(())
+ }
+ }
+}
+
+/// C-style interface for demangling.
+/// Demangles symbol given in `mangled` argument into `out` buffer.
+///
+/// This interface is a drop-in replacement for `__cxa_demangle`, but for
+/// Rust demangling.
+///
+/// If `out` is null, a buffer will be allocated using the system allocator
+/// to contain the results.
+/// If `out` is non-null, `out_size` must be a pointer to the current size
+/// of the buffer, and `out` must come from the system allocator.
+/// If `out_size` is non-null, the size of the output buffer will be written
+/// to it.
+///
+/// If `status` is non-null, it will be set to one of the following values:
+/// * 0: Demangling succeeded
+/// * -1: Allocation failure
+/// * -2: Name did not demangle
+/// * -3: Invalid arguments
+///
+/// Returns null if `mangled` is not Rust symbol or demangling failed.
+/// Returns the buffer containing the demangled symbol name otherwise.
+///
+/// Unsafe as it handles buffers by raw pointers.
+///
+/// For non-null `out`, `out_size` represents a slight deviation from the
+/// `__cxa_demangle` behavior. For `__cxa_demangle`, the buffer must be at
+/// *least* the provided size. For `rustc_demangle`, it must be the exact
+/// buffer size because it is used in the reconstruction of the `Layout`
+/// for use with `::realloc`.
+#[no_mangle]
+pub unsafe extern "C" fn rustc_demangle(
+ mangled: *const c_char,
+ out: *mut c_char,
+ out_size: *mut usize,
+ status: *mut c_int,
+) -> *mut c_char {
+ match rustc_demangle_native(mangled, out, out_size) {
+ Ok(demangled) => {
+ set_status(status, 0);
+ demangled
+ }
+ Err(e) => {
+ set_status(status, e as c_int);
+ ptr::null_mut()
+ }
+ }
+}
+
+enum Status {
+ AllocFailure = -1,
+ DemangleFailure = -2,
+ InvalidArgs = -3,
+}
+
+unsafe fn rustc_demangle_native(
+ mangled: *const c_char,
+ out: *mut c_char,
+ out_size: *mut usize,
+) -> Result<*mut c_char> {
+ if mangled.is_null() {
+ return Err(Status::InvalidArgs);
+ }
+ let mangled_str = match std::ffi::CStr::from_ptr(mangled).to_str() {
+ Ok(s) => s,
+ Err(_) => return Err(Status::InvalidArgs),
+ };
+
+ if !out.is_null() {
+ if out_size.is_null() {
+ return Err(Status::InvalidArgs);
+ }
+ if *out_size == 0 {
+ return Err(Status::InvalidArgs);
+ }
+ }
+
+ let mut out_buf = SystemBuffer::from_raw(out, out_size)?;
+
+ match rustc_demangle::try_demangle(mangled_str) {
+ Ok(demangle) => {
+ while write!(out_buf.as_mut_slice(), "{:#}\0", demangle).is_err() {
+ out_buf.resize()?;
+ }
+ Ok(out_buf.as_mut_slice().as_mut_ptr() as *mut c_char)
+ }
+ Err(_) => Err(Status::DemangleFailure),
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use std::alloc::{GlobalAlloc, Layout, System};
+ use std::os::raw::{c_char, c_int};
+ use std::ptr;
+
+ struct DemangleResult {
+ out_buf: *mut u8,
+ out_size: usize,
+ status: c_int,
+ }
+
+ impl Drop for DemangleResult {
+ fn drop(&mut self) {
+ if !self.out_buf.is_null() {
+ unsafe {
+ System.dealloc(
+ self.out_buf,
+ Layout::from_size_align_unchecked(self.out_size, 1),
+ );
+ }
+ }
+ }
+ }
+
+ impl DemangleResult {
+ fn as_slice(&self) -> &[u8] {
+ unsafe { std::slice::from_raw_parts(self.out_buf, self.out_size) }
+ }
+ }
+
+ fn demangle(mangled: &str, alloc_size: usize) -> DemangleResult {
+ unsafe { raw_demangle(mangled.as_ptr() as *const c_char, alloc_size) }
+ }
+
+ unsafe fn raw_demangle(mangled: *const c_char, alloc_size: usize) -> DemangleResult {
+ let mut out_size: usize = alloc_size;
+ let mut status: c_int = 0;
+ let out_buf: *mut c_char = if out_size != 0 {
+ System.alloc(Layout::from_size_align_unchecked(out_size, 1)) as *mut c_char
+ } else {
+ ptr::null_mut()
+ };
+ ptr::write_bytes(out_buf, '*' as u8, out_size);
+
+ let res = super::rustc_demangle(mangled, out_buf, &mut out_size, &mut status);
+ DemangleResult {
+ out_buf: res as *mut u8,
+ out_size,
+ status,
+ }
+ }
+
+ #[test]
+ fn demangle_c_str_large() {
+ let res = demangle("_ZN4testE\0", 8);
+ assert_eq!(res.status, 0);
+ let out_str = core::str::from_utf8(&res.as_slice()[..5]).unwrap();
+ assert_eq!(out_str, "test\0");
+ }
+
+ #[test]
+ fn demangle_c_str_exact() {
+ let res = demangle("_ZN4testE\0", 8);
+ assert_eq!(res.status, 0);
+ // No reallocation necessary, so our * fill should be present
+ let out_str = core::str::from_utf8(res.as_slice()).unwrap();
+ assert_eq!(out_str, "test\0***");
+ }
+
+ #[test]
+ fn demangle_c_str_small() {
+ let res = demangle("_ZN4testE\0", 4);
+ assert_eq!(res.status, 0);
+ // demangle should have realloced
+ assert_ne!(res.out_size, 4);
+ // Only check the start, since the reallocation means our * fill may
+ // be absent.
+ let out_str = core::str::from_utf8(&res.as_slice()[..5]).unwrap();
+ assert_eq!(out_str, "test\0");
+ }
+
+ #[test]
+ fn demangle_c_str_alloc() {
+ let res = demangle("_ZN4testE\0", 0);
+ assert_eq!(res.status, 0);
+ // demangle should have allocated
+ assert_ne!(res.out_size, 0);
+ let out_str = core::str::from_utf8(&res.as_slice()[..5]).unwrap();
+ assert_eq!(out_str, "test\0");
+ }
+
+ #[test]
+ fn demangle_c_str_not_rust_symbol() {
+ let res = demangle("la la la\0", 8);
+ assert_eq!(res.status, -2);
+ }
+
+ #[test]
+ fn demangle_c_str_null() {
+ let res = demangle("\0", 8);
+ assert_eq!(res.status, -2);
+ }
+
+ #[test]
+ fn demangle_c_str_invalid_utf8() {
+ let mangled = [116, 101, 115, 116, 165, 0];
+ let res = unsafe { raw_demangle(mangled.as_ptr() as *const c_char, 8) };
+ assert_eq!(res.status, -2);
+ }
+}