Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

A3-1-5: Remove extraneous cases and handle template instantiations #610

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

A3-1-5: Remove extraneous cases and handle template instantiations #610

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9ca0d42
A3-1-5: Remove invalid interpretation of rule
lcartey Jun 3, 2024
f1024ae
A3-1-5: Exclude member functions in template instantiations
lcartey Jun 3, 2024
80ab9a6
Add change note
lcartey Jul 23, 2024
dfe7dca
Update cpp/common/src/codingstandards/cpp/Class.qll
lcartey Jul 23, 2024
e3cbc1b
Merge branch 'main' into lcartey/a3-1-5
lcartey Jul 24, 2024
1de5223
Remove extra line
lcartey Jul 24, 2024
52c7e45
Remove A3-1-5 deleted query
lcartey Jul 24, 2024
099dbb8
Fix Class.qll formatting.
lcartey Jul 24, 2024
d5e61b3
Merge branch 'main' into lcartey/a3-1-5
lcartey Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 0 additions & 51 deletions cpp/autosar/src/rules/A3-1-5/TrivialOrTemplateFunctionDefinedOutsideClassDefinition.ql
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...autosar/test/rules/A3-1-5/TrivialOrTemplateFunctionDefinedOutsideClassDefinition.expected
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion cpp/autosar/test/rules/A3-1-5/TrivialOrTemplateFunctionDefinedOutsideClassDefinition.qlref
View file
Open in desktop

This file was deleted.

59 changes: 51 additions & 8 deletions cpp/autosar/test/rules/A3-1-5/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class A {

lcartey marked this conversation as resolved.
Show resolved Hide resolved
int complexCalculation();

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, also needs a test format

int gcd(int a, int b) {
int gcd(int a, int b) { // NON_COMPLIANT
if (b == 0)
return a;
int result = gcd(b, (a % b));
Expand Down Expand Up @@ -55,11 +55,11 @@ inline int A::complexCalculation() { // COMPLIANT
return 1;
}

int A::getB() { return 1; } // NON_COMPLIANT
int A::getB() { return 1; } // COMPLIANT

template <typename T> T A::d(T t) { return t; } // NON_COMPLIANT
template <typename T> T A::d(T t) { return t; } // COMPLIANT

int A::b() { return 3; } // NON_COMPLIANT
int A::b() { return 3; } // COMPLIANT

template <typename C> class B {
public:
Expand All @@ -76,9 +76,30 @@ template <typename C> class B {
template <typename T> T d(T t);

int complexCalculation();

int complexCalculation2() { // COMPLIANT - template
;
;
;
;
;
;
;
;
;
;
;
;
return 1;
}
};

template <typename C> inline int B<C>::complexCalculation() { // NON_COMPLIANT
void test_B() {
B<int> b;
b.complexCalculation2();
}

template <typename C> inline int B<C>::complexCalculation() { // COMPLIANT
;
;
;
Expand All @@ -94,16 +115,16 @@ template <typename C> inline int B<C>::complexCalculation() { // NON_COMPLIANT
return 1;
}

template <typename C> template <typename T> T B<C>::d(T t) { // NON_COMPLIANT
template <typename C> template <typename T> T B<C>::d(T t) { // COMPLIANT
return t;
}

template <typename C> int B<C>::b() { // NON_COMPLIANT
template <typename C> int B<C>::b() { // COMPLIANT
C c;
return 3;
}

template <typename C> int B<C>::getB() { return 3; } // NON_COMPLIANT
template <typename C> int B<C>::getB() { return 3; } // COMPLIANT

template <typename T> class Foo {
public:
Expand All @@ -121,8 +142,30 @@ class FooBar {
public:
~FooBar();
int f1(int a, int b);

template <typename C> int complexCalculation() { // COMPLIANT - template
;
;
;
;
;
;
;
;
;
;
;
;
return 1;
}
};

void test_FooBar() {
FooBar foobar;
foobar.complexCalculation<int>();
}


FooBar::~FooBar() {} // COMPLIANT want to ignore pImpl uses of destructors

int FooBar::f1(int a, int b) { // COMPLIANT not a trivial function
Expand Down
5 changes: 4 additions & 1 deletion cpp/common/src/codingstandards/cpp/Class.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,10 @@ class TrivialMemberFunction extends IntrospectedMemberFunction {
* class.
*/
class TemplateOrTemplateClassMemberFunction extends MemberFunction {
TemplateOrTemplateClassMemberFunction() { isFromUninstantiatedTemplate(_) }
TemplateOrTemplateClassMemberFunction() {
isFromUninstantiatedTemplate(_) or
isFromTemplateInstantiation(_)
lcartey marked this conversation as resolved.
Show resolved Hide resolved
}
}

/**
Expand Down
Loading