llvmir2hll/c_hll_writer: project new function type implementation

lasyka · Feb 5, 2020 · 7d9bcfd · 7d9bcfd
1 parent acce421
commit 7d9bcfd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/llvmir2hll/hll/hll_writers/c_hll_writer.cpp b/src/llvmir2hll/hll/hll_writers/c_hll_writer.cpp
@@ -1258,17 +1258,19 @@ bool CHLLWriter::emitStandardFunctionPrototypes() {
 	//
 	//   - All functions with bodies.
 	//   - All functions marked as "user-defined".
+	//   - All functions marked as "decompiler-defined".
 	//
 	// Notes:
 	//
-	//   - We cannot consider just user-defined functions because there may be
-	//     no config file from which this information is taken (in such case, we
-	//     would emit no function prototypes at all).
+	//   - We cannot consider just user-defined and decompiler-defined functions
+	//     because there may be no config file from which this information is
+	//     taken (in such case, we would emit no function prototypes at all).
 	FuncSet funcsToEmit(
 		module->func_definition_begin(),
 		module->func_definition_end()
 	);
 	addToSet(module->getUserDefinedFuncs(), funcsToEmit);
+	addToSet(module->getDecompilerDefinedFuncs(), funcsToEmit);
 	return emitFunctionPrototypes(funcsToEmit);
 }
 

diff --git a/tests/llvmir2hll/hll/hll_writers/hll_writer_tests.cpp b/tests/llvmir2hll/hll/hll_writers/hll_writer_tests.cpp
@@ -37,6 +37,8 @@ void HLLWriterTests::SetUp() {
 		.WillByDefault(Return(NO_LINE_RANGE));
 	ON_CALL(*configMock, isUserDefinedFunc(_))
 		.WillByDefault(Return(false));
+	ON_CALL(*configMock, isDecompilerDefinedFunc(_))
+		.WillByDefault(Return(false));
 	ON_CALL(*configMock, isStaticallyLinkedFunc(_))
 		.WillByDefault(Return(false));
 	ON_CALL(*configMock, isDynamicallyLinkedFunc(_))