Support ethdebug source locations under EOF #15994
Conversation
clonker
force-pushed
the
eof_source_locations_unoptimized
branch
2 times, most recently
from
20d6a64 to
fb559fb
Compare
clonker
force-pushed
the
eof_source_locations_unoptimized
branch
9 times, most recently
from
e6a1055 to
2a91773
Compare
clonker
force-pushed
the
eof_source_locations_unoptimized
branch
5 times, most recently
from
d82b70c to
0fd1232
Compare
clonker
force-pushed
the
eof_source_locations_unoptimized
branch
from
0fd1232 to
cf6aa71
Compare
There was a problem hiding this comment.
The output here is quite long and seems to have little to do with ethdebug itself (the ethdebug JSON gets stripped). Do we need it all? What's the point?
There was a problem hiding this comment.
I think I just added it because there is the same test for non-eof. And looking at it now, I agree. There doesn't seem to be much value to keep it (or: them) around, especially with #16009 around the corner. I have removed this one.
test/cmdlineTests/standard_output_debuginfo_ethdebug_compatible_eof/input.json
Outdated
Show resolved
Hide resolved
clonker
force-pushed
the
eof_source_locations_unoptimized
branch
3 times, most recently
from
3c02df0 to
f9a0985
Compare
clonker
force-pushed
the
eof_source_locations_unoptimized
branch
from
f9a0985 to
ae80060
Compare
| @@ -1216,8 +1216,9 @@ Json CompilerStack::ethdebug(Contract const& _contract, bool _runtime) const | |||
| solUnimplementedAssert(!isExperimentalSolidity()); | |||
| evmasm::LinkerObject const& object = _runtime ? _contract.runtimeObject : _contract.object; | |||
| std::shared_ptr<evmasm::Assembly> const& assembly = _runtime ? _contract.evmRuntimeAssembly : _contract.evmAssembly; | |||
| solAssert(assembly); | |||
There was a problem hiding this comment.
interfaces will throw an assertion here - e.g. with test/libsolidity/semanticTests/interfaceID/homer.sol.. sadly I didn't add a test for interfaces already, thats why you didn't just saw that..
There was a problem hiding this comment.
do interfaces have an environment (call/create)? that'll be required for the current ethdebug schema
There was a problem hiding this comment.
interfaces / abstract contracts not really.. in the previous experimantal version I just omitted "environment" and "instructions" but its not really specified like this.. @gnidan
There was a problem hiding this comment.
hm I think there's nothing extra needed here? like if you compile just an interface, there's no bytecode and thus nothing to debug.
There was a problem hiding this comment.
consequently I have replaced the assert by returning empty json. we can think about whether we want to issue a warning, though.
There was a problem hiding this comment.
oh I just saw
======= /Users/alex/git/solidity/test/libsolidity/semanticTests/interfaceID/homer.sol:Simpson =======
IR:
Debug Data (ethdebug/format/program):
null
Debug Data of the runtime part (ethdebug/format/program):
null
So its not exactly an empty json.
There was a problem hiding this comment.
Could you maybe also add a small test that consists of an interface?
clonker
force-pushed
the
eof_source_locations_unoptimized
branch
from
ae80060 to
082d7f9
Compare
| ret.bytecode.push_back(static_cast<uint8_t>(Instruction::ADD)); | ||
| instructionLocationEmitter.emit(); | ||
| ret.bytecode.push_back(static_cast<uint8_t>(Instruction::MSTORE)); | ||
| // no emit needed here, it's taken care of by the destructor of addInstructionLocation |
There was a problem hiding this comment.
addInstrictionLocation -> InstructionLocationEmitter, other comments also still referring to the old name
There was a problem hiding this comment.
ok.. at least on the cli I just saw that ethdebug returns null for the interface (e.g. using test/libsolidity/semanticTests/interfaceID/homer.sol) - I guess we want an empty json object there. I think it would be nice to add a small test for that simple interface case.
EthdebugSchemaheader with the relevant part of the schema mapped to structs with correspondingto_jsonmethods and validations(-1, -1))assembleEOFFixes the unoptimized part of #15978.
Fixes #15998.