Skip to content

Commit c8e5e72

Browse files
authored
Merge pull request #1323 from google/fix-1318
Fix badly named alloc function - fixes #1318
2 parents b9550bd + 2ef099d commit c8e5e72

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

engine/src/conversion/analysis/allocators.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ fn create_alloc_and_free(ty_name: QualifiedName) -> impl Iterator<Item = Api<Pod
101101
}
102102

103103
pub(crate) fn get_alloc_name(ty_name: &QualifiedName) -> QualifiedName {
104-
get_name(ty_name, "alloc")
104+
get_name(ty_name, "autocxx_alloc")
105105
}
106106

107107
pub(crate) fn get_free_name(ty_name: &QualifiedName) -> QualifiedName {
108-
get_name(ty_name, "free")
108+
get_name(ty_name, "autocxx_free")
109109
}
110110

111111
fn get_name(ty_name: &QualifiedName, label: &str) -> QualifiedName {

integration-tests/tests/integration_test.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12241,6 +12241,19 @@ fn test_ignore_va_list() {
1224112241
run_test("", hdr, rs, &["A"], &[]);
1224212242
}
1224312243

12244+
#[test]
12245+
fn test_badly_named_alloc() {
12246+
let hdr = indoc! {"
12247+
#include <stdarg.h>
12248+
class A {
12249+
public:
12250+
void alloc();
12251+
};
12252+
"};
12253+
let rs = quote! {};
12254+
run_test("", hdr, rs, &["A"], &[]);
12255+
}
12256+
1224412257
#[test]
1224512258
fn test_cpp_union_pod() {
1224612259
let hdr = indoc! {"

0 commit comments

Comments
 (0)