Name displacer.

This commit is contained in:
chriseth
2019-06-19 14:55:38 +02:00
parent ee89a0353e
commit d7b366ff46
12 changed files with 246 additions and 4 deletions
+10
View File
@@ -36,6 +36,7 @@
#include <libyul/optimiser/ForLoopConditionIntoBody.h>
#include <libyul/optimiser/ForLoopInitRewriter.h>
#include <libyul/optimiser/MainFunction.h>
#include <libyul/optimiser/NameDisplacer.h>
#include <libyul/optimiser/Rematerialiser.h>
#include <libyul/optimiser/ExpressionSimplifier.h>
#include <libyul/optimiser/UnusedPruner.h>
@@ -110,6 +111,15 @@ TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _line
soltestAssert(m_dialect, "Dialect not set.");
if (m_optimizerStep == "disambiguator")
disambiguate();
else if (m_optimizerStep == "nameDisplacer")
{
disambiguate();
NameDispenser nameDispenser{*m_dialect, *m_ast};
NameDisplacer{
nameDispenser,
{"illegal1"_yulstring, "illegal2"_yulstring, "illegal3"_yulstring, "illegal4"_yulstring, "illegal5"_yulstring}
}(*m_ast);
}
else if (m_optimizerStep == "blockFlattener")
{
disambiguate();
@@ -0,0 +1,25 @@
{
let x := illegal4(1, 2)
function illegal4(illegal1, illegal2) -> illegal3 { illegal3 := add(illegal1, illegal2) }
{
let y := illegal5(3, 4)
function illegal5(illegal1, illegal2) -> illegal3 { illegal3 := add(illegal1, illegal2) }
}
}
// ====
// step: nameDisplacer
// ----
// {
// let x := illegal4_1(1, 2)
// function illegal4_1(illegal1_2, illegal2_3) -> illegal3_4
// {
// illegal3_4 := add(illegal1_2, illegal2_3)
// }
// {
// let y := illegal5_5(3, 4)
// function illegal5_5(illegal1_1, illegal2_2) -> illegal3_3
// {
// illegal3_3 := add(illegal1_1, illegal2_2)
// }
// }
// }
@@ -0,0 +1,11 @@
{ { let illegal1 := 1 } { let illegal2 := 2 let illegal3, illegal4 } }
// ====
// step: nameDisplacer
// ----
// {
// { let illegal1_1 := 1 }
// {
// let illegal2_2 := 2
// let illegal3_3, illegal4_4
// }
// }
@@ -0,0 +1,16 @@
{
function f(illegal1, illegal2) -> illegal3 {
let illegal4 := illegal1
illegal3 := add(illegal1, illegal2)
}
}
// ====
// step: nameDisplacer
// ----
// {
// function f(illegal1_1, illegal2_2) -> illegal3_3
// {
// let illegal4_4 := illegal1_1
// illegal3_3 := add(illegal1_1, illegal2_2)
// }
// }