Merge pull request #659 from ethereum/clang15

Fix build issues related to clang 15
ethereum · Aug 3, 2022 · 4404c62 · 4404c62
2 parents afac844 + 80dc9e9
commit 4404c62
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 53 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,6 +1,7 @@
 Checks: >
   bugprone-*,
   -bugprone-easily-swappable-parameters,
+  -bugprone-unchecked-optional-access,
   cert-*,
   -cert-err58-cpp,
   clang-analyzer-*,

diff --git a/examples/example_host.h b/examples/example_host.h
@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 
-const struct evmc_host_interface* example_host_get_interface();
+const struct evmc_host_interface* example_host_get_interface(void);
 
 struct evmc_host_context* example_host_create_context(struct evmc_tx_context tx_context);
 

diff --git a/examples/example_vm/.clang-tidy b/examples/example_vm/.clang-tidy
@@ -0,0 +1,3 @@
+InheritParentConfig: true
+Checks: >
+  -misc-const-correctness
diff --git a/lib/loader/loader.c b/lib/loader/loader.c
@@ -183,7 +183,7 @@ evmc_create_fn evmc_load(const char* filename, enum evmc_loader_error_code* erro
     return create_fn;
 }
 
-const char* evmc_last_error_msg()
+const char* evmc_last_error_msg(void)
 {
     const char* m = last_error_msg;
     last_error_msg = NULL;

diff --git a/test/compilation/compilation_test.cxx b/test/compilation/compilation_test.cxx
@@ -6,21 +6,21 @@
 
 #include <evmc/evmc.h>
 #include <evmc/evmc.hpp>
+#include <evmc/filter_iterator.hpp>
 #include <evmc/helpers.h>
+#include <evmc/hex.hpp>
 #include <evmc/instructions.h>
 #include <evmc/loader.h>
 #include <evmc/mocked_host.hpp>
 #include <evmc/utils.h>
-#include <evmc/hex.hpp>
-#include <evmc/filter_iterator.hpp>
 
 // Include again to check if headers have proper include guards.
-#include <evmc/evmc.h>
-#include <evmc/evmc.hpp>
-#include <evmc/helpers.h>
-#include <evmc/instructions.h>
-#include <evmc/loader.h>
-#include <evmc/mocked_host.hpp>
-#include <evmc/utils.h>
-#include <evmc/hex.hpp>
-#include <evmc/filter_iterator.hpp>
+#include <evmc/evmc.h>               //NOLINT(readability-duplicate-include)
+#include <evmc/evmc.hpp>             //NOLINT(readability-duplicate-include)
+#include <evmc/filter_iterator.hpp>  //NOLINT(readability-duplicate-include)
+#include <evmc/helpers.h>            //NOLINT(readability-duplicate-include)
+#include <evmc/hex.hpp>              //NOLINT(readability-duplicate-include)
+#include <evmc/instructions.h>       //NOLINT(readability-duplicate-include)
+#include <evmc/loader.h>             //NOLINT(readability-duplicate-include)
+#include <evmc/mocked_host.hpp>      //NOLINT(readability-duplicate-include)
+#include <evmc/utils.h>              //NOLINT(readability-duplicate-include)
diff --git a/test/unittests/cpp_test.cpp b/test/unittests/cpp_test.cpp
@@ -371,14 +371,14 @@ TEST(cpp, literals)
               evmc::bytes32{});
 
     auto a1 = 0xa0a1a2a3a4a5a6a7a8a9d0d1d2d3d4d5d6d7d8d9_address;
-    evmc::address e1{{{0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9,
-                       0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9}}};
+    const evmc::address e1{{{0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9,
+                             0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9}}};
     EXPECT_EQ(a1, e1);
 
     auto h1 = 0x01020304050607080910a1a2a3a4a5a6a7a8a9b0c1c2c3c4c5c6c7c8c9d0d1d2_bytes32;
-    evmc::bytes32 f1{{{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0xa1,
-                       0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xb0, 0xc1, 0xc2,
-                       0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd0, 0xd1, 0xd2}}};
+    const evmc::bytes32 f1{{{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0xa1,
+                             0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xb0, 0xc1, 0xc2,
+                             0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xd0, 0xd1, 0xd2}}};
     EXPECT_EQ(h1, f1);
 }
 
