Skip to content

Commit afd8b23

Browse files
committed
Merge #1244: Suppress -Wunused-parameter when building for coverage analysis
5bb03c2 Replace `SECP256K1_ECMULT_TABLE_VERIFY` macro by a function (Hennadii Stepanov) 4429a8c Suppress `-Wunused-parameter` when building for coverage analysis (Hennadii Stepanov) Pull request description: ACKs for top commit: real-or-random: utACK 5bb03c2 jonasnick: ACK 5bb03c2 Tree-SHA512: 19a395434ecefea201a03fc45b3f0b88f1520908926ac1207bbc6570034b1141b49c3c98e66819dcd9069dfdd28c7c6fbe957f13fb6bd178fd57ce65bfbb8fbd
2 parents 1d8f367 + 5bb03c2 commit afd8b23

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ else()
147147
endif()
148148

149149
# Define custom "Coverage" build type.
150-
set(CMAKE_C_FLAGS_COVERAGE "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O0 -DCOVERAGE=1 --coverage -Wno-unused-parameter" CACHE STRING
150+
set(CMAKE_C_FLAGS_COVERAGE "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O0 -DCOVERAGE=1 --coverage" CACHE STRING
151151
"Flags used by the C compiler during \"Coverage\" builds."
152152
FORCE
153153
)

src/ecmult_impl.h

+9-6
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,16 @@ static void secp256k1_ecmult_odd_multiples_table(int n, secp256k1_ge *pre_a, sec
114114
secp256k1_fe_mul(z, &ai.z, &d.z);
115115
}
116116

117-
#define SECP256K1_ECMULT_TABLE_VERIFY(n,w) \
118-
VERIFY_CHECK(((n) & 1) == 1); \
119-
VERIFY_CHECK((n) >= -((1 << ((w)-1)) - 1)); \
117+
SECP256K1_INLINE static void secp256k1_ecmult_table_verify(int n, int w) {
118+
(void)n;
119+
(void)w;
120+
VERIFY_CHECK(((n) & 1) == 1);
121+
VERIFY_CHECK((n) >= -((1 << ((w)-1)) - 1));
120122
VERIFY_CHECK((n) <= ((1 << ((w)-1)) - 1));
123+
}
121124

122125
SECP256K1_INLINE static void secp256k1_ecmult_table_get_ge(secp256k1_ge *r, const secp256k1_ge *pre, int n, int w) {
123-
SECP256K1_ECMULT_TABLE_VERIFY(n,w)
126+
secp256k1_ecmult_table_verify(n,w);
124127
if (n > 0) {
125128
*r = pre[(n-1)/2];
126129
} else {
@@ -130,7 +133,7 @@ SECP256K1_INLINE static void secp256k1_ecmult_table_get_ge(secp256k1_ge *r, cons
130133
}
131134

132135
SECP256K1_INLINE static void secp256k1_ecmult_table_get_ge_lambda(secp256k1_ge *r, const secp256k1_ge *pre, const secp256k1_fe *x, int n, int w) {
133-
SECP256K1_ECMULT_TABLE_VERIFY(n,w)
136+
secp256k1_ecmult_table_verify(n,w);
134137
if (n > 0) {
135138
secp256k1_ge_set_xy(r, &x[(n-1)/2], &pre[(n-1)/2].y);
136139
} else {
@@ -140,7 +143,7 @@ SECP256K1_INLINE static void secp256k1_ecmult_table_get_ge_lambda(secp256k1_ge *
140143
}
141144

142145
SECP256K1_INLINE static void secp256k1_ecmult_table_get_ge_storage(secp256k1_ge *r, const secp256k1_ge_storage *pre, int n, int w) {
143-
SECP256K1_ECMULT_TABLE_VERIFY(n,w)
146+
secp256k1_ecmult_table_verify(n,w);
144147
if (n > 0) {
145148
secp256k1_ge_from_storage(r, &pre[(n-1)/2]);
146149
} else {

0 commit comments

Comments
 (0)