From 8fb1c8ce0528bef988bde70a593c55d2a07c6d66 Mon Sep 17 00:00:00 2001
From: ghidra007 <ghidra007@users.noreply.github.com>
Date: Tue, 15 Sep 2026 15:49:27 +0000
Subject: [PATCH] GP-0 fix for breaking RTTI test

---
 .../RTTIWindowsClassRecoverer.java            |  6 +++---
 .../classrecovery/RecoveredClassHelper.java   | 21 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIWindowsClassRecoverer.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIWindowsClassRecoverer.java
index 31e5776379..ab818f4ac1 100644
--- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIWindowsClassRecoverer.java
+++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RTTIWindowsClassRecoverer.java
@@ -236,9 +236,9 @@ public class RTTIWindowsClassRecoverer extends RTTIClassRecoverer {
 //	}
 //
 //	private void runRTTIAnalyzer() throws Exception {
-////		Analyzer analyzer = new RttiAnalyzer();
-////		analyzer.added(program, program.getAddressFactory().getAddressSet(), monitor,
-////			new MessageLog());
+	//// Analyzer analyzer = new RttiAnalyzer(); / analyzer.added(program,
+	/// program.getAddressFactory().getAddressSet(), monitor, /
+	/// new MessageLog());
 //	}
 //
 //	/**
diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java
index 80f25922cc..aebe32d811 100644
--- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java
+++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClassHelper.java
@@ -5698,8 +5698,27 @@ public class RecoveredClassHelper {
 					if (!areVftablesInSameClass(vftableReferenceList)) {
 						recoveredClass.addIndeterminateInline(indeterminateFunction);
 						indeterminateIterator.remove();
+						continue;
 					}
 				}
+				// Next try identifying non-constructor/destructor but contains inline 
+				// using decompiler return type
+				DataType decompilerReturnType =
+					decompilerUtils.getDecompilerReturnType(indeterminateFunction);
+
+				if (decompilerReturnType != null) {
+
+					String returnDataName = decompilerReturnType.getDisplayName();
+					if (returnDataName.contains("*") &&
+						!isFidFunction(indeterminateFunction)) {
+						continue;
+					}
+					if (returnDataName.equals("void")) {
+						continue;
+					}
+					recoveredClass.addIndeterminateInline(indeterminateFunction);
+					indeterminateIterator.remove();
+				}
 			}
 		}
 	}
@@ -6293,7 +6312,7 @@ public class RecoveredClassHelper {
 
 					// otherwise, use pcode info to figure out if inlined constructor or destructor
 					//If not already, make function a this call
-					makeFunctionThiscall(inlineFunction);
+					//	makeFunctionThiscall(inlineFunction);
 
 					List<OffsetPcodeOpPair> loads = getLoadPcodeOpPairs(inlineFunction);
 					List<OffsetPcodeOpPair> stores = getStorePcodeOpPairs(inlineFunction);