Changed CategoryPath location for build types

Author: astrelsky

src/main/java/ghidra/app/cmd/data/rtti/AbstractCppClassBuilder.java

@@ -6,6 +6,7 @@
 import java.util.stream.IntStream;
 
 import ghidra.app.cmd.data.rtti.gcc.ClassTypeInfoUtils;
+import ghidra.app.cmd.data.rtti.gcc.TypeInfoUtils;
 import ghidra.program.model.data.CategoryPath;
 import ghidra.program.model.data.DataType;
 import ghidra.program.model.data.DataTypeComponent;
@@ -25,10 +26,10 @@ public abstract class AbstractCppClassBuilder {
 
 	protected static final String SUPER = "super_";
 
-	private Program program;
+	private final Program program;
 	protected Structure struct;
-	private CategoryPath path;
-	private ClassTypeInfo type;
+	private final CategoryPath path;
+	private final ClassTypeInfo type;
 
 	private Map<CompositeDataTypeElementInfo, String> dtComps = Collections.emptyMap();
 
@@ -38,7 +39,7 @@ protected AbstractCppClassBuilder(ClassTypeInfo type) {
 		this.program = gc.getSymbol().getProgram();
 		this.struct = ClassTypeInfoUtils.getPlaceholderStruct(type, program.getDataTypeManager());
 		this.struct = resolveStruct(struct);
-		this.path = new CategoryPath(struct.getCategoryPath(), type.getName());
+		this.path = new CategoryPath(TypeInfoUtils.getCategoryPath(type), type.getName());
 	}
 
 	protected abstract AbstractCppClassBuilder getParentBuilder(ClassTypeInfo parent);
@@ -47,10 +48,6 @@ protected ClassTypeInfo getType() {
 		return type;
 	}
 
-	protected CategoryPath getPath() {
-		return path;
-	}
-
 	protected final Program getProgram() {
 		return program;
 	}

src/main/java/ghidra/app/cmd/data/rtti/gcc/ClassTypeInfoUtils.java

@@ -355,23 +355,10 @@ public static void sortByMostDerived(Program program, List<ClassTypeInfo> classe
 	 * @return the ClassTypeInfo's _vptr DataType
 	 */
 	public static DataType getVptrDataType(Program program, ClassTypeInfo type) {
-		return getVptrDataType(program, type, null);
-	}
-
-	/**
-	 * Gets the DataType representation of the _vptr for the specified ClassTypeInfo.
-	 * @param program the program containing the ClassTypeInfo
-	 * @param type the ClassTypeInfo
-	 * @param path The category path to place the datatype in.
-	 * @return the ClassTypeInfo's _vptr DataType
-	 */
-	public static DataType getVptrDataType(Program program, ClassTypeInfo type, CategoryPath path) {
 		try {
 			Vtable vtable = type.getVtable();
-			if (path == null) {
-				path = TypeInfoUtils.getDataTypePath(type).getCategoryPath();
-			}
-			path = new CategoryPath(path, type.getName());
+			CategoryPath path =
+				new CategoryPath(TypeInfoUtils.getCategoryPath(type), type.getName());
 			DataTypeManager dtm = program.getDataTypeManager();
 			Structure struct = new StructureDataType(path, VtableModel.SYMBOL_NAME, 0, dtm);
 			Function[][] functionTable = vtable.getFunctionTables();
@@ -406,6 +393,19 @@ public static DataType getVptrDataType(Program program, ClassTypeInfo type, Cate
 		}
 	}
 
+	/**
+	 * Gets the DataType representation of the _vptr for the specified ClassTypeInfo.
+	 * @param program the program containing the ClassTypeInfo
+	 * @param type the ClassTypeInfo
+	 * @param path The category path to place the datatype in.
+	 * @return the ClassTypeInfo's _vptr DataType
+	 * @deprecated the path parameter is now ignored
+	 */
+	@Deprecated(forRemoval=true)
+	public static DataType getVptrDataType(Program program, ClassTypeInfo type, CategoryPath path) {
+		return getVptrDataType(program, type);
+	}
+
 	public static Map<ClassTypeInfo, Integer> getBaseOffsets(ClassTypeInfo type) {
 		if (!type.hasParent()) {
 			return Collections.emptyMap();

src/main/java/ghidra/app/cmd/data/rtti/gcc/GccCppClassBuilder.java

@@ -30,7 +30,7 @@ protected void addVptr(Structure struct) {
 		if (!Vtable.isValid(getType().getVtable())) {
 			return;
 		}
-		DataType vptr = ClassTypeInfoUtils.getVptrDataType(getProgram(), getType(), getPath());
+		DataType vptr = ClassTypeInfoUtils.getVptrDataType(getProgram(), getType());
 		DataTypeComponent comp = struct.getComponentAt(0);
 		if (comp == null || isUndefined(comp.getDataType())) {
 			if (vptr != null) {