From 0debac8498967371e55bc8997096bb4ec9cb38e9 Mon Sep 17 00:00:00 2001
From: ghizard <50744617+ghizard@users.noreply.github.com>
Date: Mon, 22 Mar 2021 11:05:19 -0400
Subject: [PATCH] GP-790 Demangler constructor return undefined

---
 .../java/ghidra/app/util/demangler/DemangledFunction.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledFunction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledFunction.java
index 23af6041e9..cc0e591505 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledFunction.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledFunction.java
@@ -461,8 +461,12 @@ public class DemangledFunction extends DemangledObject {
 		// If returnType is null check for constructor or destructor names
 		if (THIS_CALL.equals(function.getCallingConventionName())) {
 			String n = getName();
-			if (n.equals("~" + namespace.getName()) || n.equals(namespace.getName())) {
-				// constructor && destructor
+			if (n.equals(namespace.getName())) {
+				// constructor
+				return DataType.DEFAULT;
+			}
+			if (n.equals("~" + namespace.getName())) {
+				// destructor
 				return VoidDataType.dataType;
 			}
 		}