Process subAssemblies ensuring that there are no gaps between the keys

ethereum · Oct 23, 2023 · 840e7e3 · 840e7e3
1 parent b32d5fd
commit 840e7e3
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 56 deletions.
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
@@ -42,6 +42,7 @@
 #include <range/v3/algorithm/any_of.hpp>
 #include <range/v3/view/drop_exactly.hpp>
 #include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/transform.hpp>
 
 #include <fstream>
 #include <limits>
@@ -565,7 +566,7 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 	{
 		solRequire(_json[".data"].isObject(), AssemblyImportException, "Optional member '.data' is not an object.");
 		Json::Value const& data = _json[".data"];
-		size_t subId{};
+		std::map<size_t, std::shared_ptr<Assembly>> subAssemblies{};
 		for (Json::ValueConstIterator dataIter = data.begin(); dataIter != data.end(); dataIter++)
 		{
 			solAssert(dataIter.key().isString());
@@ -599,17 +600,27 @@ std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSO
 				{
 					solThrow(AssemblyImportException, "The key '" + dataItemID + "' inside '.data' is out of the supported integer range.");
 				}
-				solRequire(subId == index, AssemblyImportException, "Invalid order of keys in '.data'. Expect key '" + std::to_string(subId) + "' but got '" + dataItemID + "'.");
 
 				auto [subassembly, emptySourceList] = Assembly::fromJSON(dataItem, _level == 0 ? parsedSourceList : _sourceList, _level + 1);
 				solAssert(subassembly);
 				solAssert(emptySourceList.empty());
-				result->m_subs.emplace_back(subassembly);
-				subId++;
+				subAssemblies[index] = subassembly;
 			}
 			else
 				solThrow(AssemblyImportException, "The value of key '" + dataItemID + "' inside '.data' is neither a hex string nor an object.");
 		}
+
+		size_t subId{};
+		result->m_subs = subAssemblies
+			| ranges::views::transform([&](auto const& _sub) {
+				solRequire(
+					subId == _sub.first,
+					AssemblyImportException,
+					"Invalid order of keys in '.data'. Expect key '" + std::to_string(subId) + "' but got '" + std::to_string(_sub.first) + "'.");
+				subId++;
+				return _sub.second;
+			})
+			| ranges::to<std::vector<std::shared_ptr<Assembly>>>;
 	}
 
 	if (_level == 0)

diff --git a/test/cmdlineTests/asm_json_import_missing_subobjects_indices/stdin b/test/cmdlineTests/asm_json_import_missing_subobjects_indices/stdin
@@ -6,17 +6,16 @@
     }
   ],
   ".data": {
-    "2": {
-      ".code": []
-    },
-    "0": {
-      ".code": []
-    },
-    "4": {
-      ".code": []
-    },
-    "1": {
-      ".code": []
-    }
+    "2": { ".code": [] },
+    "0": { ".code": [] },
+    "4": { ".code": [] },
+    "5": { ".code": [] },
+    "7": { ".code": [] },
+    "6": { ".code": [] },
+    "9": { ".code": [] },
+    "10": { ".code": [] },
+    "1": { ".code": [] },
+    "8": { ".code": [] },
+    "11": { ".code": [] }
   }
 }
diff --git a/test/cmdlineTests/asm_json_import_random_index_ordering/output b/test/cmdlineTests/asm_json_import_random_index_ordering/output
diff --git a/test/cmdlineTests/asm_json_import_random_index_ordering/stdin b/test/cmdlineTests/asm_json_import_random_index_ordering/stdin
diff --git a/...sm_json_import_random_index_ordering/args → ..._json_import_random_order_data_index/args b/...sm_json_import_random_index_ordering/args → ..._json_import_random_order_data_index/args
diff --git a/test/cmdlineTests/asm_json_import_random_order_data_index/output b/test/cmdlineTests/asm_json_import_random_order_data_index/output
@@ -0,0 +1,35 @@
+Opcodes:
+PUSH0 INVALID 
+EVM assembly:
+    /*   */
+  0x00
+stop
+
+sub_0: assembly {
+}
+
+sub_1: assembly {
+    stop
+
+    sub_0: assembly {
+    }
+
+    sub_1: assembly {
+    }
+
+    sub_2: assembly {
+    }
+}
+
+sub_2: assembly {
+    stop
+
+    sub_0: assembly {
+    }
+
+    sub_1: assembly {
+    }
+}
+
+sub_3: assembly {
+}
diff --git a/test/cmdlineTests/asm_json_import_random_order_data_index/stdin b/test/cmdlineTests/asm_json_import_random_order_data_index/stdin
@@ -0,0 +1,27 @@
+{
+  ".code": [
+    {
+      "name": "PUSH",
+      "value": "0"
+    }
+  ],
+  ".data": {
+    "2": {
+      ".code": [],
+      ".data": {
+        "1": { ".code": [] },
+        "0": { ".code": [] }
+      }
+    },
+    "0": { ".code": [] },
+    "1": {
+      ".code": [],
+      ".data": {
+        "1": { ".code": [] },
+        "2": { ".code": [] },
+        "0": { ".code": [] }
+      }
+    },
+    "3": { ".code": [] }
+  }
+}