From 1b135ac9d41053326dd5da74d31716f90008f89f Mon Sep 17 00:00:00 2001 From: Rusty Wagner Date: Wed, 14 May 2025 18:06:42 -0600 Subject: Fix demangler for internal core type changes --- demangler/msvc/demangle_msvc.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/demangler/msvc/demangle_msvc.cpp b/demangler/msvc/demangle_msvc.cpp index 4888887a..9966db38 100644 --- a/demangler/msvc/demangle_msvc.cpp +++ b/demangler/msvc/demangle_msvc.cpp @@ -1616,7 +1616,12 @@ TypeBuilder Demangle::DemangleFunction(BNNameType classFunctionType, bool pointe params.pop_back(); // TODO: fix calling convention - TypeBuilder newType = TypeBuilder::FunctionType(shouldHaveReturnType ? returnType.Finalize() : Type::VoidType(), nullptr, params); + Ref returnTypeObj; + if (shouldHaveReturnType) + returnTypeObj = returnType.Finalize(); + else + returnTypeObj = Type::VoidType(); + TypeBuilder newType = TypeBuilder::FunctionType(returnTypeObj, nullptr, params); newType.SetConst(_const); newType.SetVolatile(_volatile); newType.SetPointerSuffix(suffix); -- cgit v1.3.1