@@ -532,7 +532,7 @@ TEST(cpp, vm_set_option_in_constructor)
 
 TEST(cpp, vm_null)
 {
-    evmc::VM vm;
+    const evmc::VM vm;
     EXPECT_FALSE(vm);
     EXPECT_TRUE(!vm);
     EXPECT_EQ(vm.get_raw_pointer(), nullptr);
@@ -622,7 +622,7 @@ TEST(cpp, vm_execute_with_null_host)
     auto host = NullHost{};
 
     auto vm = evmc::VM{evmc_create_example_vm()};
-    evmc_message msg{};
+    const evmc_message msg{};
     auto res = vm.execute(host, EVMC_FRONTIER, msg, nullptr, 0);
     EXPECT_EQ(res.status_code, EVMC_SUCCESS);
     EXPECT_EQ(res.gas_left, 0);
@@ -943,7 +943,7 @@ TEST(cpp, status_code_to_string_invalid)
     if (!has_ubsan())
     {
         std::ostringstream os;
-        int value = 99;
+        int value = 99;  // NOLINT(misc-const-correctness) Not const because GCC complains.
         const auto invalid = static_cast<evmc_status_code>(value);
         EXPECT_STREQ(evmc::to_string(invalid), "<unknown>");
         os << invalid;
@@ -956,7 +956,7 @@ TEST(cpp, revision_to_string_invalid)
     if (!has_ubsan())
     {
         std::ostringstream os;
-        int value = 99;
+        int value = 99;  // NOLINT(misc-const-correctness) Not const because GCC complains.
         const auto invalid = static_cast<evmc_revision>(value);
         EXPECT_STREQ(evmc::to_string(invalid), "<unknown>");
         os << invalid;

diff --git a/test/unittests/loader_mock.h b/test/unittests/loader_mock.h
@@ -42,7 +42,7 @@ static evmc_create_fn evmc_test_get_symbol_address(int handle, const char* symbo
     return NULL;
 }
 
-static const char* evmc_test_get_last_error_msg()
+static const char* evmc_test_get_last_error_msg(void)
 {
     // Return the last error message only once.
     const char* m = evmc_test_last_error_msg;

diff --git a/test/unittests/loader_test.cpp b/test/unittests/loader_test.cpp
@@ -277,7 +277,7 @@ TEST_F(loader, load_windows_path)
 
     for (auto& path : paths)
     {
-        bool should_open = is_windows || std::strchr(path, '\\') == nullptr;
+        const bool should_open = is_windows || std::strchr(path, '\\') == nullptr;
         setup(should_open ? path : nullptr, "evmc_create_eee_bbb", create_eee_bbb);
 
         evmc_loader_error_code ec = EVMC_LOADER_UNSPECIFIED_ERROR;

diff --git a/tools/evmc/main.cpp b/tools/evmc/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, const char** argv) noexcept
 
     try
     {
-        HexOrFileValidator HexOrFile;
+        const HexOrFileValidator HexOrFile;
 
         std::string vm_config;
         std::string code_arg;

diff --git a/tools/vmtester/tests.cpp b/tools/vmtester/tests.cpp
@@ -55,10 +55,10 @@ TEST_F(evmc_vm_test, capabilities)
 TEST_F(evmc_vm_test, execute_call)
 {
     evmc::MockedHost mockedHost;
-    evmc_message msg{};
+    const evmc_message msg{};
     std::array<uint8_t, 2> code = {{0xfe, 0x00}};
 
-    evmc_result result =
+    const evmc_result result =
         vm->execute(vm, &evmc::MockedHost::get_interface(), mockedHost.to_context(),
                     EVMC_MAX_REVISION, &msg, code.data(), code.size());
 
@@ -87,20 +87,20 @@ TEST_F(evmc_vm_test, execute_call)
 TEST_F(evmc_vm_test, execute_create)
 {
     evmc::MockedHost mockedHost;
-    evmc_message msg{EVMC_CREATE,
-                     0,
-                     0,
-                     65536,
-                     evmc_address{},
-                     evmc_address{},
-                     nullptr,
-                     0,
-                     evmc_uint256be{},
-                     evmc_bytes32{},
-                     evmc_address{}};
+    const evmc_message msg{EVMC_CREATE,
+                           0,
+                           0,
+                           65536,
+                           evmc_address{},
+                           evmc_address{},
+                           nullptr,
+                           0,
+                           evmc_uint256be{},
+                           evmc_bytes32{},
+                           evmc_address{}};
     std::array<uint8_t, 2> code = {{0xfe, 0x00}};
 
-    evmc_result result =
+    const evmc_result result =
         vm->execute(vm, &evmc::MockedHost::get_interface(), mockedHost.to_context(),
                     EVMC_MAX_REVISION, &msg, code.data(), code.size());
 
@@ -142,7 +142,7 @@ TEST_F(evmc_vm_test, set_option_empty_value)
 {
     if (vm->set_option != nullptr)
     {
-        evmc_set_option_result r = vm->set_option(vm, "unknown_option_csk9twq", nullptr);
+        const auto r = vm->set_option(vm, "unknown_option_csk9twq", nullptr);
         EXPECT_EQ(r, EVMC_SET_OPTION_INVALID_NAME);
     }
 }
@@ -178,19 +178,20 @@ TEST_F(evmc_vm_test, precompile_test)
         addr.bytes[18] = static_cast<uint8_t>(i >> 8);
         addr.bytes[19] = static_cast<uint8_t>(i & 0xff);
 
-        evmc_message msg{EVMC_CALL,
-                         0,
-                         0,
-                         65536,
-                         evmc_address{},
-                         evmc_address{},
-                         nullptr,
-                         0,
-                         evmc_uint256be{},
-                         evmc_bytes32{},
-                         addr};
-
-        evmc_result result = vm->execute(vm, nullptr, nullptr, EVMC_MAX_REVISION, &msg, nullptr, 0);
+        const evmc_message msg{EVMC_CALL,
+                               0,
+                               0,
+                               65536,
+                               evmc_address{},
+                               evmc_address{},
+                               nullptr,
+                               0,
+                               evmc_uint256be{},
+                               evmc_bytes32{},
+                               addr};
+
+        const evmc_result result =
+            vm->execute(vm, nullptr, nullptr, EVMC_MAX_REVISION, &msg, nullptr, 0);
 
         // Validate some constraints