Fix build/analysis with Clang 18 (#756)

ethereum · Dec 21, 2023 · 9b5cc58 · 9b5cc58
2 parents b2337d4 + d74b83a
commit 9b5cc58
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 22 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -46,12 +46,14 @@ Checks: >
   hicpp-multiway-paths-covered,
   hicpp-no-assembler,
   misc-*,
-  -misc-use-anonymous-namespace,
+  -misc-include-cleaner,
   -misc-non-private-member-variables-in-classes,
+  -misc-use-anonymous-namespace,
   modernize-*,
   -modernize-avoid-c-arrays,
   -modernize-use-trailing-return-type,
   performance-*,
+  -performance-enum-size,
   portability-*,
   readability-*,
   -readability-braces-around-statements,

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,9 +48,9 @@ if(CABLE_COMPILER_GNULIKE)
     add_compile_options(
         -Wmissing-declarations
         $<$<COMPILE_LANGUAGE:CXX>:-Wextra-semi>
+        $<$<COMPILE_LANGUAGE:CXX>:-Wno-missing-field-initializers>
 
         $<$<CXX_COMPILER_ID:GNU>:-Wno-attributes>
-        $<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-missing-field-initializers>
         $<$<CXX_COMPILER_ID:GNU>:-Wduplicated-cond>
         $<$<CXX_COMPILER_ID:GNU>:-Wlogical-op>
 

diff --git a/lib/evmone/advanced_analysis.hpp b/lib/evmone/advanced_analysis.hpp
@@ -135,7 +135,7 @@ using instruction_exec_fn = const Instruction* (*)(const Instruction*, AdvancedE
 ///
 /// These intrinsic instructions may be injected to the code in the analysis phase.
 /// They contain additional and required logic to be executed by the interpreter.
-enum intrinsic_opcodes
+enum intrinsic_opcodes : uint8_t
 {
     /// The BEGINBLOCK instruction.
     ///

diff --git a/test/t8n/t8n.cpp b/test/t8n/t8n.cpp
@@ -246,7 +246,7 @@ int main(int argc, const char* argv[])
     }
     catch (const std::exception& e)
     {
-        std::cerr << e.what() << std::endl;
+        std::cerr << e.what() << '\n';
         return 1;
     }
 

diff --git a/test/unittests/eof_validation_test.cpp b/test/unittests/eof_validation_test.cpp
@@ -26,6 +26,8 @@ TEST(eof_validation, get_error_message)
     EXPECT_EQ(evmone::get_error_message(EOFValidationError::invalid_prefix), "invalid_prefix");
     EXPECT_EQ(evmone::get_error_message(EOFValidationError::stack_overflow), "stack_overflow");
     EXPECT_EQ(evmone::get_error_message(EOFValidationError::impossible), "impossible");
+
+    // NOLINTNEXTLINE(*.EnumCastOutOfRange)
     EXPECT_EQ(evmone::get_error_message(static_cast<EOFValidationError>(-1)), "<unknown>");
 }
 

diff --git a/test/unittests/evm_test.cpp b/test/unittests/evm_test.cpp
@@ -641,10 +641,7 @@ TEST_P(evm, undefined_instruction_analysis_overflow)
 {
     rev = EVMC_PETERSBURG;
 
-    auto undefined_opcode = static_cast<Opcode>(0x0c);
-    auto code = bytecode{undefined_opcode};
-
-    execute(code);
+    execute(bytecode{"0c"});  // undefined opcode
     EXPECT_EQ(result.status_code, EVMC_UNDEFINED_INSTRUCTION);
 }
 

diff --git a/test/unittests/execution_state_test.cpp b/test/unittests/execution_state_test.cpp
@@ -7,17 +7,17 @@
 #include <gtest/gtest.h>
 #include <type_traits>
 
-static_assert(std::is_default_constructible<evmone::ExecutionState>::value);
-static_assert(!std::is_move_constructible<evmone::ExecutionState>::value);
-static_assert(!std::is_copy_constructible<evmone::ExecutionState>::value);
-static_assert(!std::is_move_assignable<evmone::ExecutionState>::value);
-static_assert(!std::is_copy_assignable<evmone::ExecutionState>::value);
-
-static_assert(std::is_default_constructible<evmone::advanced::AdvancedExecutionState>::value);
-static_assert(!std::is_move_constructible<evmone::advanced::AdvancedExecutionState>::value);
-static_assert(!std::is_copy_constructible<evmone::advanced::AdvancedExecutionState>::value);
-static_assert(!std::is_move_assignable<evmone::advanced::AdvancedExecutionState>::value);
-static_assert(!std::is_copy_assignable<evmone::advanced::AdvancedExecutionState>::value);
+static_assert(std::is_default_constructible_v<evmone::ExecutionState>);
+static_assert(!std::is_move_constructible_v<evmone::ExecutionState>);
+static_assert(!std::is_copy_constructible_v<evmone::ExecutionState>);
+static_assert(!std::is_move_assignable_v<evmone::ExecutionState>);
+static_assert(!std::is_copy_assignable_v<evmone::ExecutionState>);
+
+static_assert(std::is_default_constructible_v<evmone::advanced::AdvancedExecutionState>);
+static_assert(!std::is_move_constructible_v<evmone::advanced::AdvancedExecutionState>);
+static_assert(!std::is_copy_constructible_v<evmone::advanced::AdvancedExecutionState>);
+static_assert(!std::is_move_assignable_v<evmone::advanced::AdvancedExecutionState>);
+static_assert(!std::is_copy_assignable_v<evmone::advanced::AdvancedExecutionState>);
 
 TEST(execution_state, construct)
 {

diff --git a/test/unittests/instructions_test.cpp b/test/unittests/instructions_test.cpp
@@ -22,7 +22,7 @@ namespace
 {
 constexpr int unspecified = -1000000;
 
-constexpr int get_revision_defined_in(size_t op) noexcept
+constexpr int get_revision_defined_in(uint8_t op) noexcept
 {
     for (size_t r = EVMC_FRONTIER; r <= EVMC_MAX_REVISION; ++r)
     {
@@ -32,7 +32,7 @@ constexpr int get_revision_defined_in(size_t op) noexcept
     return unspecified;
 }
 
-constexpr bool is_terminating(Opcode op) noexcept
+constexpr bool is_terminating(uint8_t op) noexcept
 {
     switch (op)
     {
@@ -49,7 +49,7 @@ constexpr bool is_terminating(Opcode op) noexcept
     }
 }
 
-template <Opcode Op>
+template <uint8_t Op>
 constexpr void validate_traits_of() noexcept
 {
     constexpr auto tr = instr::traits[Op];