cerc-io/solidity
10
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

Merge pull request #8810 from ethereum/sol_yul_send_and_transfer

Browse Source 
[Sol - Yul] Add support for send(..) & transfer(..)
This commit is contained in:
chriseth 2020-05-04 11:48:00 +02:00 committed by GitHub
commit 94f7ffcfe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libsolidity/codegen/ir/IRGeneratorForStatements.cpp
View File

@ -730,6 +730,16 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
break; break;
} }
case FunctionType::Kind::Revert:
{
solAssert(arguments.size() == parameterTypes.size(), "");
if (arguments.empty())
m_code << "revert(0, 0)\n";
else
solUnimplementedAssert(false, "");
break;
}
// Array creation using new // Array creation using new
case FunctionType::Kind::ObjectCreation: case FunctionType::Kind::ObjectCreation:
{ {
@ -908,6 +918,34 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
break; break;
} }
case FunctionType::Kind::Send:
case FunctionType::Kind::Transfer:
{
solAssert(arguments.size() == 1 && parameterTypes.size() == 1, "");
string address{IRVariable(_functionCall.expression()).part("address").name()};
string value{expressionAsType(*arguments[0], *(parameterTypes[0]))};
Whiskers templ(R"(
let <gas> := 0
if iszero(<value>) { <gas> := <callStipend> }
let <success> := call(<gas>, <address>, <value>, 0, 0, 0, 0)
<?isTransfer>
if iszero(<success>) { <forwardingRevert>() }
</isTransfer>
)");
templ("gas", m_context.newYulVariable());
templ("callStipend", toString(evmasm::GasCosts::callStipend));
templ("address", address);
templ("value", value);
if (functionType->kind() == FunctionType::Kind::Transfer)
templ("success", m_context.newYulVariable());
else
templ("success", IRVariable(_functionCall).commaSeparatedList());
templ("isTransfer", functionType->kind() == FunctionType::Kind::Transfer);
templ("forwardingRevert", m_utils.forwardingRevertFunction());
m_code << templ.render();
break;
}
default: default:
solUnimplemented("FunctionKind " + toString(static_cast<int>(functionType->kind())) + " not yet implemented"); solUnimplemented("FunctionKind " + toString(static_cast<int>(functionType->kind())) + " not yet implemented");
} }

37
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -50,6 +50,7 @@ using namespace solidity::langutil;
#define ALSO_VIA_YUL(CODE) \ #define ALSO_VIA_YUL(CODE) \
{ \ { \
{ CODE } \ { CODE } \
reset(); \
m_compileViaYul = true; \ m_compileViaYul = true; \
{ CODE } \ { CODE } \
} }
@ -1058,11 +1059,13 @@ BOOST_AUTO_TEST_CASE(send_ether)
} }
} }
)"; )";
u256 amount(130); ALSO_VIA_YUL(
compileAndRun(sourceCode, amount + 1); u256 amount(250);
u160 address(23); compileAndRun(sourceCode, amount + 1);
ABI_CHECK(callContractFunction("a(address,uint256)", address, amount), encodeArgs(1)); u160 address(23);
BOOST_CHECK_EQUAL(balanceAt(address), amount); ABI_CHECK(callContractFunction("a(address,uint256)", address, amount), encodeArgs(1));
BOOST_CHECK_EQUAL(balanceAt(address), amount);
)
} }
BOOST_AUTO_TEST_CASE(transfer_ether) BOOST_AUTO_TEST_CASE(transfer_ether)
@ -1088,17 +1091,19 @@ BOOST_AUTO_TEST_CASE(transfer_ether)
} }
} }
)"; )";
compileAndRun(sourceCode, 0, "B"); ALSO_VIA_YUL(
u160 const nonPayableRecipient = m_contractAddress; compileAndRun(sourceCode, 0, "B");
compileAndRun(sourceCode, 0, "C"); u160 const nonPayableRecipient = m_contractAddress;
u160 const oogRecipient = m_contractAddress; compileAndRun(sourceCode, 0, "C");
compileAndRun(sourceCode, 20, "A"); u160 const oogRecipient = m_contractAddress;
u160 payableRecipient(23); compileAndRun(sourceCode, 20, "A");
ABI_CHECK(callContractFunction("a(address,uint256)", payableRecipient, 10), encodeArgs(10)); u160 payableRecipient(23);
BOOST_CHECK_EQUAL(balanceAt(payableRecipient), 10); ABI_CHECK(callContractFunction("a(address,uint256)", payableRecipient, 10), encodeArgs(10));
BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 10); BOOST_CHECK_EQUAL(balanceAt(payableRecipient), 10);
ABI_CHECK(callContractFunction("b(address,uint256)", nonPayableRecipient, 10), encodeArgs()); BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 10);
ABI_CHECK(callContractFunction("b(address,uint256)", oogRecipient, 10), encodeArgs()); ABI_CHECK(callContractFunction("b(address,uint256)", nonPayableRecipient, 10), encodeArgs());
ABI_CHECK(callContractFunction("b(address,uint256)", oogRecipient, 10), encodeArgs());
)
} }
BOOST_AUTO_TEST_CASE(uncalled_blockhash) BOOST_AUTO_TEST_CASE(uncalled_blockhash)