Remove implicit conversions from Confidence to underlying type, these can cause bugs and also issues with C++20

2 files changed, 6 insertions, 5 deletions

diff --git a/view/elf/elfview.cpp b/view/elf/elfview.cpp
index d8a0a112..b8dd1aaa 100644
--- a/view/elf/elfview.cpp
+++ b/view/elf/elfview.cpp
@@ -2396,7 +2396,8 @@ bool ElfView::Init()
 		);
 
 		/* create type, associate it with RTL_Resolve */
-		Ref<Type> ptr_type = Type::PointerType(m_arch, Type::VoidType())->WithConfidence(BN_FULL_CONFIDENCE);
+		Confidence<Ref<Type>> ptr_type =
+			Type::PointerType(m_arch, Type::VoidType())->WithConfidence(BN_FULL_CONFIDENCE);
 
 		Ref<CallingConvention> cc = m_arch->GetCallingConventionByName("linux-rtlresolve");
 
@@ -2452,20 +2453,20 @@ bool ElfView::Init()
 
 
 void ElfView::DefineElfSymbol(BNSymbolType type, const string& incomingName, uint64_t addr, bool gotEntry,
-	BNSymbolBinding binding, size_t size, Ref<Type> typeObj)
+	BNSymbolBinding binding, size_t size, const Confidence<Ref<Type>>& typeObj)
 {
 	// Ensure symbol is within the executable
 	if (type != ExternalSymbol && !IsValidOffset(addr))
 		return;
 
 	string name = incomingName;
-	Ref<Type> symbolTypeRef;
+	Confidence<Ref<Type>> symbolTypeRef;
 	if ((type == ExternalSymbol) || (type == ImportAddressSymbol) || (type == ImportedDataSymbol))
 	{
 		QualifiedName n(name);
 		Ref<TypeLibrary> lib = nullptr;
 		symbolTypeRef = ImportTypeLibraryObject(lib, n);
-		if (symbolTypeRef)
+		if (symbolTypeRef.GetValue())
 		{
 			m_logger->LogDebug("elf: type Library '%s' found hit for '%s'", lib->GetName().c_str(), name.c_str());
 			if (type != ExternalSymbol || addr != 0)
diff --git a/view/elf/elfview.h b/view/elf/elfview.h
index 23a5021a..a43716b7 100644
--- a/view/elf/elfview.h
+++ b/view/elf/elfview.h
@@ -518,7 +518,7 @@ namespace BinaryNinja
 		SymbolQueue* m_symbolQueue = nullptr;
 
 		void DefineElfSymbol(BNSymbolType type, const std::string& name, uint64_t addr, bool gotEntry,
-			BNSymbolBinding binding, size_t size=0, Ref<Type> typeObj=nullptr);
+			BNSymbolBinding binding, size_t size = 0, const Confidence<Ref<Type>>& typeObj = nullptr);
 
 		void ApplyTypesToParentStringTable(const Elf64SectionHeader& section, const bool offset = true);
 		void ApplyTypesToStringTable(const Elf64SectionHeader& section, const int64_t imageBaseAdjustment, const bool offset = true);