cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Codegen for object access.

Browse Source
This commit is contained in:
chriseth
2018-12-11 19:24:44 +01:00
parent 8d49e53995
commit fb3a0ac1c7
33 changed files with 560 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libyul/Common.cpp
+2 -1
View File
@@ -29,6 +29,7 @@
#include <libyul/AsmParser.h>
#include <libyul/AsmAnalysis.h>
#include <libyul/AsmPrinter.h>
#include <libyul/backends/evm/EVMDialect.h>
#include <liblangutil/Scanner.h>
#include <liblangutil/ErrorReporter.h>
@@ -54,7 +55,7 @@ void yul::test::printErrors(ErrorList const& _errors)
pair<shared_ptr<Block>, shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(string const& _source, bool _yul)
{
Dialect dialect = _yul ? yul::Dialect::yul() : yul::Dialect::strictAssemblyForEVM();
shared_ptr<Dialect> dialect = _yul ? yul::Dialect::yul() : yul::EVMDialect::strictAssemblyForEVM();
ErrorList errors;
ErrorReporter errorReporter(errors);
auto scanner = make_shared<Scanner>(CharStream(_source, ""));
test/libyul/Parser.cpp
+14 -12
View File
@@ -49,7 +49,7 @@ namespace test
namespace
{
bool parse(string const& _source, Dialect const& _dialect, ErrorReporter& errorReporter)
bool parse(string const& _source, std::shared_ptr<Dialect> _dialect, ErrorReporter& errorReporter)
{
try
{
@@ -74,7 +74,7 @@ bool parse(string const& _source, Dialect const& _dialect, ErrorReporter& errorR
return false;
}
boost::optional<Error> parseAndReturnFirstError(string const& _source, Dialect const& _dialect, bool _allowWarnings = true)
boost::optional<Error> parseAndReturnFirstError(string const& _source, shared_ptr<Dialect> _dialect, bool _allowWarnings = true)
{
ErrorList errors;
ErrorReporter errorReporter(errors);
@@ -99,12 +99,12 @@ boost::optional<Error> parseAndReturnFirstError(string const& _source, Dialect c
return {};
}
bool successParse(std::string const& _source, Dialect const& _dialect = Dialect::yul(), bool _allowWarnings = true)
bool successParse(std::string const& _source, shared_ptr<Dialect> _dialect = Dialect::yul(), bool _allowWarnings = true)
{
return !parseAndReturnFirstError(_source, _dialect, _allowWarnings);
}
Error expectError(std::string const& _source, Dialect const& _dialect = Dialect::yul(), bool _allowWarnings = false)
Error expectError(std::string const& _source, shared_ptr<Dialect> _dialect = Dialect::yul(), bool _allowWarnings = false)
{
auto error = parseAndReturnFirstError(_source, _dialect, _allowWarnings);
@@ -306,16 +306,17 @@ BOOST_AUTO_TEST_CASE(if_statement_invalid)
BOOST_AUTO_TEST_CASE(builtins_parser)
{
struct SimpleBuiltins: public Builtins
struct SimpleDialect: public Dialect
{
BuiltinFunction const* query(YulString _name) const override
SimpleDialect(): Dialect(AsmFlavour::Strict) {}
BuiltinFunction const* builtin(YulString _name) const override
{
return _name == YulString{"builtin"} ? &f : nullptr;
}
BuiltinFunction f;
};
Dialect dialect(AsmFlavour::Strict, make_shared<SimpleBuiltins>());
shared_ptr<Dialect> dialect = make_shared<SimpleDialect>();
CHECK_ERROR_DIALECT("{ let builtin := 6 }", ParserError, "Cannot use builtin function name \"builtin\" as identifier name.", dialect);
CHECK_ERROR_DIALECT("{ function builtin() {} }", ParserError, "Cannot use builtin function name \"builtin\" as identifier name.", dialect);
CHECK_ERROR_DIALECT("{ builtin := 6 }", ParserError, "Cannot assign to builtin function \"builtin\".", dialect);
@@ -323,16 +324,17 @@ BOOST_AUTO_TEST_CASE(builtins_parser)
BOOST_AUTO_TEST_CASE(builtins_analysis)
{
struct SimpleBuiltinsAnalysis: public Builtins
struct SimpleDialect: public Dialect
{
yul::BuiltinFunction const* query(YulString _name) const override
SimpleDialect(): Dialect(AsmFlavour::Strict) {}
BuiltinFunction const* builtin(YulString _name) const override
{
return _name == YulString("builtin") ? &m_builtin : nullptr;
return _name == YulString{"builtin"} ? &f : nullptr;
}
BuiltinFunction m_builtin{YulString{"builtin"}, vector<Type>(2), vector<Type>(3), false};
BuiltinFunction f{YulString{"builtin"}, vector<Type>(2), vector<Type>(3), false};
};
Dialect dialect(AsmFlavour::Strict, make_shared<SimpleBuiltinsAnalysis>());
shared_ptr<Dialect> dialect = make_shared<SimpleDialect>();
BOOST_CHECK(successParse("{ let a, b, c := builtin(1, 2) }", dialect));
CHECK_ERROR_DIALECT("{ let a, b, c := builtin(1) }", TypeError, "Function expects 2 arguments but got 1", dialect);
CHECK_ERROR_DIALECT("{ let a, b := builtin(1, 2) }", DeclarationError, "Variable count mismatch: 2 variables and 3 values.", dialect);
test/libyul/YulOptimizerTest.cpp
+2 -1
View File
@@ -41,6 +41,7 @@
#include <libyul/optimiser/RedundantAssignEliminator.h>
#include <libyul/optimiser/StructuralSimplifier.h>
#include <libyul/optimiser/Suite.h>
#include <libyul/backends/evm/EVMDialect.h>
#include <libyul/AsmPrinter.h>
#include <libyul/AsmParser.h>
#include <libyul/AsmAnalysis.h>
@@ -262,7 +263,7 @@ void YulOptimizerTest::printIndented(ostream& _stream, string const& _output, st
bool YulOptimizerTest::parse(ostream& _stream, string const& _linePrefix, bool const _formatted)
{
yul::Dialect dialect = m_yul ? yul::Dialect::yul() : yul::Dialect::strictAssemblyForEVM();
shared_ptr<yul::Dialect> dialect = m_yul ? yul::Dialect::yul() : yul::EVMDialect::strictAssemblyForEVM();
ErrorList errors;
ErrorReporter errorReporter(errors);
shared_ptr<Scanner> scanner = make_shared<Scanner>(CharStream(m_source, ""));
test/libyul/objectCompiler/datacopy.yul
+48
View File
@@ -0,0 +1,48 @@
object "a" {
code {
datacopy(0, dataoffset("sub"), datasize("sub"))
return(0, datasize("sub"))
}
object "sub" {
code {
sstore(0, dataoffset("sub"))
mstore(0, datasize("data1"))
}
data "data1" "Hello, World!"
}
}
// ----
// Assembly:
// /* "source":26:73 */
// dataSize(sub_0)
// dataOffset(sub_0)
// /* "source":35:36 */
// 0x00
// /* "source":26:73 */
// codecopy
// /* "source":78:104 */
// dataSize(sub_0)
// /* "source":85:86 */
// 0x00
// /* "source":78:104 */
// return
// stop
//
// sub_0: assembly {
// /* "source":143:171 */
// 0x00
// /* "source":150:151 */
// 0x00
// /* "source":143:171 */
// sstore
// /* "source":178:206 */
// 0x0d
// /* "source":185:186 */
// 0x00
// /* "source":178:206 */
// mstore
// stop
// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
// }
// Bytecode: 600b600d600039600b6000f3fe6000600055600d600052fe
// Opcodes: PUSH1 0xB PUSH1 0xD PUSH1 0x0 CODECOPY PUSH1 0xB PUSH1 0x0 RETURN INVALID PUSH1 0x0 PUSH1 0x0 SSTORE PUSH1 0xD PUSH1 0x0 MSTORE INVALID
test/libyul/objectCompiler/dataoffset_code.yul
+29
View File
@@ -0,0 +1,29 @@
object "a" {
code { sstore(0, dataoffset("sub")) }
object "sub" {
code { sstore(0, 8) }
data "data1" "Hello, World!"
}
}
// ----
// Assembly:
// /* "source":22:50 */
// dataOffset(sub_0)
// /* "source":29:30 */
// 0x00
// /* "source":22:50 */
// sstore
// stop
//
// sub_0: assembly {
// /* "source":91:92 */
// 0x08
// /* "source":88:89 */
// 0x00
// /* "source":81:93 */
// sstore
// stop
// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
// }
// Bytecode: 6006600055fe6008600055fe
// Opcodes: PUSH1 0x6 PUSH1 0x0 SSTORE INVALID PUSH1 0x8 PUSH1 0x0 SSTORE INVALID
test/libyul/objectCompiler/dataoffset_data.yul
+16
View File
@@ -0,0 +1,16 @@
object "a" {
code { sstore(0, dataoffset("data1")) }
data "data1" "Hello, World!"
}
// ----
// Assembly:
// /* "source":22:52 */
// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f
// /* "source":29:30 */
// 0x00
// /* "source":22:52 */
// sstore
// stop
// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
// Bytecode: 6006600055fe48656c6c6f2c20576f726c6421
// Opcodes: PUSH1 0x6 PUSH1 0x0 SSTORE INVALID 0x48 PUSH6 0x6C6C6F2C2057 PUSH16 0x726C6421000000000000000000000000
test/libyul/objectCompiler/dataoffset_self.yul
+16
View File
@@ -0,0 +1,16 @@
object "a" {
code { sstore(0, dataoffset("a")) }
data "data1" "Hello, World!"
}
// ----
// Assembly:
// /* "source":22:48 */
// 0x00
// /* "source":29:30 */
// 0x00
// /* "source":22:48 */
// sstore
// stop
// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
// Bytecode: 6000600055fe
// Opcodes: PUSH1 0x0 PUSH1 0x0 SSTORE INVALID
test/libyul/objectCompiler/datasize_code.yul
+29
View File
@@ -0,0 +1,29 @@
object "a" {
code { sstore(0, datasize("sub")) }
object "sub" {
code { sstore(0, 8) }
data "data1" "Hello, World!"
}
}
// ----
// Assembly:
// /* "source":22:48 */
// dataSize(sub_0)
// /* "source":29:30 */
// 0x00
// /* "source":22:48 */
// sstore
// stop
//
// sub_0: assembly {
// /* "source":89:90 */
// 0x08
// /* "source":86:87 */
// 0x00
// /* "source":79:91 */
// sstore
// stop
// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
// }
// Bytecode: 6006600055fe
// Opcodes: PUSH1 0x6 PUSH1 0x0 SSTORE INVALID
test/libyul/objectCompiler/datasize_data.yul
+16
View File
@@ -0,0 +1,16 @@
object "a" {
code { sstore(0, datasize("data1")) }
data "data1" "Hello, World!"
}
// ----
// Assembly:
// /* "source":22:50 */
// 0x0d
// /* "source":29:30 */
// 0x00
// /* "source":22:50 */
// sstore
// stop
// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
// Bytecode: 600d600055fe
// Opcodes: PUSH1 0xD PUSH1 0x0 SSTORE INVALID
test/libyul/objectCompiler/datasize_self.yul
+16
View File
@@ -0,0 +1,16 @@
object "a" {
code { sstore(0, datasize("a")) }
data "data1" "Hello, World!"
}
// ----
// Assembly:
// /* "source":22:46 */
// bytecodeSize
// /* "source":29:30 */
// 0x00
// /* "source":22:46 */
// sstore
// stop
// data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
// Bytecode: 6006600055fe
// Opcodes: PUSH1 0x6 PUSH1 0x0 SSTORE INVALID