Use bool type in word size transform.

libyul/backends/wasm/EVMToEwasmTranslator.cpp

@@ -1235,7 +1235,7 @@ Object EVMToEwasmTranslator::run(Object const& _object)
 	MainFunction{}(ast);
 	ForLoopConditionIntoBody::run(context, ast);
 	ExpressionSplitter::run(context, ast);
-	WordSizeTransform::run(m_dialect, WasmDialect::instance().defaultType, ast, nameDispenser);
+	WordSizeTransform::run(m_dialect, WasmDialect::instance(), ast, nameDispenser);
 
 	NameDisplacer{nameDispenser, m_polyfillFunctions}(ast);
 	for (auto const& st: m_polyfill->statements)

libyul/backends/wasm/WordSizeTransform.cpp

@@ -45,7 +45,7 @@ void WordSizeTransform::operator()(FunctionCall& _fc)
 		if (fun->literalArguments)
 		{
 			for (Expression& arg: _fc.arguments)
-				get<Literal>(arg).type = m_defaultType;
+				get<Literal>(arg).type = m_targetDialect.defaultType;
 			return;
 		}
 
@@ -106,12 +106,17 @@ void WordSizeTransform::operator()(Block& _block)
 							for (int i = 0; i < 3; i++)
 								ret.push_back(VariableDeclaration{
 									varDecl.location,
-									{TypedName{varDecl.location, newLhs[i], m_defaultType}},
-									make_unique<Expression>(Literal{locationOf(*varDecl.value), LiteralKind::Number, "0"_yulstring, m_defaultType})
+									{TypedName{varDecl.location, newLhs[i], m_targetDialect.defaultType}},
+									make_unique<Expression>(Literal{
+										locationOf(*varDecl.value),
+										LiteralKind::Number,
+										"0"_yulstring,
+										m_targetDialect.defaultType
+									})
 								});
 							ret.push_back(VariableDeclaration{
 								varDecl.location,
-								{TypedName{varDecl.location, newLhs[3], m_defaultType}},
+								{TypedName{varDecl.location, newLhs[3], m_targetDialect.defaultType}},
 								std::move(varDecl.value)
 							});
 							return {std::move(ret)};
@@ -133,7 +138,7 @@ void WordSizeTransform::operator()(Block& _block)
 						ret.push_back(
 							VariableDeclaration{
 								varDecl.location,
-								{TypedName{varDecl.location, newLhs[i], m_defaultType}},
+								{TypedName{varDecl.location, newLhs[i], m_targetDialect.defaultType}},
 								std::move(newRhs[i])
 							}
 						);
