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

Merge pull request #7773 from ethereum/develop

Browse Source 
Merge develop into develop_060
This commit is contained in:
chriseth
2019-11-21 21:49:22 +01:00
committed by GitHub
parent d5e9271592 3f67912cf4
commit a00f824479
22 changed files with 313 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/ast/Types.cpp
+14
View File
@@ -3007,6 +3007,20 @@ MemberList::MemberMap FunctionType::nativeMembers(ContractDefinition const*) con
);
return members;
}
case Kind::DelegateCall:
{
auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(m_declaration);
solAssert(functionDefinition, "");
solAssert(functionDefinition->visibility() != Declaration::Visibility::Private, "");
if (functionDefinition->visibility() != Declaration::Visibility::Internal)
{
auto const* contract = dynamic_cast<ContractDefinition const*>(m_declaration->scope());
solAssert(contract, "");
solAssert(contract->isLibrary(), "");
return {{"selector", TypeProvider::fixedBytes(4)}};
}
return {};
}
default:
return MemberList::MemberMap();
}
libsolidity/codegen/CompilerContext.cpp
+1 -1
View File
@@ -437,7 +437,7 @@ void CompilerContext::appendInlineAssembly(
parserResult = std::move(obj.code);
#ifdef SOL_OUTPUT_ASM
cout << "After optimizer: " << endl;
cout << "After optimizer:" << endl;
cout << yul::AsmPrinter()(*parserResult) << endl;
#endif
}