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

cmake: use the warnings_as_errors flag for cpp files #78419

Merged
merged 7 commits into from
Sep 23, 2024
+15 −9
Merged

cmake: use the warnings_as_errors flag for cpp files #78419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b73da5a
tests: lib: cbprintf_package: fix compiler warning
fabiobaltieri Sep 19, 2024
0ee05d9
mspi: add a dummy byte to struct mspi_timing_cfg
fabiobaltieri Sep 18, 2024
0ffeb16
tests: i2c_emul: fix sign comparison warning
fabiobaltieri Sep 18, 2024
283f591
tests: cpp: add a pm device reference
fabiobaltieri Sep 18, 2024
659f210
tests: i2c_emul: drop the array designators
fabiobaltieri Sep 18, 2024
b57c682
device_mmio: use explicit unsigned literals for addresses
fabiobaltieri Sep 19, 2024
66a71f3
cmake: use the warnings_as_errors flag for cpp files
fabiobaltieri Sep 13, 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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler-cpp,
# Extra warnings options for twister run
if (CONFIG_COMPILER_WARNINGS_AS_ERRORS)
zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,warnings_as_errors>>)
zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler,warnings_as_errors>>)
zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:$<TARGET_PROPERTY:asm,warnings_as_errors>>)
zephyr_link_libraries($<TARGET_PROPERTY:linker,warnings_as_errors>)
endif()
Expand Down
5 changes: 4 additions & 1 deletion include/zephyr/drivers/mspi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,10 @@ enum mspi_timing_param {
* @brief Stub for struct timing_cfg
*/
struct mspi_timing_cfg {

#ifdef __cplusplus
/* For C++ compatibility. */
uint8_t dummy;
#endif
};

/**
Expand Down
4 changes: 2 additions & 2 deletions include/zephyr/sys/device_mmio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@

#define Z_DEVICE_MMIO_ROM_INITIALIZER(node_id) \
{ \
.phys_addr = DT_REG_ADDR(node_id), \
.phys_addr = UINT32_C(DT_REG_ADDR(node_id)), \
Copy link
Member Author

@fabiobaltieri fabiobaltieri Sep 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

tempted to have this as part of DT_REG_ADDR (and potentially DT_REG_SIZE too) macro itself but that would be a substantial change, definitely worth its own PR, I propose to patch this one up for now. Somewhat surprised CI does not hit more cases of this warning though.

Copy link
Collaborator

Choose a reason for hiding this comment

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

This looks really odd to me offhand, is the ADDR a 32 bit unsigned or not? If it is, then the DT macro should ensure that's the type being provided. If its not, then .phys_addr should have its type corrected. This looks a bit like a quick fix at the wrong place.

Copy link
Member Author

Choose a reason for hiding this comment

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

it's a quick fix, that's pretty much what I meant in the comment above

Copy link
Collaborator

Choose a reason for hiding this comment

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

Please create an issue for this then, if its meant to be revisited

Copy link
Collaborator

Choose a reason for hiding this comment

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

There already exist an issue:
#53505
I gave it a shot, but gave up:
#70761

Copy link
Member Author

Choose a reason for hiding this comment

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

@jeppenodgaard what was wrong with that? CI errors? I was considering giving it a go as well

Copy link
Collaborator

Choose a reason for hiding this comment

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

@fabiobaltieri see this closing comment:
#70761 (comment)

.size = DT_REG_SIZE(node_id) \
}

#define Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(name, node_id) \
{ \
.phys_addr = DT_REG_ADDR_BY_NAME(node_id, name), \
.phys_addr = UINT32_C(DT_REG_ADDR_BY_NAME(node_id, name)), \
.size = DT_REG_SIZE_BY_NAME(node_id, name) \
}

Check notice on line 75 in include/zephyr/sys/device_mmio.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/sys/device_mmio.h:75 
-#define Z_DEVICE_MMIO_ROM_INITIALIZER(node_id) \
-	{ \
-		.phys_addr = UINT32_C(DT_REG_ADDR(node_id)), \
-		.size = DT_REG_SIZE(node_id) \
-	}
-
-#define Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(name, node_id) \
-	{ \
-		.phys_addr = UINT32_C(DT_REG_ADDR_BY_NAME(node_id, name)), \
-		.size = DT_REG_SIZE_BY_NAME(node_id, name) \
-	}
+#define Z_DEVICE_MMIO_ROM_INITIALIZER(node_id)                                                     \
+	{.phys_addr = UINT32_C(DT_REG_ADDR(node_id)), .size = DT_REG_SIZE(node_id)}
+
+#define Z_DEVICE_MMIO_NAMED_ROM_INITIALIZER(name, node_id)                                         \
+	{.phys_addr = UINT32_C(DT_REG_ADDR_BY_NAME(node_id, name)),                                \
+	 .size = DT_REG_SIZE_BY_NAME(node_id, name)}
/**
* Set linear address for device MMIO access
*
Expand Down
4 changes: 2 additions & 2 deletions tests/drivers/i2c/i2c_emul/src/emulated_target.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ DT_FOREACH_PROP_ELEM(CONTROLLER_LABEL, forwards, DEFINE_FAKE_TARGET_FUNCTION);

/* clang-format off */
#define DEFINE_EMULATED_CALLBACK(node_id, prop, n) \
[n] = { \
{ \
.write_requested = target_write_requested_##n, \
.read_requested = target_read_requested_##n, \
.write_received = target_write_received_##n, \
Expand All @@ -42,7 +42,7 @@ struct i2c_target_callbacks emulated_callbacks[FORWARD_COUNT] = {
DT_FOREACH_PROP_ELEM(CONTROLLER_LABEL, forwards, DEFINE_EMULATED_CALLBACK)};

#define DEFINE_EMULATED_TARGET_CONFIG(node_id, prop, n) \
[n] = { \
{ \
Copy link
Collaborator

Choose a reason for hiding this comment

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

This looks like its doing something completely different than it was before? Confused by this change, why is "[n] = " no longer needed, why was it needed before?

Copy link
Member Author

Choose a reason for hiding this comment

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

no idea why it was introduced originally, I guess to do something with that n variable? regardless, the compiler does not like it, the alternative would be to shut off that warning, happy with either. @yperess?

.flags = 0, \
.address = DT_PHA_BY_IDX(node_id, prop, n, addr), \
.callbacks = &emulated_callbacks[n], \
Expand Down
2 changes: 1 addition & 1 deletion tests/drivers/i2c/i2c_emul/src/test_forwarding_pio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ZTEST(i2c_emul_forwarding, test_write_is_forwarded)
{
// Try writing some values
for (uint8_t data = 0; data < 10; ++data) {
const int expected_call_count = 1 + data;
const unsigned int expected_call_count = 1 + data;

zassert_ok(i2c_write(controller, &data, sizeof(data),
emulated_target_config[0].address));
Expand Down
3 changes: 2 additions & 1 deletion tests/lib/cbprintf_package/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,8 +923,9 @@
uint32_t copy_flags = CBPRINTF_PACKAGE_CONVERT_RW_STR;

clen = cbprintf_package_convert(spackage, slen, NULL, 0, copy_flags, NULL, 0);
zassert_true(clen == slen + sizeof(test_str1) + 1/*null*/ - 2 /* arg+ro idx gone*/);
zassert_true(clen >= 0);
zassert_true((size_t)clen == slen + sizeof(test_str1) + 1/*null*/ - 2 /* arg+ro idx gone*/);

Check notice on line 928 in tests/lib/cbprintf_package/src/main.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

tests/lib/cbprintf_package/src/main.c:928 
-	zassert_true((size_t)clen == slen + sizeof(test_str1) + 1/*null*/ - 2 /* arg+ro idx gone*/);
+	zassert_true((size_t)clen ==
+		     slen + sizeof(test_str1) + 1 /*null*/ - 2 /* arg+ro idx gone*/);
clen = cbprintf_package_convert(spackage, slen, convert_cb, &ctx, copy_flags, NULL, 0);
zassert_true(clen > 0);
zassert_true(ctx.null);
Expand Down
5 changes: 3 additions & 2 deletions tests/lib/cpp/cxx/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,11 @@ ZTEST_SUITE(cxx_tests, NULL, NULL, NULL, NULL, NULL);
*
* DEVICE_DEFINE(dev_id, name, * init_fn, pm, data, config, level, prio, api)
*/
DEVICE_DT_DEFINE(DT_NODELABEL(test_dev0_boot), NULL, NULL, NULL, NULL, POST_KERNEL, 33, NULL);

DEVICE_DT_DEFINE(DT_NODELABEL(test_dev1_dfr), NULL, NULL, NULL, NULL, POST_KERNEL, 33, NULL);

static int fake_pm_action(const struct device *dev,
enum pm_device_action pm_action) { return -1; }
PM_DEVICE_DT_DEFINE(DT_NODELABEL(test_dev0_boot), fake_pm_action);

DEVICE_DT_DEFINE(DT_NODELABEL(test_dev0_boot), NULL,
PM_DEVICE_DT_GET(DT_NODELABEL(test_dev0_boot)), NULL, NULL, POST_KERNEL, 34, NULL);
Loading