Expose AnalysisContext::GetLiftedILFunction properly

It was already grabbing the Lifted IL through the function object, which may not be the most up to date

Author: CouleeApps

binaryninjaapi.h

@@ -10028,6 +10028,12 @@ namespace BinaryNinja {
 		*/
 		Ref<Function> GetFunction();
 
+		/*! Get the lifted IL function for the current AnalysisContext
+
+			\return The Lifted IL LowLevelILFunction for the current context
+		*/
+		Ref<LowLevelILFunction> GetLiftedILFunction();
+
 		/*! Get the low level IL function for the current AnalysisContext
 
 			\return The LowLevelILFunction for the current context

binaryninjacore.h

@@ -5485,6 +5485,7 @@ extern "C"
 	BINARYNINJACOREAPI void BNFreeAnalysisContext(BNAnalysisContext* analysisContext);
 	BINARYNINJACOREAPI BNBinaryView* BNAnalysisContextGetBinaryView(BNAnalysisContext* analysisContext);
 	BINARYNINJACOREAPI BNFunction* BNAnalysisContextGetFunction(BNAnalysisContext* analysisContext);
+	BINARYNINJACOREAPI BNLowLevelILFunction* BNAnalysisContextGetLiftedILFunction(BNAnalysisContext* analysisContext);
 	BINARYNINJACOREAPI BNLowLevelILFunction* BNAnalysisContextGetLowLevelILFunction(BNAnalysisContext* analysisContext);
 	BINARYNINJACOREAPI BNMediumLevelILFunction* BNAnalysisContextGetMediumLevelILFunction(
 	    BNAnalysisContext* analysisContext);

python/workflow.py

@@ -53,7 +53,7 @@ def __init__(self, handle: core.BNAnalysisContextHandle):
 		self.handle = handle
 
 	@property
-	def view(self) -> 'binaryview.BinaryView':
+	def view(self) -> Optional['binaryview.BinaryView']:
 		"""
 		BinaryView for the current AnalysisContext (writable)
 		"""
@@ -63,7 +63,7 @@ def view(self) -> 'binaryview.BinaryView':
 		return binaryview.BinaryView(handle=result)
 
 	@property
-	def function(self) -> '_function.Function':
+	def function(self) -> Optional['_function.Function']:
 		"""
 		Function for the current AnalysisContext (read-only)
 		"""
@@ -73,18 +73,21 @@ def function(self) -> '_function.Function':
 		return _function.Function(handle=result)
 
 	@property
-	def lifted_il(self) -> lowlevelil.LowLevelILFunction:
+	def lifted_il(self) -> Optional[lowlevelil.LowLevelILFunction]:
 		"""
 		LowLevelILFunction used to represent lifted IL (writable)
 		"""
-		return self.function.lifted_il
+		result = core.BNAnalysisContextGetLiftedILFunction(self.handle)
+		if not result:
+			return None
+		return lowlevelil.LowLevelILFunction(handle=result)
 
 	@lifted_il.setter
 	def lifted_il(self, lifted_il: lowlevelil.LowLevelILFunction) -> None:
 		core.BNSetLiftedILFunction(self.handle, lifted_il.handle)
 
 	@property
-	def llil(self) -> lowlevelil.LowLevelILFunction:
+	def llil(self) -> Optional[lowlevelil.LowLevelILFunction]:
 		"""
 		LowLevelILFunction used to represent Low Level IL (writable)
 		"""
@@ -98,7 +101,7 @@ def llil(self, value: lowlevelil.LowLevelILFunction) -> None:
 		core.BNSetLowLevelILFunction(self.handle, value.handle)
 
 	@property
-	def mlil(self) -> mediumlevelil.MediumLevelILFunction:
+	def mlil(self) -> Optional[mediumlevelil.MediumLevelILFunction]:
 		"""
 		MediumLevelILFunction used to represent Medium Level IL (writable)
 		"""
@@ -112,7 +115,7 @@ def mlil(self, value: mediumlevelil.MediumLevelILFunction) -> None:
 		core.BNSetMediumLevelILFunction(self.handle, value.handle)
 
 	@property
-	def hlil(self) -> highlevelil.HighLevelILFunction:
+	def hlil(self) -> Optional[highlevelil.HighLevelILFunction]:
 		"""
 		HighLevelILFunction used to represent High Level IL (writable)
 		"""

rust/src/workflow.rs

@@ -51,7 +51,7 @@ impl AnalysisContext {
         &self,
     ) -> Option<Ref<MutableLiftedILFunction<CoreArchitecture>>> {
         let func = self.function();
-        let result = unsafe { BNGetFunctionLiftedIL(func.handle) };
+        let result = unsafe { BNAnalysisContextGetLiftedILFunction(self.handle.as_ptr()) };
         let arch = self.function().arch();
         unsafe {
             Some(LowLevelILFunction::ref_from_raw(

workflow.cpp

@@ -41,6 +41,15 @@ Ref<Function> AnalysisContext::GetFunction()
 }
 
 
+Ref<LowLevelILFunction> AnalysisContext::GetLiftedILFunction()
+{
+	BNLowLevelILFunction* func = BNAnalysisContextGetLiftedILFunction(m_object);
+	if (!func)
+		return nullptr;
+	return new LowLevelILFunction(func);
+}
+
+
 Ref<LowLevelILFunction> AnalysisContext::GetLowLevelILFunction()
 {
 	BNLowLevelILFunction* func = BNAnalysisContextGetLowLevelILFunction(m_object);