Skip to content

Commit

Permalink
kunit: cleanup assertion macro internal variables
Browse files Browse the repository at this point in the history
All the operands should be tagged `const`.
We're only assigning them to variables so that we can compare them (e.g.
check if left == right, etc.) and avoid evaluating expressions multiple
times.

There's no need for them to be mutable.

Also rename the helper variable `loc` to `__loc` like we do with
`__assertion` and `__strs` to avoid potential name collisions with user
code.

Signed-off-by: Daniel Latypov <[email protected]>
Reviewed-by: David Gow <[email protected]>
Reviewed-by: Brendan Higgins <[email protected]>
Signed-off-by: Shuah Khan <[email protected]>
  • Loading branch information
dlatypov authored and shuahkh committed Jan 31, 2022
1 parent 2b6861e commit c274145
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions include/kunit/test.h
Original file line number Diff line number Diff line change
Expand Up @@ -779,10 +779,10 @@ void kunit_do_failed_assertion(struct kunit *test,

#define KUNIT_ASSERTION(test, assert_type, pass, assert_class, INITIALIZER, fmt, ...) do { \
if (unlikely(!(pass))) { \
static const struct kunit_loc loc = KUNIT_CURRENT_LOC; \
static const struct kunit_loc __loc = KUNIT_CURRENT_LOC; \
struct assert_class __assertion = INITIALIZER; \
kunit_do_failed_assertion(test, \
&loc, \
&__loc, \
assert_type, \
&__assertion.assert, \
fmt, \
Expand Down Expand Up @@ -872,8 +872,8 @@ void kunit_do_failed_assertion(struct kunit *test,
fmt, \
...) \
do { \
typeof(left) __left = (left); \
typeof(right) __right = (right); \
const typeof(left) __left = (left); \
const typeof(right) __right = (right); \
static const struct kunit_binary_assert_text __text = { \
.operation = #op, \
.left_text = #left, \
Expand Down Expand Up @@ -956,7 +956,7 @@ do { \
fmt, \
...) \
do { \
typeof(ptr) __ptr = (ptr); \
const typeof(ptr) __ptr = (ptr); \
\
KUNIT_ASSERTION(test, \
assert_type, \
Expand Down

0 comments on commit c274145

Please sign in to comment.