Update and add tests

matheusaaguiar · matheusaaguiar · commit 22ae336bfacb · 2025-03-26T23:03:14.000-03:00
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/abi_decode.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/abi_decode.sol
@@ -1,3 +1,3 @@
 contract C layout at abi.decode(abi.encode(42), (uint)) {}
 // ----
-// TypeError 6396: (21-55): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (21-55): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/address_constant.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/address_constant.sol
@@ -0,0 +1,6 @@
+address constant x = 0xdCad3a6d3569DF655070DEd06cb7A1b2Ccd1D3AF;
+contract C layout at x {
+
+}
+// ----
+// TypeError 6396: (86-87): The base slot of the storage layout must evaluate to a rational number.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/bitwise_negation_after_cast.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/bitwise_negation_after_cast.sol
@@ -1,3 +1,3 @@
 contract C layout at ~uint(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF) {}
 // ----
-// TypeError 6396: (21-94): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (21-94): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/bool_constant.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/bool_constant.sol
@@ -0,0 +1,4 @@
+bool constant x = false;
+contract C layout at x {}
+// ----
+// TypeError 6396: (46-47): The base slot of the storage layout must evaluate to a rational number.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/bytes_constant.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/bytes_constant.sol
@@ -0,0 +1,6 @@
+bytes32 constant x = "ABC";
+contract A layout at x {}
+contract C layout at x[1] {}
+// ----
+// TypeError 6396: (49-50): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 6396: (75-79): The base slot of the storage layout must evaluate to a rational number.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_divided_by_its_negation.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_divided_by_its_negation.sol
@@ -1,4 +1,4 @@
 uint constant N = 100;
 contract C layout at N / ~N {}
 // ----
-// TypeError 6396: (44-50): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 3667: (48-50): Arithmetic error when computing constant value.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_divided_by_zero.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_divided_by_zero.sol
@@ -1,4 +1,4 @@
 uint constant N = 100;
 contract C layout at N / 0 {}
 // ----
-// TypeError 6396: (44-49): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (44-49): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_from_base_contract.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_from_base_contract.sol
@@ -4,4 +4,4 @@ contract A {
 
 contract C is A layout at A.x { }
 // ----
-// TypeError 6396: (68-71): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (68-71): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_from_module.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_from_module.sol
@@ -0,0 +1,8 @@
+==== Source: A ====
+uint constant x = 77;
+
+==== Source: B ====
+import "A" as M;
+contract C layout at M.x{ }
+// ----
+// TypeError 1505: (B:38-41): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_initialized_from_builtin.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_initialized_from_builtin.sol
@@ -0,0 +1,7 @@
+uint constant x = addmod(10, 2, 8);
+uint constant y = mulmod(10, 2, 8);
+contract C layout at x {}
+contract D layout at y {}
+// ----
+// TypeError 1505: (93-94): The base slot expression cannot be evaluated during compilation.
+// TypeError 1505: (119-120): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_initialized_from_cast.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_initialized_from_cast.sol
@@ -0,0 +1,4 @@
+uint constant x = uint(42);
+contract C layout at x {}
+// ----
+// TypeError 1505: (49-50): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_initialized_from_other_constant.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_initialized_from_other_constant.sol
@@ -0,0 +1,4 @@
+uint constant x = 42;
+uint constant y = x * 2;
+contract C layout at y {}
+// ----
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_initialized_with_literal_expression.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/constant_initialized_with_literal_expression.sol
@@ -0,0 +1,3 @@
+uint constant x = ((2**5 + 2**5) * (2 ** 10 + 1 << 1)) % 2**256 - 1;
+contract C layout at x {}
+// ----
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/function_selector.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/function_selector.sol
@@ -3,4 +3,4 @@ contract A {
 }
 contract C is A layout at uint32(this.f.selector) {}
 // ----
-// TypeError 6396: (68-91): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (68-91): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/hex_string_cast.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/hex_string_cast.sol
@@ -1,3 +1,3 @@
 contract at layout at uint40(bytes5(hex"0011223344")) { }
 // ----
-// TypeError 6396: (22-53): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (22-53): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/int_constant.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/int_constant.sol
@@ -0,0 +1,4 @@
+int constant x = -42;
+contract C layout at x {}
+// ----
+// TypeError 1481: (43-44): The base slot expression must have an unsigned integer type.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/layout_specification_constant_in_expression.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/layout_specification_constant_in_expression.sol
@@ -1,4 +1,3 @@
 uint constant X = 42;
 contract C layout at 0xffff * (50 - X) { }
 // ----
-// TypeError 6396: (43-60): The base slot of the storage layout must evaluate to a rational number.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/layout_specified_by_interface_id.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/layout_specified_by_interface_id.sol
@@ -2,4 +2,4 @@ interface I {}
 
 contract C layout at uint(bytes32(type(I).interfaceId)) { }
 // ----
-// TypeError 6396: (37-71): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (37-71): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/literal_cast.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/literal_cast.sol
@@ -1,3 +1,3 @@
 contract at layout at uint(42) { }
 // ----
-// TypeError 6396: (22-30): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (22-30): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/precompiles.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/precompiles.sol
@@ -1,5 +1,5 @@
 contract A layout at addmod(1, 2, 3) {}
 contract B layout at mulmod(3, 2, 1) {}
 // ----
-// TypeError 6396: (21-36): The base slot of the storage layout must evaluate to a rational number.
-// TypeError 6396: (61-76): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (21-36): The base slot expression cannot be evaluated during compilation.
+// TypeError 1505: (61-76): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/ternary_operator.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/ternary_operator.sol
@@ -1,5 +1,5 @@
 contract A layout at true ? 42 : 94 {}
 contract B layout at 255 + (true ? 1 : 0) {}
 // ----
-// TypeError 6396: (21-35): The base slot of the storage layout must evaluate to a rational number.
-// TypeError 6396: (60-80): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (21-35): The base slot expression cannot be evaluated during compilation.
+// TypeError 1505: (60-80): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/type_uint_max.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/type_uint_max.sol
@@ -1,3 +1,3 @@
 contract at layout at type(uint).max { }
 // ----
-// TypeError 6396: (22-36): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (22-36): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/user_defined_value_type_unwrap.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/user_defined_value_type_unwrap.sol
@@ -2,4 +2,4 @@ type MyUint is uint128;
 MyUint constant x = MyUint.wrap(42);
 contract C layout at MyUint.unwrap(x) {}
 // ----
-// TypeError 6396: (82-98): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (82-98): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/value_from_array_literal.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/value_from_array_literal.sol
@@ -1,5 +1,5 @@
 contract A layout at [1, 2, 3][0] {}
 contract B layout at 255 + [1, 2, 3][0] {}
 // ----
-// TypeError 6396: (21-33): The base slot of the storage layout must evaluate to a rational number.
-// TypeError 6396: (58-76): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (21-33): The base slot expression cannot be evaluated during compilation.
+// TypeError 1505: (58-76): The base slot expression cannot be evaluated during compilation.
diff --git a/test/libsolidity/syntaxTests/storageLayoutSpecifier/value_from_bytes.sol b/test/libsolidity/syntaxTests/storageLayoutSpecifier/value_from_bytes.sol
@@ -1,4 +1,4 @@
 bytes32 constant b = "Solidity";
 contract C layout at uint8(b[1]) {}
 // ----
-// TypeError 6396: (54-65): The base slot of the storage layout must evaluate to a rational number.
+// TypeError 1505: (54-65): The base slot expression cannot be evaluated during compilation.
