Use bool type in conditional simplifier and for loop condition into body.

libyul/optimiser/ConditionalSimplifier.cpp

@@ -77,12 +77,7 @@ void ConditionalSimplifier::operator()(Block& _block)
 						Assignment{
 							location,
 							{Identifier{location, condition}},
-							make_unique<Expression>(Literal{
+							make_unique<Expression>(m_dialect.zeroLiteralForType(m_dialect.boolType))
-								location,
-								LiteralKind::Number,
-								"0"_yulstring,
-								{}
-							})
 						}
 					);
 				}

libyul/optimiser/ForLoopConditionIntoBody.cpp

@@ -56,9 +56,9 @@ void ForLoopConditionIntoBody::operator()(ForLoop& _forLoop)
 		_forLoop.condition = make_unique<Expression>(
 			Literal {
 				loc,
-				LiteralKind::Number,
+				LiteralKind::Boolean,
-				"1"_yulstring,
+				"true"_yulstring,
-				{}
+				m_dialect.boolType
 			}
 		);
 	}

test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type.yul

@@ -0,0 +1,18 @@
+{
+    let y:bool := false
+    for {} true { } {
+        if y { break }
+    }
+}
+// ====
+// dialect: yul
+// step: conditionalSimplifier
+// ----
+// {
+//     let y:bool := false
+//     for { } true { }
+//     {
+//         if y { break }
+//         y := false
+//     }
+// }

test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type_wasm.yul

@@ -0,0 +1,18 @@
+{
+    let y:i32 := 0:i32
+    for {} true { } {
+        if y { break }
+    }
+}
+// ====
+// dialect: ewasm
+// step: conditionalSimplifier
+// ----
+// {
+//     let y:i32 := 0:i32
+//     for { } true { }
+//     {
+//         if y { break }
+//         y := false
+//     }
+// }

test/libyul/yulOptimizerTests/forLoopConditionIntoBody/cond_types.yul

@@ -19,7 +19,7 @@
 //     { }
 //     for { } a { }
 //     { }
-//     for { } 1 { }
+//     for { } true { }
 //     {
 //         if iszero(add(a, a)) { break }
 //     }

test/libyul/yulOptimizerTests/forLoopConditionIntoBody/empty_body.yul

@@ -5,7 +5,7 @@
 // step: forLoopConditionIntoBody
 // ----
 // {
-//     for { let a := 1 } 1 { a := add(a, 1) }
+//     for { let a := 1 } true { a := add(a, 1) }
 //     {
 //         if iszero(iszero(eq(a, 10))) { break }
 //     }

test/libyul/yulOptimizerTests/forLoopConditionIntoBody/nested.yul

@@ -19,16 +19,16 @@
 // {
 //     let random := 42
 //     for {
-//         for { let a := 1 } 1 { }
+//         for { let a := 1 } true { }
 //         {
 //             if iszero(iszero(eq(a, 10))) { break }
 //             a := add(a, 1)
 //         }
 //         let b := 1
 //     }
-//     1
+//     true
 //     {
-//         for { let c := 1 } 1 { c := add(c, 1) }
+//         for { let c := 1 } true { c := add(c, 1) }
 //         {
 //             if iszero(iszero(eq(c, 2))) { break }
 //             b := add(b, 1)

test/libyul/yulOptimizerTests/forLoopConditionIntoBody/simple.yul

@@ -9,7 +9,7 @@
 // ----
 // {
 //     let random := 42
-//     for { let a := 1 } 1 { a := add(a, 1) }
+//     for { let a := 1 } true { a := add(a, 1) }
 //     {
 //         if iszero(iszero(eq(a, 10))) { break }
 //         a := add(a, 1)

test/libyul/yulOptimizerTests/fullSuite/no_move_loop_orig.yul

@@ -14,7 +14,7 @@
 //     {
 //         let _1 := iszero(caller())
 //         for { }
-//         1
+//         true
 //         {
 //             for { } iszero(_1) { }
 //             { }