Merge pull request #5716 from ethereum/fixDataSizeOffset

Fix data size offset and properly provide builtins.

2 files changed, 44 insertions, 0 deletions

diff --git a/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/object_access.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/object_access.yul
new file mode 100644
index 00000000..5cfa3e6e
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/object_access.yul
@@ -0,0 +1,23 @@
+{
+    // Arguments to ``datasize`` and ``dataoffset`` need to be
+    // literals. We cannot simplify their arguments, but we can
+    // simplify them as a full expression.
+    // ``datacopy`` does not have this restriction.
+    let r := "abc"
+    let a := datasize("abc")
+    let x := dataoffset("abc")
+    // should be replaced by a
+    let y := datasize("abc")
+    datacopy("abc", x, y)
+    mstore(a, x)
+}
+// ----
+// commonSubexpressionEliminator
+// {
+//     let r := "abc"
+//     let a := datasize("abc")
+//     let x := dataoffset("abc")
+//     let y := a
+//     datacopy(r, x, a)
+//     mstore(a, x)
+// }
diff --git a/test/libyul/yulOptimizerTests/expressionSplitter/object_access.yul b/test/libyul/yulOptimizerTests/expressionSplitter/object_access.yul
new file mode 100644
index 00000000..2689ab6f
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/expressionSplitter/object_access.yul
@@ -0,0 +1,21 @@
+{
+    // We should never split arguments to ``dataoffset``
+    // or ``datasize`` because they need to be literals
+    let x := dataoffset("abc")
+    let y := datasize("abc")
+    // datacopy is fine, though
+    datacopy(mload(0), mload(1), mload(2))
+}
+// ----
+// expressionSplitter
+// {
+//     let x := dataoffset("abc")
+//     let y := datasize("abc")
+//     let _1 := 2
+//     let _2 := mload(_1)
+//     let _3 := 1
+//     let _4 := mload(_3)
+//     let _5 := 0
+//     let _6 := mload(_5)
+//     datacopy(_6, _4, _2)
+// }