Fixed some missing gotos and labels

almazik · Feb 9, 2011 · 0d522ba · 0d522ba
1 parent a420fd6
commit 0d522ba
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 15 deletions.
diff --git a/ICSharpCode.Decompiler/Ast/AstMetodBodyBuilder.cs b/ICSharpCode.Decompiler/Ast/AstMetodBodyBuilder.cs
@@ -135,15 +135,18 @@ public BlockStatement CreateMethodBody()
 						}
 					}
 				}
+				foreach(Ast.INode inode in TransformNodes(node.Childs)) {
+					yield return inode;
+				}
 				Node fallThroughNode = ((BasicBlock)node).FallThroughBasicBlock;
 				// If there is default branch and it is not the following node
 				if (fallThroughNode != null) {
 					yield return new Ast.GotoStatement(fallThroughNode.Label);
 				}
 			} else if (node is AcyclicGraph) {
-				Ast.BlockStatement blockStatement = new Ast.BlockStatement();
-				blockStatement.Children.AddRange(TransformNodes(node.Childs));
-				yield return blockStatement;
+				foreach(Ast.INode inode in TransformNodes(node.Childs)) {
+					yield return inode;
+				}
 			} else if (node is Loop) {
 				Ast.BlockStatement blockStatement = new Ast.BlockStatement();
 				blockStatement.Children.AddRange(TransformNodes(node.Childs));
@@ -349,7 +352,7 @@ static object TransformByteCode(MethodDefinition methodDef, ILExpression byteCod
 				if (byteCode.Operand != null) {
 					args.Insert(0, new IdentifierExpression(FormatByteCodeOperand(byteCode.Operand)));
 				}
-				return new Ast.InvocationExpression(new IdentifierExpression("__" + byteCode.OpCode.Name), args);
+				return new Ast.InvocationExpression(new IdentifierExpression(byteCode.OpCode.Name), args);
 			}
 		}
 
@@ -391,7 +394,7 @@ static Ast.INode TransformByteCode_Internal(MethodDefinition methodDef, ILExpres
 			Ast.Expression arg3 = args.Count >= 3 ? args[2] : null;
 
 			Ast.Statement branchCommand = null;
-			if (byteCode.Operand is ILExpression) {
+			if (byteCode.Operand is ILLabel) {
 				branchCommand = new Ast.GotoStatement(((ILLabel)byteCode.Operand).Name);
 			}
 

diff --git a/ICSharpCode.Decompiler/Ast/Transforms/RemoveDeadLabels.cs b/ICSharpCode.Decompiler/Ast/Transforms/RemoveDeadLabels.cs
@@ -29,6 +29,22 @@ public override object VisitMethodDeclaration(MethodDeclaration methodDeclaratio
 			return null;
 		}
 
+		public override object VisitPropertyGetRegion(PropertyGetRegion propertyGetRegion, object data)
+		{
+			collectingUsedLabels = true;
+			base.VisitPropertyGetRegion(propertyGetRegion, data);
+			collectingUsedLabels = false;
+			return base.VisitPropertyGetRegion(propertyGetRegion, data);
+		}
+
+		public override object VisitPropertySetRegion(PropertySetRegion propertySetRegion, object data)
+		{
+			collectingUsedLabels = true;
+			base.VisitPropertySetRegion(propertySetRegion, data);
+			collectingUsedLabels = false;
+			return base.VisitPropertySetRegion(propertySetRegion, data);
+		}
+
 		public override object VisitGotoStatement(GotoStatement gotoStatement, object data)
 		{
 			if (collectingUsedLabels) {

diff --git a/ICSharpCode.Decompiler/ILAst/ControlFlow/Nodes.cs b/ICSharpCode.Decompiler/ILAst/ControlFlow/Nodes.cs
@@ -170,7 +170,7 @@ ast[i] is ILTryCatchBlock ||
 					}
 				}
 				if (ast[i] is ILTryCatchBlock) {
-					nodes.Add(ConvertTryCatch((ILTryCatchBlock)ast[i]));
+					basicBlock.Childs.Add(ConvertTryCatch((ILTryCatchBlock)ast[i]));
 				} else {
 					basicBlock.Body.Add(ast[i]);
 				}

diff --git a/ICSharpCode.Decompiler/ILAst/ILAstBuilder.cs b/ICSharpCode.Decompiler/ILAst/ILAstBuilder.cs
@@ -1,12 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Decompiler.Mono.Cecil.Rocks;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-using Mono.Cecil.Rocks;
-using Cecil = Mono.Cecil;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Decompiler.Mono.Cecil.Rocks;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using Mono.Cecil.Rocks;
+using Cecil = Mono.Cecil;
 
 namespace Decompiler
 {