Fix #1135: Redundant constant "&& true" added to decompiled code.

Suppress && / || transformation, if rhs is the identity of the operator.
icsharpcode · Jun 23, 2018 · 6ca3863 · 6ca3863
1 parent 6096b7d
commit 6ca3863
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs b/ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs
@@ -2203,11 +2203,11 @@ protected internal override TranslatedExpression VisitIfInstruction(IfInstructio
 			BinaryOperatorType op = BinaryOperatorType.Any;
 			TranslatedExpression rhs = default(TranslatedExpression);
 
-			if (inst.MatchLogicAnd(out var lhsInst, out var rhsInst)) {
+			if (inst.MatchLogicAnd(out var lhsInst, out var rhsInst) && !rhsInst.MatchLdcI4(1)) {
 				op = BinaryOperatorType.ConditionalAnd;
 				Debug.Assert(rhsInst == inst.TrueInst);
 				rhs = trueBranch;
-			} else if (inst.MatchLogicOr(out lhsInst, out rhsInst)) {
+			} else if (inst.MatchLogicOr(out lhsInst, out rhsInst) && !rhsInst.MatchLdcI4(0)) {
 				op = BinaryOperatorType.ConditionalOr;
 				Debug.Assert(rhsInst == inst.FalseInst);
 				rhs = falseBranch;