Basic vcpkg.

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/aarlt/vcpkg.git

CMakeLists.txt

@@ -1,5 +1,21 @@
 cmake_minimum_required(VERSION 3.13.0)
 
+#set(vcpkg "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake")
+#if (NOT CMAKE_TOOLCHAIN_FILE)
+#    if (EXISTS "${vcpkg}")
+#        set(CMAKE_TOOLCHAIN_FILE "${vcpkg}"
+#                CACHE FILEPATH "CMake toolchain file")
+#    else()
+#        set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake"
+#                CACHE FILEPATH "CMake toolchain file")
+#    endif()
+#    message(STATUS "vcpkg toolchain found: ${CMAKE_TOOLCHAIN_FILE}")
+#endif ()
+
+set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake"
+        CACHE FILEPATH "CMake toolchain file")
+message(STATUS "vcpkg toolchain found: ${CMAKE_TOOLCHAIN_FILE}")
+
 set(ETH_CMAKE_DIR   "${CMAKE_CURRENT_LIST_DIR}/cmake"   CACHE PATH "The the path to the cmake directory")
 list(APPEND CMAKE_MODULE_PATH ${ETH_CMAKE_DIR})
 
@@ -41,10 +57,10 @@ include(EthCcache)
 
 # Let's find our dependencies
 include(EthDependencies)
-include(fmtlib)
-include(jsoncpp)
-include(range-v3)
-include_directories(SYSTEM ${JSONCPP_INCLUDE_DIR})
+find_package(Boost REQUIRED COMPONENTS filesystem system unit_test_framework program_options)
+find_package(fmt CONFIG REQUIRED)
+find_package(jsoncpp CONFIG REQUIRED)
+find_package(range-v3 CONFIG REQUIRED)
 
 find_package(Threads)
 

libevmasm/Assembly.cpp

