On Fri, Jan 28, 2022 at 5:52 AM Daniel Latypov <dlatypov@xxxxxxxxxx> wrote: > > 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 <dlatypov@xxxxxxxxxx> > --- > Note: this patch is based on top of > https://lore.kernel.org/all/20220125210011.3817742-4-dlatypov@xxxxxxxxxx/ > There is no semantic dependency between the patches, but they touch > adjacent lines. > --- Looks good. Reviewed-by: David Gow <davidgow@xxxxxxxxxx> Cheers, -- David > include/kunit/test.h | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/include/kunit/test.h b/include/kunit/test.h > index 088ff394ae94..00b9ff7783ab 100644 > --- a/include/kunit/test.h > +++ b/include/kunit/test.h > @@ -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, \ > @@ -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, \ > @@ -956,7 +956,7 @@ do { \ > fmt, \ > ...) \ > do { \ > - typeof(ptr) __ptr = (ptr); \ > + const typeof(ptr) __ptr = (ptr); \ > \ > KUNIT_ASSERTION(test, \ > assert_type, \ > -- > 2.35.0.rc2.247.g8bbb082509-goog >
