| Message ID | 20220118223506.1701553-3-dlatypov@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c5855907d388321c1089023489e49ba9a5e9afc7 |
| Delegated to: | Brendan Higgins |
| Headers | show |
| Series | kunit: decrease layers of assertion macros | expand |
On Wed, Jan 19, 2022 at 6:35 AM 'Daniel Latypov' via KUnit Development <kunit-dev@googlegroups.com> wrote: > > We have the intermediate macros for KUNIT_EXPECT_PTR_GT() and friends, > but these macros don't exist. > > I can see niche usecases for these macros existing, but since we've been > fine without them for so long, let's drop this dead code. > > Users can instead cast the pointers and use the other GT/LT macros. > > Signed-off-by: Daniel Latypov <dlatypov@google.com> > --- Agreed: while I can sort-of see why one might want to use something like this for bounds checking, casting to an integer is definitely acceptable (and we've got things like KASAN and fortify-source for many bounds-checking cases anyway). Also, many languages explicitly treat pointers as not being comparable this way anyway, and rely on casting to integer, which is a trend worth following, I think. Reviewed-by: David Gow <davidgow@google.com> Cheers, -- David > include/kunit/test.h | 60 -------------------------------------------- > 1 file changed, 60 deletions(-) > > diff --git a/include/kunit/test.h b/include/kunit/test.h > index b032dd6816d2..c021945a75e3 100644 > --- a/include/kunit/test.h > +++ b/include/kunit/test.h > @@ -1044,21 +1044,6 @@ do { \ > fmt, \ > ##__VA_ARGS__) > > -#define KUNIT_BINARY_PTR_LT_MSG_ASSERTION(test, \ > - assert_type, \ > - left, \ > - right, \ > - fmt, \ > - ...) \ > - KUNIT_BASE_LT_MSG_ASSERTION(test, \ > - kunit_binary_ptr_assert, \ > - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ > - assert_type, \ > - left, \ > - right, \ > - fmt, \ > - ##__VA_ARGS__) > - > #define KUNIT_BINARY_LE_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\ > KUNIT_BASE_LE_MSG_ASSERTION(test, \ > kunit_binary_assert, \ > @@ -1069,21 +1054,6 @@ do { \ > fmt, \ > ##__VA_ARGS__) > > -#define KUNIT_BINARY_PTR_LE_MSG_ASSERTION(test, \ > - assert_type, \ > - left, \ > - right, \ > - fmt, \ > - ...) \ > - KUNIT_BASE_LE_MSG_ASSERTION(test, \ > - kunit_binary_ptr_assert, \ > - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ > - assert_type, \ > - left, \ > - right, \ > - fmt, \ > - ##__VA_ARGS__) > - > #define KUNIT_BINARY_GT_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\ > KUNIT_BASE_GT_MSG_ASSERTION(test, \ > kunit_binary_assert, \ > @@ -1094,21 +1064,6 @@ do { \ > fmt, \ > ##__VA_ARGS__) > > -#define KUNIT_BINARY_PTR_GT_MSG_ASSERTION(test, \ > - assert_type, \ > - left, \ > - right, \ > - fmt, \ > - ...) \ > - KUNIT_BASE_GT_MSG_ASSERTION(test, \ > - kunit_binary_ptr_assert, \ > - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ > - assert_type, \ > - left, \ > - right, \ > - fmt, \ > - ##__VA_ARGS__) > - > #define KUNIT_BINARY_GE_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\ > KUNIT_BASE_GE_MSG_ASSERTION(test, \ > kunit_binary_assert, \ > @@ -1119,21 +1074,6 @@ do { \ > fmt, \ > ##__VA_ARGS__) > > -#define KUNIT_BINARY_PTR_GE_MSG_ASSERTION(test, \ > - assert_type, \ > - left, \ > - right, \ > - fmt, \ > - ...) \ > - KUNIT_BASE_GE_MSG_ASSERTION(test, \ > - kunit_binary_ptr_assert, \ > - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ > - assert_type, \ > - left, \ > - right, \ > - fmt, \ > - ##__VA_ARGS__) > - > #define KUNIT_BINARY_STR_ASSERTION(test, \ > assert_type, \ > left, \ > -- > 2.34.1.703.g22d0c6ccf7-goog > > -- > You received this message because you are subscribed to the Google Groups "KUnit Development" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kunit-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kunit-dev/20220118223506.1701553-3-dlatypov%40google.com.
On Tue, Jan 18, 2022 at 5:35 PM Daniel Latypov <dlatypov@google.com> wrote: > > We have the intermediate macros for KUNIT_EXPECT_PTR_GT() and friends, > but these macros don't exist. > > I can see niche usecases for these macros existing, but since we've been > fine without them for so long, let's drop this dead code. > > Users can instead cast the pointers and use the other GT/LT macros. > > Signed-off-by: Daniel Latypov <dlatypov@google.com> Oh, whoops, I didn't even realize we were missing those variants. Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
diff --git a/include/kunit/test.h b/include/kunit/test.h index b032dd6816d2..c021945a75e3 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -1044,21 +1044,6 @@ do { \ fmt, \ ##__VA_ARGS__) -#define KUNIT_BINARY_PTR_LT_MSG_ASSERTION(test, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ...) \ - KUNIT_BASE_LT_MSG_ASSERTION(test, \ - kunit_binary_ptr_assert, \ - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ##__VA_ARGS__) - #define KUNIT_BINARY_LE_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\ KUNIT_BASE_LE_MSG_ASSERTION(test, \ kunit_binary_assert, \ @@ -1069,21 +1054,6 @@ do { \ fmt, \ ##__VA_ARGS__) -#define KUNIT_BINARY_PTR_LE_MSG_ASSERTION(test, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ...) \ - KUNIT_BASE_LE_MSG_ASSERTION(test, \ - kunit_binary_ptr_assert, \ - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ##__VA_ARGS__) - #define KUNIT_BINARY_GT_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\ KUNIT_BASE_GT_MSG_ASSERTION(test, \ kunit_binary_assert, \ @@ -1094,21 +1064,6 @@ do { \ fmt, \ ##__VA_ARGS__) -#define KUNIT_BINARY_PTR_GT_MSG_ASSERTION(test, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ...) \ - KUNIT_BASE_GT_MSG_ASSERTION(test, \ - kunit_binary_ptr_assert, \ - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ##__VA_ARGS__) - #define KUNIT_BINARY_GE_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\ KUNIT_BASE_GE_MSG_ASSERTION(test, \ kunit_binary_assert, \ @@ -1119,21 +1074,6 @@ do { \ fmt, \ ##__VA_ARGS__) -#define KUNIT_BINARY_PTR_GE_MSG_ASSERTION(test, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ...) \ - KUNIT_BASE_GE_MSG_ASSERTION(test, \ - kunit_binary_ptr_assert, \ - KUNIT_INIT_BINARY_PTR_ASSERT_STRUCT, \ - assert_type, \ - left, \ - right, \ - fmt, \ - ##__VA_ARGS__) - #define KUNIT_BINARY_STR_ASSERTION(test, \ assert_type, \ left, \
We have the intermediate macros for KUNIT_EXPECT_PTR_GT() and friends, but these macros don't exist. I can see niche usecases for these macros existing, but since we've been fine without them for so long, let's drop this dead code. Users can instead cast the pointers and use the other GT/LT macros. Signed-off-by: Daniel Latypov <dlatypov@google.com> --- include/kunit/test.h | 60 -------------------------------------------- 1 file changed, 60 deletions(-)