@@ -426,7 +426,7 @@ map<u256, u256> const& Assembly::optimiseInternal(
 			AssemblyItems optimisedItems;
 
 			bool usesMSize = ranges::any_of(m_items, [](AssemblyItem const& _i) {
-				return _i == AssemblyItem{Instruction::MSIZE} || _i.type() == VerbatimBytecode;
+				return _i == AssemblyItem{Instruction::_MSIZE} || _i.type() == VerbatimBytecode;
 			});
 
 			auto iter = m_items.begin();

libevmasm/Instruction.cpp

@@ -90,7 +90,7 @@ std::map<std::string, Instruction> const solidity::evmasm::c_instructions =
 	{ "JUMP", Instruction::JUMP },
 	{ "JUMPI", Instruction::JUMPI },
 	{ "PC", Instruction::PC },
-	{ "MSIZE", Instruction::MSIZE },
+	{ "MSIZE", Instruction::_MSIZE},
 	{ "GAS", Instruction::GAS },
 	{ "JUMPDEST", Instruction::JUMPDEST },
 	{ "PUSH1", Instruction::PUSH1 },
@@ -237,7 +237,7 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{ Instruction::JUMP,		{ "JUMP",			0, 1, 0, true, Tier::Mid } },
 	{ Instruction::JUMPI,		{ "JUMPI",			0, 2, 0, true, Tier::High } },
 	{ Instruction::PC,			{ "PC",				0, 0, 1, false, Tier::Base } },
-	{ Instruction::MSIZE,		{ "MSIZE",			0, 0, 1, false, Tier::Base } },
+	{ Instruction::_MSIZE,		{ "MSIZE",			0, 0, 1, false, Tier::Base } },
 	{ Instruction::GAS,			{ "GAS",			0, 0, 1, false, Tier::Base } },
 	{ Instruction::JUMPDEST,	{ "JUMPDEST",		0, 0, 0, true, Tier::Special } },
 	{ Instruction::PUSH1,		{ "PUSH1",			1, 0, 1, false, Tier::VeryLow } },

libevmasm/Instruction.h

@@ -98,7 +98,7 @@ enum class Instruction: uint8_t
 	JUMP,				///< alter the program counter
 	JUMPI,				///< conditionally alter the program counter
 	PC,					///< get the program counter
-	MSIZE,				///< get the size of active memory
+	_MSIZE,				///< get the size of active memory
 	GAS,				///< get the amount of available gas
 	JUMPDEST,			///< set a potential jump destination
 

libevmasm/SemanticInformation.cpp

@@ -141,7 +141,7 @@ vector<SemanticInformation::Operation> SemanticInformation::readWriteOperations(
 			Operation{Location::Storage, Effect::Read, {}, {}, {}},
 			Operation{Location::Storage, Effect::Write, {}, {}, {}}
 		};
-	case Instruction::MSIZE:
+	case Instruction::_MSIZE:
 		// This is just to satisfy the assert below.
 		return vector<Operation>{};
 	default:
@@ -176,7 +176,7 @@ bool SemanticInformation::breaksCSEAnalysisBlock(AssemblyItem const& _item, bool
 			return false;
 		if (_item.instruction() == Instruction::GAS || _item.instruction() == Instruction::PC)
 			return true; // GAS and PC assume a specific order of opcodes
-		if (_item.instruction() == Instruction::MSIZE)
+		if (_item.instruction() == Instruction::_MSIZE)
 			return true; // msize is modified already by memory access, avoid that for now
 		InstructionInfo info = instructionInfo(_item.instruction());
 		if (_item.instruction() == Instruction::SSTORE)
@@ -300,7 +300,7 @@ bool SemanticInformation::isDeterministic(AssemblyItem const& _item)
 	case Instruction::CREATE2:
 	case Instruction::GAS:
 	case Instruction::PC:
-	case Instruction::MSIZE: // depends on previous writes and reads, not only on content
+	case Instruction::_MSIZE: // depends on previous writes and reads, not only on content
 	case Instruction::BALANCE: // depends on previous calls
 	case Instruction::SELFBALANCE: // depends on previous calls
 	case Instruction::EXTCODESIZE:
@@ -331,7 +331,7 @@ bool SemanticInformation::movable(Instruction _instruction)
 	case Instruction::RETURNDATASIZE:
 	case Instruction::SLOAD:
 	case Instruction::PC:
-	case Instruction::MSIZE:
+	case Instruction::_MSIZE:
 	case Instruction::GAS:
 		return false;
 	default:
@@ -376,7 +376,7 @@ SemanticInformation::Effect SemanticInformation::memory(Instruction _instruction
 	case Instruction::CREATE2:
 	case Instruction::KECCAK256:
 	case Instruction::MLOAD:
-	case Instruction::MSIZE:
+	case Instruction::_MSIZE:
 	case Instruction::RETURN:
 	case Instruction::REVERT:
 	case Instruction::LOG0:

libevmasm/SimplificationRule.h

@@ -134,7 +134,7 @@ struct EVMBuiltins
 	static auto constexpr SLOAD = PatternGenerator<Instruction::SLOAD>{};
 	static auto constexpr SSTORE = PatternGenerator<Instruction::SSTORE>{};
 	static auto constexpr PC = PatternGenerator<Instruction::PC>{};
-	static auto constexpr MSIZE = PatternGenerator<Instruction::MSIZE>{};
+	static auto constexpr MSIZE = PatternGenerator<Instruction::_MSIZE>{};
 	static auto constexpr GAS = PatternGenerator<Instruction::GAS>{};
 	static auto constexpr LOG0 = PatternGenerator<Instruction::LOG0>{};
 	static auto constexpr LOG1 = PatternGenerator<Instruction::LOG1>{};

libsolutil/CMakeLists.txt

@@ -42,7 +42,7 @@ set(sources
 )
 
 add_library(solutil ${sources})
-target_link_libraries(solutil PUBLIC jsoncpp Boost::boost Boost::filesystem Boost::system range-v3)
+target_link_libraries(solutil PRIVATE Boost::boost Boost::filesystem Boost::system range-v3 jsoncpp_static)
 target_include_directories(solutil PUBLIC "${CMAKE_SOURCE_DIR}")
 add_dependencies(solutil solidity_BuildInfo.h)
 

libsolutil/JSON.cpp

@@ -33,8 +33,8 @@
 using namespace std;
 
 static_assert(
-	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 3),
-	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.3."
+	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 5),
+	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.5."
 );
 
 namespace solidity::util

libyul/backends/evm/EVMDialect.cpp

@@ -71,7 +71,7 @@ pair<YulString, BuiltinFunctionForEVM> createEVMFunction(
 			f.controlFlowSideEffects.canRevert = false;
 		}
 	}
-	f.isMSize = _instruction == evmasm::Instruction::MSIZE;
+	f.isMSize = _instruction == evmasm::Instruction::_MSIZE;
 	f.literalArguments.clear();
 	f.instruction = _instruction;
 	f.generateCode = [_instruction](