From 49a0948d921226bc5b3840a2955ea2d6238943bc Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Wed, 17 May 2023 13:29:08 -0500
Subject: [PATCH] [test] import/export: Add simple yul reimport bytecode
 equivalance test.

---
 libevmasm/Assembly.cpp   | 13 +++++----
 scripts/ASTImportTest.sh | 62 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 07030448f..53683381f 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -567,11 +567,14 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 			Json::Value const& code = data[dataItemID];
 			if (code.isString())
 			{
-				bytes data_value{fromHex(code.asString())};
-				solRequire(
-					!data_value.empty(),
-					AssemblyImportException,
-					"Member '.data' contains a value for '" + dataItemID + "' that is not a valid hexadecimal string.");
+				if (!code.asString().empty())
+				{
+					bytes data_value{fromHex(code.asString())};
+					solRequire(
+						!data_value.empty(),
+						AssemblyImportException,
+						"Member '.data' contains a value for '" + dataItemID + "' that is not a valid hexadecimal string.");
+				}
 				result->m_data[h256(fromHex(dataItemID))] = fromHex(code.asString());
 			}
 			else if (code.isObject())
diff --git a/scripts/ASTImportTest.sh b/scripts/ASTImportTest.sh
index 3b732569b..1fab7733b 100755
--- a/scripts/ASTImportTest.sh
+++ b/scripts/ASTImportTest.sh
@@ -109,6 +109,8 @@ done
 SYNTAXTESTS_DIR="${REPO_ROOT}/test/libsolidity/syntaxTests"
 ASTJSONTESTS_DIR="${REPO_ROOT}/test/libsolidity/ASTJSON"
 SEMANTICTESTS_DIR="${REPO_ROOT}/test/libsolidity/semanticTests"
+YULTESTS_DIR="${REPO_ROOT}/test/libyul"
+
 
 FAILED=0
 UNCOMPILABLE=0
@@ -519,6 +521,66 @@ case "${IMPORT_TEST_TYPE}" in
     *) assertFail "Import test type not defined. $(print_usage || true)}" ;;
 esac
 
+if [[ "${IMPORT_TEST_TYPE}" == "evm-assembly" ]]
+then
+    IMPORT_TEST_FILES=$(find "${YULTESTS_DIR}" -name "*.yul")
+    NSOURCES="$(echo "${IMPORT_TEST_FILES}" | wc -l)"
+    echo "Looking at ${NSOURCES} .yul files..."
+    for yulfile in ${IMPORT_TEST_FILES}
+    do
+        echo -n "·"
+        # create a temporary sub-directory
+        FILETMP=$(mktemp -d)
+        cd "${FILETMP}"
+
+        set +e
+        output=$("${SOLC}" "--strict-assembly" "${yulfile}" "--bin" "--optimize" 2>/dev/null)
+        solc_return_code=$?
+        set -e
+
+        # if yul file got compiled with success.
+        if (( solc_return_code == 0 ))
+        then
+            yul_bin="$(basename "$yulfile").bin"
+            yul_json="$(basename "$yulfile").asm.json"
+            echo "$output" > "${yul_bin}"
+            grep -v -e '^=======' -e '^Binary representation:' "${yul_bin}" > tmpfile && mv tmpfile "${yul_bin}"
+            # remove all white-spaces. we only want the binary.
+            tr -d '[:space:]' < "${yul_bin}" > tmpfile && mv tmpfile "${yul_bin}"
+            # only compare bytecode, if bytecode got generated.
+            if [[ -s "${yul_bin}" ]]
+            then
+                # take the yul file and export it as evm assembly json. save the result in "$yul_json".
+                run_solc_store_stdout "${yul_json}" --strict-assembly "${yulfile}" --optimize --asm-json --pretty-json --json-indent 4
+                # remove the lines containing '=======', so that we just have a nice json file.
+                grep -v '^=======' "${yul_json}" > tmpfile && mv tmpfile "${yul_json}"
+
+                # import the created evm assembly json file and create a combined json out of it.
+                run_solc_store_stdout "${yul_json}.combined.json" --combined-json "bin" --pretty-json --json-indent 4 --import-asm-json "${yul_json}"
+                # split the combined json into different files.
+                split_combined_json "${yul_json}.combined.json" . "compiled"
+                tr -d '[:space:]' < "compiled.bin" > tmpfile && mv tmpfile "compiled.bin"
+
+                if ! diff_files compiled.bin "${yul_bin}" > diff_error
+                then
+                    diff_error=$(cat diff_error)
+                    printError "ERROR: diff failed ${file} ${imported}:\n   ${diff_error}"
+                    if (( EXIT_ON_ERROR == 1 ))
+                    then
+                        print_used_commands "${PWD}" "${export_command[*]}" "${import_command[*]}"
+                        exit 1
+                    fi
+                    return 1
+                fi
+            fi
+        fi
+        cd "${WORKINGDIR}"
+        # Delete temporary files
+        rm -rf "${FILETMP}"
+    done
+    echo
+fi
+
 # boost_filesystem_bug specifically tests a local fix for a boost::filesystem
 # bug. Since the test involves a malformed path, there is no point in running
 # tests on it. See https://github.com/boostorg/filesystem/issues/176