wip

Author: emesare

view/sharedcache/core/SharedCache.cpp

@@ -2981,12 +2981,10 @@ void SharedCache::FindSymbolAtAddrAndApplyToAddr(
 		if (auto symbol = m_dscView->GetSymbolByAddress(symbolLocation))
 		{
 			// A symbol already exists at the source location. Add a stub symbol at `targetLocation` based on the existing symbol.
-			auto id = m_dscView->BeginUndoActions();
 			if (m_dscView->GetAnalysisFunction(m_dscView->GetDefaultPlatform(), targetLocation))
-				m_dscView->DefineUserSymbol(new Symbol(FunctionSymbol, prefix + symbol->GetFullName(), targetLocation));
+				m_dscView->DefineAutoUserSymbol(new Symbol(FunctionSymbol, prefix + symbol->GetFullName(), targetLocation));
 			else
-				m_dscView->DefineUserSymbol(new Symbol(symbol->GetType(), prefix + symbol->GetFullName(), targetLocation));
-			m_dscView->ForgetUndoActions(id);
+				m_dscView->DefineAutoUserSymbol(new Symbol(symbol->GetType(), prefix + symbol->GetFullName(), targetLocation));
 			return;
 		}
 	}
@@ -3019,19 +3017,24 @@ void SharedCache::FindSymbolAtAddrAndApplyToAddr(
 	auto typeLib = TypeLibraryForImage(header->installName);
 	auto type = typeLib ? m_dscView->ImportTypeLibraryObject(typeLib, {symbol->GetFullName()}) : nullptr;
 
+	QualifiedName demangledName = {};
+	std::string shortName = symbol->GetShortName();
+	if (DemangleLLVM(shortName, demangledName, true))
+		shortName = demangledName.GetString();
+
 	if (auto func = m_dscView->GetAnalysisFunction(m_dscView->GetDefaultPlatform(), targetLocation))
 	{
-		m_dscView->DefineUserSymbol(
-			new Symbol(FunctionSymbol, prefix + symbol->GetFullName(), targetLocation));
+		m_dscView->DefineAutoUserSymbol(
+			new Symbol(FunctionSymbol, shortName, shortName, prefix + symbol->GetFullName(), targetLocation));
 		if (type)
 			func->SetUserType(type);
 		if (triggerReanalysis)
 			func->Reanalyze();
 	}
 	else
 	{
-		m_dscView->DefineUserSymbol(
-			new Symbol(symbol->GetType(), prefix + symbol->GetFullName(), targetLocation));
+		m_dscView->DefineAutoUserSymbol(
+			new Symbol(symbol->GetType(), shortName, shortName, prefix + symbol->GetFullName(), targetLocation));
 		if (type)
 			m_dscView->DefineUserDataVariable(targetLocation, type);
 	}

view/sharedcache/workflow/SharedCacheWorkflow.cpp

@@ -235,7 +235,7 @@ void SharedCacheWorkflow::FixupStubs(Ref<AnalysisContext> ctx)
 					if (auto symbol = bv->GetSymbolByAddress(dest.GetConstant()))
 					{
 						auto newSymbol = new Symbol(FunctionSymbol, "j_" + symbol->GetRawName(), func->GetStart());
-						bv->DefineUserSymbol(newSymbol);
+						bv->DefineAutoUserSymbol(newSymbol);
 					}
 				}
 			}