Skip to content

Commit f0a1c52

Browse files
authored
Remove -Wno-error=array-bounds from several build configurations (project-chip#28835)
* Remove -Wno-error=array-bounds from nlfaultinjection library * Remove some array-bounds from esp32 as well: nlfaultinjection should be fixed separately * Remove nlfaultinjection as a submodule, add only relevant files with patch for gcc12 support. * Restyle * Update a few more include paths for nlfaultinjection * exclude nlfaultinjection from clangtidy * Restyle * Apply clang-tidy fixes to nlfaultinjection.cpp
1 parent 3fae7ff commit f0a1c52

File tree

12 files changed

+1436
-24
lines changed

12 files changed

+1436
-24
lines changed

.gitmodules

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
path = third_party/nlassert/repo
33
url = https://github.com/nestlabs/nlassert.git
44
branch = master
5-
[submodule "nlfaultinjection"]
6-
path = third_party/nlfaultinjection/repo
7-
url = https://github.com/nestlabs/nlfaultinjection.git
8-
branch = master
95
[submodule "nlio"]
106
path = third_party/nlio/repo
117
url = https://github.com/nestlabs/nlio.git

examples/all-clusters-app/esp32/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-format-nonliteral;-Wno-format-secur
4646
# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
4747
idf_build_set_property(COMPILE_OPTIONS "-Wno-error=maybe-uninitialized" APPEND)
4848

49-
idf_build_set_property(COMPILE_OPTIONS "-Wno-error=array-bounds" APPEND)
50-
5149
flashing_script()
5250

5351
if (CONFIG_ENABLE_PW_RPC)

examples/all-clusters-app/esp32/main/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set(PRIV_INCLUDE_DIRS_LIST
2121
"${CMAKE_CURRENT_LIST_DIR}/include"
2222
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
2323
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
24-
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/nlfaultinjection/repo/include"
24+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/nlfaultinjection/include"
2525
)
2626
set(SRC_DIRS_LIST
2727
"${CMAKE_CURRENT_LIST_DIR}"

examples/android/CHIPTest/app/src/main/cpp/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ set_property(TARGET CHIPTest APPEND PROPERTY INCLUDE_DIRECTORIES
3333
${MATTER_SDK_ROOT}/config/standalone/
3434
${MATTER_SDK_ROOT}/third_party/nlassert/repo/include/
3535
${MATTER_SDK_ROOT}/third_party/nlio/repo/include/
36-
${MATTER_SDK_ROOT}/third_party/nlfaultinjection/repo/include/
36+
${MATTER_SDK_ROOT}/third_party/nlfaultinjection/include/
3737
${MATTER_SDK_ROOT}/third_party/nlunit-test/repo/src/)
3838
set_target_properties(CHIPTest PROPERTIES COMPILE_DEFINITIONS "CHIP_HAVE_CONFIG_H=1")
3939

examples/lighting-app/esp32/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-error=maybe-uninitialized" APPEND)
5757

5858
#For the H2, -Werror=uninitialized will cause an error in "src/lib/support/LambdaBridge.h"
5959
idf_build_set_property(COMPILE_OPTIONS "-Wno-error=uninitialized" APPEND)
60-
#For ESP32-C6, -Werror=array-bounds will cause an error in 'third_party/nlfaultinjection/repo/src/nlfaultinjection.cpp'
61-
idf_build_set_property(COMPILE_OPTIONS "-Wno-error=array-bounds" APPEND)
6260

6361
flashing_script()
6462

scripts/examples/tests/expected_test_cmakelists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ set_property(TARGET "${target}" APPEND PROPERTY INCLUDE_DIRECTORIES
7070
"//TEST_ROOT_PATH/config/standalone/"
7171
"//TEST_ROOT_PATH/third_party/nlassert/repo/include/"
7272
"//TEST_ROOT_PATH/third_party/nlio/repo/include/"
73-
"//TEST_ROOT_PATH/third_party/nlfaultinjection/repo/include/"
73+
"//TEST_ROOT_PATH/third_party/nlfaultinjection/include/"
7474
"//TEST_ROOT_PATH/third_party/nlunit-test/repo/src/")
7575
set_target_properties("${target}" PROPERTIES COMPILE_DEFINITIONS "CHIP_HAVE_CONFIG_H=1;")
7676
set_target_properties("${target}" PROPERTIES COMPILE_FLAGS "-O0 -std=gnu++14 -fno-rtti ")

scripts/examples/tests/test_project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"//config/standalone/",
8989
"//third_party/nlassert/repo/include/",
9090
"//third_party/nlio/repo/include/",
91-
"//third_party/nlfaultinjection/repo/include/",
91+
"//third_party/nlfaultinjection/include/",
9292
"//third_party/nlunit-test/repo/src/"
9393
],
9494
"ldflags": ["-march=armv8-a", "-O0"],

third_party/nlfaultinjection/BUILD.gn

+3-11
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,18 @@
1515
import("//build_overrides/nlassert.gni")
1616

1717
config("nlfaultinjection_config") {
18-
include_dirs = [ "repo/include" ]
19-
}
20-
21-
config("nlfaultinjection_disable_warnings_config") {
22-
cflags = [
23-
# We are intentionally inducing faults with this library so it makes sense to ignore errors.
24-
"-Wno-error=array-bounds",
25-
]
18+
include_dirs = [ "include" ]
2619
}
2720

2821
static_library("nlfaultinjection") {
2922
sources = [
30-
"repo/include/nlfaultinjection.hpp",
31-
"repo/src/nlfaultinjection.cpp",
23+
"include/nlfaultinjection.hpp",
24+
"src/nlfaultinjection.cpp",
3225
]
3326

3427
deps = [ "${nlassert_root}:nlassert" ]
3528

3629
public_configs = [ ":nlfaultinjection_config" ]
37-
configs += [ ":nlfaultinjection_disable_warnings_config" ]
3830

3931
output_name = "libnlfaultinjection"
4032
output_dir = "${root_out_dir}/lib"
+214
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
1+
## Content
2+
3+
The files here originate from https://github.com/nestlabs/nlfaultinjection.git
4+
5+
The reason for a stand-alone/reduced copy is the requirement to patch the `Die`
6+
function for gcc12+ to avoid a `-Warray-bounds` error.
7+
8+
## License
9+
10+
Original repository was licensed under Apache2:
11+
12+
```
13+
Apache License
14+
Version 2.0, January 2004
15+
http://www.apache.org/licenses/
16+
17+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
18+
19+
1. Definitions.
20+
21+
"License" shall mean the terms and conditions for use, reproduction,
22+
and distribution as defined by Sections 1 through 9 of this document.
23+
24+
"Licensor" shall mean the copyright owner or entity authorized by
25+
the copyright owner that is granting the License.
26+
27+
"Legal Entity" shall mean the union of the acting entity and all
28+
other entities that control, are controlled by, or are under common
29+
control with that entity. For the purposes of this definition,
30+
"control" means (i) the power, direct or indirect, to cause the
31+
direction or management of such entity, whether by contract or
32+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
33+
outstanding shares, or (iii) beneficial ownership of such entity.
34+
35+
"You" (or "Your") shall mean an individual or Legal Entity
36+
exercising permissions granted by this License.
37+
38+
"Source" form shall mean the preferred form for making modifications,
39+
including but not limited to software source code, documentation
40+
source, and configuration files.
41+
42+
"Object" form shall mean any form resulting from mechanical
43+
transformation or translation of a Source form, including but
44+
not limited to compiled object code, generated documentation,
45+
and conversions to other media types.
46+
47+
"Work" shall mean the work of authorship, whether in Source or
48+
Object form, made available under the License, as indicated by a
49+
copyright notice that is included in or attached to the work
50+
(an example is provided in the Appendix below).
51+
52+
"Derivative Works" shall mean any work, whether in Source or Object
53+
form, that is based on (or derived from) the Work and for which the
54+
editorial revisions, annotations, elaborations, or other modifications
55+
represent, as a whole, an original work of authorship. For the purposes
56+
of this License, Derivative Works shall not include works that remain
57+
separable from, or merely link (or bind by name) to the interfaces of,
58+
the Work and Derivative Works thereof.
59+
60+
"Contribution" shall mean any work of authorship, including
61+
the original version of the Work and any modifications or additions
62+
to that Work or Derivative Works thereof, that is intentionally
63+
submitted to Licensor for inclusion in the Work by the copyright owner
64+
or by an individual or Legal Entity authorized to submit on behalf of
65+
the copyright owner. For the purposes of this definition, "submitted"
66+
means any form of electronic, verbal, or written communication sent
67+
to the Licensor or its representatives, including but not limited to
68+
communication on electronic mailing lists, source code control systems,
69+
and issue tracking systems that are managed by, or on behalf of, the
70+
Licensor for the purpose of discussing and improving the Work, but
71+
excluding communication that is conspicuously marked or otherwise
72+
designated in writing by the copyright owner as "Not a Contribution."
73+
74+
"Contributor" shall mean Licensor and any individual or Legal Entity
75+
on behalf of whom a Contribution has been received by Licensor and
76+
subsequently incorporated within the Work.
77+
78+
2. Grant of Copyright License. Subject to the terms and conditions of
79+
this License, each Contributor hereby grants to You a perpetual,
80+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
81+
copyright license to reproduce, prepare Derivative Works of,
82+
publicly display, publicly perform, sublicense, and distribute the
83+
Work and such Derivative Works in Source or Object form.
84+
85+
3. Grant of Patent License. Subject to the terms and conditions of
86+
this License, each Contributor hereby grants to You a perpetual,
87+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
88+
(except as stated in this section) patent license to make, have made,
89+
use, offer to sell, sell, import, and otherwise transfer the Work,
90+
where such license applies only to those patent claims licensable
91+
by such Contributor that are necessarily infringed by their
92+
Contribution(s) alone or by combination of their Contribution(s)
93+
with the Work to which such Contribution(s) was submitted. If You
94+
institute patent litigation against any entity (including a
95+
cross-claim or counterclaim in a lawsuit) alleging that the Work
96+
or a Contribution incorporated within the Work constitutes direct
97+
or contributory patent infringement, then any patent licenses
98+
granted to You under this License for that Work shall terminate
99+
as of the date such litigation is filed.
100+
101+
4. Redistribution. You may reproduce and distribute copies of the
102+
Work or Derivative Works thereof in any medium, with or without
103+
modifications, and in Source or Object form, provided that You
104+
meet the following conditions:
105+
106+
(a) You must give any other recipients of the Work or
107+
Derivative Works a copy of this License; and
108+
109+
(b) You must cause any modified files to carry prominent notices
110+
stating that You changed the files; and
111+
112+
(c) You must retain, in the Source form of any Derivative Works
113+
that You distribute, all copyright, patent, trademark, and
114+
attribution notices from the Source form of the Work,
115+
excluding those notices that do not pertain to any part of
116+
the Derivative Works; and
117+
118+
(d) If the Work includes a "NOTICE" text file as part of its
119+
distribution, then any Derivative Works that You distribute must
120+
include a readable copy of the attribution notices contained
121+
within such NOTICE file, excluding those notices that do not
122+
pertain to any part of the Derivative Works, in at least one
123+
of the following places: within a NOTICE text file distributed
124+
as part of the Derivative Works; within the Source form or
125+
documentation, if provided along with the Derivative Works; or,
126+
within a display generated by the Derivative Works, if and
127+
wherever such third-party notices normally appear. The contents
128+
of the NOTICE file are for informational purposes only and
129+
do not modify the License. You may add Your own attribution
130+
notices within Derivative Works that You distribute, alongside
131+
or as an addendum to the NOTICE text from the Work, provided
132+
that such additional attribution notices cannot be construed
133+
as modifying the License.
134+
135+
You may add Your own copyright statement to Your modifications and
136+
may provide additional or different license terms and conditions
137+
for use, reproduction, or distribution of Your modifications, or
138+
for any such Derivative Works as a whole, provided Your use,
139+
reproduction, and distribution of the Work otherwise complies with
140+
the conditions stated in this License.
141+
142+
5. Submission of Contributions. Unless You explicitly state otherwise,
143+
any Contribution intentionally submitted for inclusion in the Work
144+
by You to the Licensor shall be under the terms and conditions of
145+
this License, without any additional terms or conditions.
146+
Notwithstanding the above, nothing herein shall supersede or modify
147+
the terms of any separate license agreement you may have executed
148+
with Licensor regarding such Contributions.
149+
150+
6. Trademarks. This License does not grant permission to use the trade
151+
names, trademarks, service marks, or product names of the Licensor,
152+
except as required for reasonable and customary use in describing the
153+
origin of the Work and reproducing the content of the NOTICE file.
154+
155+
7. Disclaimer of Warranty. Unless required by applicable law or
156+
agreed to in writing, Licensor provides the Work (and each
157+
Contributor provides its Contributions) on an "AS IS" BASIS,
158+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
159+
implied, including, without limitation, any warranties or conditions
160+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
161+
PARTICULAR PURPOSE. You are solely responsible for determining the
162+
appropriateness of using or redistributing the Work and assume any
163+
risks associated with Your exercise of permissions under this License.
164+
165+
8. Limitation of Liability. In no event and under no legal theory,
166+
whether in tort (including negligence), contract, or otherwise,
167+
unless required by applicable law (such as deliberate and grossly
168+
negligent acts) or agreed to in writing, shall any Contributor be
169+
liable to You for damages, including any direct, indirect, special,
170+
incidental, or consequential damages of any character arising as a
171+
result of this License or out of the use or inability to use the
172+
Work (including but not limited to damages for loss of goodwill,
173+
work stoppage, computer failure or malfunction, or any and all
174+
other commercial damages or losses), even if such Contributor
175+
has been advised of the possibility of such damages.
176+
177+
9. Accepting Warranty or Additional Liability. While redistributing
178+
the Work or Derivative Works thereof, You may choose to offer,
179+
and charge a fee for, acceptance of support, warranty, indemnity,
180+
or other liability obligations and/or rights consistent with this
181+
License. However, in accepting such obligations, You may act only
182+
on Your own behalf and on Your sole responsibility, not on behalf
183+
of any other Contributor, and only if You agree to indemnify,
184+
defend, and hold each Contributor harmless for any liability
185+
incurred by, or claims asserted against, such Contributor by reason
186+
of your accepting any such warranty or additional liability.
187+
188+
END OF TERMS AND CONDITIONS
189+
190+
APPENDIX: How to apply the Apache License to your work.
191+
192+
To apply the Apache License to your work, attach the following
193+
boilerplate notice, with the fields enclosed by brackets "[]"
194+
replaced with your own identifying information. (Don't include
195+
the brackets!) The text should be enclosed in the appropriate
196+
comment syntax for the file format. We also recommend that a
197+
file or class name and description of purpose be included on the
198+
same "printed page" as the copyright notice for easier
199+
identification within third-party archives.
200+
201+
Copyright [yyyy] [name of copyright owner]
202+
203+
Licensed under the Apache License, Version 2.0 (the "License");
204+
you may not use this file except in compliance with the License.
205+
You may obtain a copy of the License at
206+
207+
http://www.apache.org/licenses/LICENSE-2.0
208+
209+
Unless required by applicable law or agreed to in writing, software
210+
distributed under the License is distributed on an "AS IS" BASIS,
211+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
212+
See the License for the specific language governing permissions and
213+
limitations under the License.
214+
```

0 commit comments

Comments
 (0)