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 #9318 from ethereum/wasm-drop

Browse Source 
Rename drop to i64.drop in WasmDialect
This commit is contained in:
chriseth 2020-07-06 17:08:59 +02:00 committed by GitHub
commit c7b7542f73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -20,6 +20,7 @@ Bugfixes:
* Type Checker: Fix internal error related to ``using for`` applied to non-libraries. * Type Checker: Fix internal error related to ``using for`` applied to non-libraries.
* Type Checker: Do not disallow assigning to calldata variables. * Type Checker: Do not disallow assigning to calldata variables.
* Wasm backend: Fix code generation for for-loops with pre statements. * Wasm backend: Fix code generation for for-loops with pre statements.
* Wasm backend: Properly support both ``i32.drop`` and ``i64.drop``, and remove ``drop``.
* Yul: Fix source location of variable multi-assignment. * Yul: Fix source location of variable multi-assignment.

2
libyul/backends/wasm/BinaryTransform.cpp
View File

@ -390,7 +390,7 @@ bytes BinaryTransform::operator()(BuiltinCall const& _call)
return toBytes(Opcode::Unreachable); return toBytes(Opcode::Unreachable);
else if (_call.functionName == "nop") else if (_call.functionName == "nop")
return toBytes(Opcode::Nop); return toBytes(Opcode::Nop);
else if (_call.functionName == "drop") else if (_call.functionName == "i32.drop" || _call.functionName == "i64.drop")
return toBytes(Opcode::Drop); return toBytes(Opcode::Drop);
else else
{ {

5
libyul/backends/wasm/TextTransform.cpp
View File

@ -94,7 +94,10 @@ string TextTransform::operator()(wasm::GlobalVariable const& _identifier)
string TextTransform::operator()(wasm::BuiltinCall const& _builtinCall) string TextTransform::operator()(wasm::BuiltinCall const& _builtinCall)
{ {
string args = joinTransformed(_builtinCall.arguments); string args = joinTransformed(_builtinCall.arguments);
return "(" + _builtinCall.functionName + (args.empty() ? "" : " " + args) + ")"; string funcName = _builtinCall.functionName;
if (funcName == "i32.drop" || funcName == "i64.drop")
funcName = "drop";
return "(" + funcName + (args.empty() ? "" : " " + args) + ")";
} }
string TextTransform::operator()(wasm::FunctionCall const& _functionCall) string TextTransform::operator()(wasm::FunctionCall const& _functionCall)

6
libyul/backends/wasm/WasmDialect.cpp
View File

@ -91,9 +91,9 @@ WasmDialect::WasmDialect()
m_functions["i64.load"_yulstring].sideEffects.sideEffectFreeIfNoMSize = true; m_functions["i64.load"_yulstring].sideEffects.sideEffectFreeIfNoMSize = true;
// Drop is actually overloaded for all types, but Yul does not support that. // Drop is actually overloaded for all types, but Yul does not support that.
// Because of that, we introduce "i32.drop". // Because of that, we introduce "i32.drop" and "i64.drop".
addFunction("drop", {i64}, {});
addFunction("i32.drop", {i32}, {}); addFunction("i32.drop", {i32}, {});
addFunction("i64.drop", {i64}, {});
addFunction("nop", {}, {}); addFunction("nop", {}, {});
addFunction("unreachable", {}, {}, false); addFunction("unreachable", {}, {}, false);
@ -122,7 +122,7 @@ BuiltinFunction const* WasmDialect::discardFunction(YulString _type) const
if (_type == "i32"_yulstring) if (_type == "i32"_yulstring)
return builtin("i32.drop"_yulstring); return builtin("i32.drop"_yulstring);
yulAssert(_type == "i64"_yulstring, ""); yulAssert(_type == "i64"_yulstring, "");
return builtin("drop"_yulstring); return builtin("i64.drop"_yulstring);
} }
BuiltinFunction const* WasmDialect::equalityFunction(YulString _type) const BuiltinFunction const* WasmDialect::equalityFunction(YulString _type) const

2
test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
View File

@ -93,7 +93,7 @@ u256 EwasmBuiltinInterpreter::evalBuiltin(YulString _fun, vector<u256> const& _a
); );
return 0; return 0;
} }
else if (_fun == "drop"_yulstring || _fun == "nop"_yulstring) else if (_fun == "i32.drop"_yulstring || _fun == "i64.drop"_yulstring || _fun == "nop"_yulstring)
return {}; return {};
else if (_fun == "i32.wrap_i64"_yulstring) else if (_fun == "i32.wrap_i64"_yulstring)
return arg.at(0) & uint32_t(-1); return arg.at(0) & uint32_t(-1);