From 94bfae1a941606bd3f90f1c2bf8dcae45dbc904a Mon Sep 17 00:00:00 2001
From: "gmh5225.eth" <13917777+gmh5225@users.noreply.github.com>
Date: Tue, 24 Dec 2024 22:34:07 +0800
Subject: [PATCH 1/2] fix compilation error on MSVC

---
 liblangutil/EVMVersion.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/liblangutil/EVMVersion.cpp b/liblangutil/EVMVersion.cpp
index 6f7ac91397d9..832b6ebaaf6b 100644
--- a/liblangutil/EVMVersion.cpp
+++ b/liblangutil/EVMVersion.cpp
@@ -19,8 +19,9 @@
  * EVM versioning.
  */
 
-#include <liblangutil/EVMVersion.h>
 #include <libevmasm/Instruction.h>
+#include <liblangutil/EVMVersion.h>
+
 
 using namespace solidity;
 using namespace solidity::evmasm;
@@ -29,7 +30,7 @@ using namespace solidity::langutil;
 bool EVMVersion::hasOpcode(Instruction _opcode, std::optional<uint8_t> _eofVersion) const
 {
 	// EOF version can be only defined since prague
-	assert(!_eofVersion.has_value() || this->m_version >= prague());
+	assert(!_eofVersion.has_value() || static_cast<int>(m_version) >= static_cast<int>(prague().m_version));
 
 	switch (_opcode)
 	{

From 9446ea1a12385226b26d3ee5229d66e8de9eda92 Mon Sep 17 00:00:00 2001
From: gmh5225 <2315157@qq.com>
Date: Sat, 28 Dec 2024 02:55:00 +0800
Subject: [PATCH 2/2] Fix MSVC compilation error on EVMVersion comparison

---
 liblangutil/EVMVersion.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/liblangutil/EVMVersion.cpp b/liblangutil/EVMVersion.cpp
index 832b6ebaaf6b..ac087b8fcc47 100644
--- a/liblangutil/EVMVersion.cpp
+++ b/liblangutil/EVMVersion.cpp
@@ -19,9 +19,8 @@
  * EVM versioning.
  */
 
-#include <libevmasm/Instruction.h>
 #include <liblangutil/EVMVersion.h>
-
+#include <libevmasm/Instruction.h>
 
 using namespace solidity;
 using namespace solidity::evmasm;
@@ -30,7 +29,7 @@ using namespace solidity::langutil;
 bool EVMVersion::hasOpcode(Instruction _opcode, std::optional<uint8_t> _eofVersion) const
 {
 	// EOF version can be only defined since prague
-	assert(!_eofVersion.has_value() || static_cast<int>(m_version) >= static_cast<int>(prague().m_version));
+	assert(!_eofVersion.has_value() || *this >= prague());
 
 	switch (_opcode)
 	{