Merge pull request #17121 from walnuthq/build/json-explicit-conversions

Disable implicit conversions from JSON values

Author: clonker

CMakeLists.txt

@@ -68,6 +68,10 @@ else ()
   find_package(nlohmann_json REQUIRED)
   find_package(range-v3 REQUIRED)
 endif()
+add_compile_definitions(JSON_USE_IMPLICIT_CONVERSIONS=0)
+# TODO: Remove once the emscripten build uses emscripten >= 4.0.0, whose standard library
+# defines __cpp_lib_three_way_comparison.
+add_compile_definitions(JSON_HAS_THREE_WAY_COMPARISON=1)
 
 find_package(Threads)
 

libsolidity/interface/StandardCompiler.cpp

@@ -710,7 +710,6 @@ std::variant<StandardCompiler::InputsAndSettings, Json> StandardCompiler::parseI
 		return formatFatalError(Error::Type::JSONError, "No input sources specified.");
 
 	ret.errors = Json::array();
-	ret.sources = Json::object();
 
 	if (ret.language == "Solidity" || ret.language == "Yul")
 	{

libsolutil/JSON.h

@@ -26,8 +26,11 @@
 #include <libsolutil/Assertions.h>
 #include <nlohmann/json.hpp>
 
+#include <compare>
+#include <concepts>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <optional>
 #include <limits>
 
@@ -36,6 +39,10 @@ namespace solidity
 
 using Json = nlohmann::json;
 
+// Comparisons of tuples, pairs and containers of JSON values go through operator<=>, which must
+// compare the values rather than only their types.
+static_assert(std::same_as<decltype(std::declval<Json const&>() <=> std::declval<Json const&>()), std::partial_ordering>);
+
 } // namespace solidity
 
 namespace solidity::util

test/libevmasm/Assembler.cpp

@@ -460,23 +460,23 @@ BOOST_AUTO_TEST_CASE(ethdebug_resources)
 		},
 		"version1"
 	);
-	std::string const compilationID = resources["compilation"]["id"];
+	std::string const compilationID = resources["compilation"]["id"].get<std::string>();
 	BOOST_REQUIRE(compilationID.substr(0, 5) == "solc-");
 	std::string const repeatedCompilationID = ethdebug::resources(
 		{
 			{.id = 0, .path = "sourceA", .contents = "contentsA", .language = "Solidity"},
 			{.id = 1, .path = "sourceB", .contents = "contentsB", .language = "Yul"}
 		},
 		"version1"
-	)["compilation"]["id"];
+	)["compilation"]["id"].get<std::string>();
 	BOOST_REQUIRE(compilationID == repeatedCompilationID);
 	std::string const changedCompilationID = ethdebug::resources(
 		{
 			{.id = 0, .path = "sourceA", .contents = "changedContentsA", .language = "Solidity"},
 			{.id = 1, .path = "sourceB", .contents = "contentsB", .language = "Yul"}
 		},
 		"version1"
-	)["compilation"]["id"];
+	)["compilation"]["id"].get<std::string>();
 	BOOST_REQUIRE(compilationID != changedCompilationID);
 	BOOST_REQUIRE(resources["types"].is_object());
 	BOOST_REQUIRE(resources["types"].empty());

test/libsolidity/StandardCompiler.cpp

@@ -2294,7 +2294,7 @@ BOOST_DATA_TEST_CASE(ethdebug_output_instructions_smoketest, boost::unit_test::d
 			BOOST_REQUIRE(instruction["context"]["code"]["range"].contains("offset"));
 			BOOST_REQUIRE(instruction["context"]["code"]["source"].contains("id"));
 		}
-		std::string mnemonic = instruction["operation"]["mnemonic"];
+		std::string mnemonic = instruction["operation"]["mnemonic"].get<std::string>();
 		if (mnemonic.find("PUSH") != std::string::npos)
 		{
 			size_t bytesToPush = boost::lexical_cast<size_t>(mnemonic.substr(4));
@@ -2303,7 +2303,7 @@ BOOST_DATA_TEST_CASE(ethdebug_output_instructions_smoketest, boost::unit_test::d
 				BOOST_REQUIRE(instruction["operation"].contains("arguments"));
 				BOOST_REQUIRE(instruction["operation"]["arguments"].is_array());
 				BOOST_REQUIRE(instruction["operation"]["arguments"].size() == 1);
-				std::string argument = instruction["operation"]["arguments"][0];
+				std::string argument = instruction["operation"]["arguments"][0].get<std::string>();
 				BOOST_REQUIRE(argument.length() % 2 == 0);
 				BOOST_REQUIRE(bytesToPush == (argument.length() - 2) / 2); // remove "0x" and calculate actual byte size from hex.
 			}