Jul 26, 2024 · Jul 18, 2024 · Jul 23, 2024 · Jul 23, 2024 · Jul 23, 2024 · Jul 23, 2024
diff --git a/change_notes/2024-07-23-fix-fp-646-M0-1-10.md b/change_notes/2024-07-23-fix-fp-646-M0-1-10.md
 - `M0-1-10` - `EncapsulatingFunctions.qll`:
  - Fixes #646. Consider typedef'd `int` return types for `main()` function as MainFunction.
diff --git a/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.expected b/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.expected
 | test.cpp:23:14:23:26 | uncalled_func | Function uncalled_func is never called. |
diff --git a/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.qlref b/cpp/autosar/test/rules/M0-1-10.1/UnusedFunction.qlref
 rules/M0-1-10/UnusedFunction.ql
diff --git a/cpp/autosar/test/rules/M0-1-10.1/test.cpp b/cpp/autosar/test/rules/M0-1-10.1/test.cpp
 #include <cstdint>

 namespace mains {
 static std::int32_t var;

 // @brief namespace_func
 static void
 namespace_func(void) noexcept { // COMPLIANT: Called from "main" below.
  mains::var = -1;
  return;
 }
 } // namespace mains

 std::int32_t func2() // COMPLIANT: Called from func1
 {
  return mains::var + 20;
 }

 std::int32_t func1() {         // COMPLIANT: Called from main
  return mains::var + func2(); // func2 called here.
 }

 std::int32_t uncalled_func() // NON_COMPLIANT: Not called.
 {
  return mains::var + func1(); // func1 called here.
 }

 // @brief main
 // @return exit code
 std::int32_t main(void) {
  std::int32_t ret{0};
  try {
    ret = func1(); // func1 called here.
    mains::var += ret;
  } catch (...) {
    mains::namespace_func(); // namespace_func called here.
  }
  return ret;
 }
diff --git a/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll b/cpp/common/src/codingstandards/cpp/EncapsulatingFunctions.qll
 class MainFunction extends MainLikeFunction {
  MainFunction() {
    hasGlobalName("main") and
    getType() instanceof IntType
    getType().resolveTypedefs() instanceof IntType
  }
 }

diff --git a/...n/test/library/codingstandards/cpp/mainlikefunctions/typedefint/MainLikeFunction.expected b/...n/test/library/codingstandards/cpp/mainlikefunctions/typedefint/MainLikeFunction.expected
 | test.cpp:5:9:5:12 | main |
diff --git a/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/MainLikeFunction.ql b/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/MainLikeFunction.ql
 import cpp
 import codingstandards.cpp.EncapsulatingFunctions

 from MainFunction m
 select m
diff --git a/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/test.cpp b/cpp/common/test/library/codingstandards/cpp/mainlikefunctions/typedefint/test.cpp
 typedef signed int int32_t;

 // @brief main
 // @return exit code
 int32_t main(void) {
  int32_t ret{0};
  return ret;
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- `M0-1-10` - `EncapsulatingFunctions.qll`:
		- Fixes #646. Consider typedef'd `int` return types for `main()` function as MainFunction.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		\| test.cpp:23:14:23:26 \| uncalled_func \| Function uncalled_func is never called. \|
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,39 @@
		#include <cstdint>
lcartey marked this conversation as resolved. Show resolvedHide resolved

		namespace mains {
		static std::int32_t var;

		// @brief namespace_func
		static void
		namespace_func(void) noexcept { // COMPLIANT: Called from "main" below.
		mains::var = -1;
		return;
		}
		} // namespace mains

		std::int32_t func2() // COMPLIANT: Called from func1
		{
		return mains::var + 20;
		}

		std::int32_t func1() { // COMPLIANT: Called from main
		return mains::var + func2(); // func2 called here.
		}

		std::int32_t uncalled_func() // NON_COMPLIANT: Not called.
		{
		return mains::var + func1(); // func1 called here.
		}

		// @brief main
		// @return exit code
		std::int32_t main(void) {
		std::int32_t ret{0};
		try {
		ret = func1(); // func1 called here.
		mains::var += ret;
		} catch (...) {
		mains::namespace_func(); // namespace_func called here.
		}
		return ret;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,7 +14,7 @@ abstract class EncapsulatingFunction extends Function { }
		class MainFunction extends MainLikeFunction {
		MainFunction() {
		hasGlobalName("main") and
		getType() instanceof IntType
		getType().resolveTypedefs() instanceof IntType
		}
		}

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,5 @@
		import cpp
		import codingstandards.cpp.EncapsulatingFunctions

		from MainFunction m
		select m
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,8 @@
		typedef signed int int32_t;

		// @brief main
		// @return exit code
		int32_t main(void) {
		int32_t ret{0};
		return ret;
		}