@@ -163,7 +168,12 @@ void WordSizeTransform::operator()(Block& _block)
 								ret.push_back(Assignment{
 									assignment.location,
 									{Identifier{assignment.location, newLhs[i]}},
-									make_unique<Expression>(Literal{locationOf(*assignment.value), LiteralKind::Number, "0"_yulstring, m_defaultType})
+									make_unique<Expression>(Literal{
+										locationOf(*assignment.value),
+										LiteralKind::Number,
+										"0"_yulstring,
+										m_targetDialect.defaultType
+									})
 								});
 							ret.push_back(Assignment{
 								assignment.location,
@@ -209,14 +219,25 @@ void WordSizeTransform::operator()(Block& _block)
 
 void WordSizeTransform::run(
 	Dialect const& _inputDialect,
-	YulString _targetDefaultType,
+	Dialect const& _targetDialect,
 	Block& _ast,
 	NameDispenser& _nameDispenser
 )
 {
 	// Free the name `or_bool`.
 	NameDisplacer{_nameDispenser, {"or_bool"_yulstring}}(_ast);
-	WordSizeTransform{_inputDialect, _nameDispenser, _targetDefaultType}(_ast);
+	WordSizeTransform{_inputDialect, _targetDialect, _nameDispenser}(_ast);
+}
+
+WordSizeTransform::WordSizeTransform(
+	Dialect const& _inputDialect,
+	Dialect const& _targetDialect,
+	NameDispenser& _nameDispenser
+):
+	m_inputDialect(_inputDialect),
+	m_targetDialect(_targetDialect),
+	m_nameDispenser(_nameDispenser)
+{
 }
 
 void WordSizeTransform::rewriteVarDeclList(TypedNameList& _nameList)
@@ -227,7 +248,7 @@ void WordSizeTransform::rewriteVarDeclList(TypedNameList& _nameList)
 		{
 			TypedNameList ret;
 			for (auto newName: generateU64IdentifierNames(_n.name))
-				ret.emplace_back(TypedName{_n.location, newName, m_defaultType});
+				ret.emplace_back(TypedName{_n.location, newName, m_targetDialect.defaultType});
 			return ret;
 		}
 	);
@@ -291,7 +312,7 @@ vector<Statement> WordSizeTransform::handleSwitchInternal(
 
 	for (auto& c: cases)
 	{
-		Literal label{_location, LiteralKind::Number, YulString(c.first.str()), m_defaultType};
+		Literal label{_location, LiteralKind::Number, YulString(c.first.str()), m_targetDialect.defaultType};
 		ret.cases.emplace_back(Case{
 			c.second.front().location,
 			make_unique<Literal>(std::move(label)),
@@ -312,7 +333,7 @@ vector<Statement> WordSizeTransform::handleSwitchInternal(
 				Assignment{
 					_location,
 					{{_location, _runDefaultFlag}},
-					make_unique<Expression>(Literal{_location, LiteralKind::Number, "1"_yulstring, m_defaultType})
+					make_unique<Expression>(Literal{_location, LiteralKind::Boolean, "true"_yulstring, m_targetDialect.boolType})
 				}
 			)}
 		});
@@ -337,7 +358,7 @@ std::vector<Statement> WordSizeTransform::handleSwitch(Switch& _switch)
 		_switch.cases.pop_back();
 		ret.emplace_back(VariableDeclaration{
 			_switch.location,
-			{TypedName{_switch.location, runDefaultFlag, m_defaultType}},
+			{TypedName{_switch.location, runDefaultFlag, m_targetDialect.boolType}},
 			{}
 		});
 	}
@@ -392,7 +413,7 @@ array<unique_ptr<Expression>, 4> WordSizeTransform::expandValue(Expression const
 					lit.location,
 					LiteralKind::Number,
 					YulString(currentVal.str()),
-					m_defaultType
+					m_targetDialect.defaultType
 				}
 			);
 		}

libyul/backends/wasm/WordSizeTransform.h

@@ -69,7 +69,7 @@ public:
 
 	static void run(
 		Dialect const& _inputDialect,
-		YulString _targetDefaultType,
+		Dialect const& _targetDialect,
 		Block& _ast,
 		NameDispenser& _nameDispenser
 	);
@@ -77,13 +77,9 @@ public:
 private:
 	explicit WordSizeTransform(
 		Dialect const& _inputDialect,
-		NameDispenser& _nameDispenser,
-		YulString _defaultType
-	):
-		m_inputDialect(_inputDialect),
-		m_nameDispenser(_nameDispenser),
-		m_defaultType(_defaultType)
-	{ }
+		Dialect const& _targetDialect,
+		NameDispenser& _nameDispenser
+	);
 
 	void rewriteVarDeclList(std::vector<TypedName>&);
 	void rewriteIdentifierList(std::vector<Identifier>&);
@@ -103,8 +99,8 @@ private:
 	std::vector<Expression> expandValueToVector(Expression const& _e);
 
 	Dialect const& m_inputDialect;
+	Dialect const& m_targetDialect;
 	NameDispenser& m_nameDispenser;
-	YulString m_defaultType;
 	/// maps original u256 variable's name to corresponding u64 variables' names
 	std::map<YulString, std::array<YulString, 4>> m_variableMapping;
 };