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 #10885 from ethereum/heuristic-revamp

Browse Source 
Yul Backend: Get rid of heuristics for finding the matching runtime
This commit is contained in:
chriseth
2021-02-10 00:49:56 +01:00
committed by GitHub
parent f8d74bc3e1 e4f1257c83
commit 9b20c9840a
13 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/interface/CompilerStack.cpp
+1 -1
View File
@@ -1302,7 +1302,7 @@ void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
// TODO: use stack.assemble here!
yul::MachineAssemblyObject init;
yul::MachineAssemblyObject runtime;
std::tie(init, runtime) = stack.assembleAndGuessRuntime();
std::tie(init, runtime) = stack.assembleWithDeployed(IRNames::runtimeObject(_contract));
compiledContract.object = std::move(*init.bytecode);
compiledContract.runtimeObject = std::move(*runtime.bytecode);
// TODO: refactor assemblyItems, runtimeAssemblyItems, generatedSources,
libsolidity/interface/StandardCompiler.cpp
+1 -1
View File
@@ -1275,7 +1275,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
MachineAssemblyObject object;
MachineAssemblyObject runtimeObject;
tie(object, runtimeObject) = stack.assembleAndGuessRuntime();
tie(object, runtimeObject) = stack.assembleWithDeployed();
if (object.bytecode)
object.bytecode->link(_inputsAndSettings.libraries);