Merge pull request ethereum#13587 from ethereum/forward-declare-enum

[Trivial] Forward declare Instruction enum in EVMVersion
sgilflores3 · Oct 20, 2022 · 673b481 · 673b481
2 parents 4679ae0 + 9e674ba
commit 673b481
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 2 deletions.
diff --git a/liblangutil/EVMVersion.cpp b/liblangutil/EVMVersion.cpp
@@ -20,6 +20,7 @@
  */
 
 #include <liblangutil/EVMVersion.h>
+#include <libevmasm/Instruction.h>
 
 using namespace solidity;
 using namespace solidity::evmasm;

diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
@@ -21,14 +21,18 @@
 
 #pragma once
 
-#include <libevmasm/Instruction.h>
-
 #include <optional>
 #include <string>
 
 #include <boost/operators.hpp>
 
 
+namespace solidity::evmasm
+{
+/// Virtual machine bytecode instruction. Forward declared from libevmasm/Instruction.h
+enum class Instruction: uint8_t;
+}
+
 namespace solidity::langutil
 {
 

diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
@@ -35,6 +35,8 @@
 #include <libsolutil/StringUtils.h>
 #include <libsolutil/Visitor.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <boost/algorithm/string.hpp>
 
 #include <fmt/format.h>

diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -30,6 +30,8 @@
 
 #include <liblangutil/Exceptions.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <range/v3/view/reverse.hpp>
 
 #include <range/v3/algorithm/max.hpp>

diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -23,6 +23,8 @@
 
 #include <libyul/Utilities.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <libsolutil/Visitor.h>
 #include <libsolutil/cxx20.h>
 

diff --git a/libyul/optimiser/ReasoningBasedSimplifier.cpp b/libyul/optimiser/ReasoningBasedSimplifier.cpp
@@ -28,6 +28,8 @@
 
 #include <libsolutil/CommonData.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <utility>
 #include <memory>