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

3 files changed, 13 insertions, 13 deletions

diff --git a/arch/arm64/arch_arm64.cpp b/arch/arm64/arch_arm64.cpp
index 1032c15c..b0e97995 100644
--- a/arch/arm64/arch_arm64.cpp
+++ b/arch/arm64/arch_arm64.cpp
@@ -2358,7 +2358,7 @@ class Arm64ImportedFunctionRecognizer : public FunctionRecognizer
 			DataVariable var;
 			if (data->GetDataVariableAtAddress(extSym.front()->GetAddress(), var))
 			{
-				func->ApplyImportedTypes(funcSym, var.type);
+				func->ApplyImportedTypes(funcSym, var.type.GetValue());
 			}
 			return true;
 		}
@@ -2431,12 +2431,12 @@ class Arm64ImportedFunctionRecognizer : public FunctionRecognizer
 			data->GetDataVariableAtAddress(loadAddrConstant.value, target);
 
 			Ref<Type> funcType = nullptr;
-			if (target.type && target.type->GetClass() == PointerTypeClass &&
-					target.type.GetConfidence() >= BN_MINIMUM_CONFIDENCE)
+			if (target.type.GetValue() && target.type->GetClass() == PointerTypeClass
+				&& target.type.GetConfidence() >= BN_MINIMUM_CONFIDENCE)
 			{
 				target.type = target.type->GetChildType();
-				if (target.type && target.type->GetClass() == FunctionTypeClass &&
-						target.type.GetConfidence() >= BN_MINIMUM_CONFIDENCE)
+				if (target.type.GetValue() && target.type->GetClass() == FunctionTypeClass
+					&& target.type.GetConfidence() >= BN_MINIMUM_CONFIDENCE)
 					funcType = target.type.GetValue();
 			}
 
@@ -2522,12 +2522,12 @@ class Arm64ImportedFunctionRecognizer : public FunctionRecognizer
 			data->GetDataVariableAtAddress(loadAddrConstant.value, target);
 
 			Ref<Type> funcType = nullptr;
-			if (target.type && target.type->GetClass() == PointerTypeClass &&
-					target.type.GetConfidence() >= BN_MINIMUM_CONFIDENCE)
+			if (target.type.GetValue() && target.type->GetClass() == PointerTypeClass
+				&& target.type.GetConfidence() >= BN_MINIMUM_CONFIDENCE)
 			{
 				target.type = target.type->GetChildType();
-				if (target.type && target.type->GetClass() == FunctionTypeClass &&
-						target.type.GetConfidence() >= BN_MINIMUM_CONFIDENCE)
+				if (target.type.GetValue() && target.type->GetClass() == FunctionTypeClass
+					&& target.type.GetConfidence() >= BN_MINIMUM_CONFIDENCE)
 					funcType = target.type.GetValue();
 			}
 
diff --git a/arch/armv7/arch_armv7.cpp b/arch/armv7/arch_armv7.cpp
index 5739a8bd..f27a3fb9 100644
--- a/arch/armv7/arch_armv7.cpp
+++ b/arch/armv7/arch_armv7.cpp
@@ -2231,7 +2231,7 @@ public:
 							return false;
 
 						Confidence<Ref<Type>> type = entryFunc->GetType();
-						data->DefineImportedFunction(sym, func, type);
+						data->DefineImportedFunction(sym, func, type.GetValue());
 						return true;
 					}
 				}
diff --git a/arch/mips/arch_mips.cpp b/arch/mips/arch_mips.cpp
index 0c788133..4cd8b26c 100644
--- a/arch/mips/arch_mips.cpp
+++ b/arch/mips/arch_mips.cpp
@@ -2726,7 +2726,7 @@ private:
 			DataVariable var;
 			if (data->GetDataVariableAtAddress(extSym.front()->GetAddress(), var))
 			{
-				func->ApplyImportedTypes(funcSym, var.type);
+				func->ApplyImportedTypes(funcSym, var.type.GetValue());
 			}
 			return true;
 		}
@@ -2799,7 +2799,7 @@ private:
 				DataVariable var;
 				if (data->GetDataVariableAtAddress(extSym.front()->GetAddress(), var))
 				{
-					func->ApplyImportedTypes(pltSym, var.type);
+					func->ApplyImportedTypes(pltSym, var.type.GetValue());
 				}
 				return true;
 			}
@@ -2924,7 +2924,7 @@ private:
 			DataVariable var;
 			if (data->GetDataVariableAtAddress(extSym.front()->GetAddress(), var))
 			{
-				func->ApplyImportedTypes(funcSym, var.type);
+				func->ApplyImportedTypes(funcSym, var.type.GetValue());
 			}
 			return true;
 		}