From 650725bbd3c5e10b9f29d3bcbab473b20a89d57b Mon Sep 17 00:00:00 2001
From: "JesusFreke@JesusFreke.com"
 <JesusFreke@JesusFreke.com@55b6fa8a-2a1e-11de-a435-ffa8d773f76a>
Date: Sat, 6 Mar 2010 06:12:16 +0000
Subject: [PATCH] Check for unreachable instructions and comment them out

git-svn-id: https://smali.googlecode.com/svn/trunk@673 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
---
 .../jf/baksmali/Adaptors/MethodDefinition.java | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java
index a250eee2..a4c431a5 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java
@@ -291,6 +291,8 @@ public class MethodDefinition {
         BitSet printPreRegister = new BitSet(registerCount);
         BitSet printPostRegister = new BitSet(registerCount);
 
+        boolean lastIsUnreachable = false;
+
         int currentCodeAddress = 0;
         for (int i=0; i<instructions.size(); i++) {
             AnalyzedInstruction instruction = instructions.get(i);
@@ -301,13 +303,25 @@ public class MethodDefinition {
 
             if (instruction.isDead()) {
                 methodItems.add(new CommentedOutMethodItem(stg, methodItem));
+                lastIsUnreachable = false;
+            } else if (instruction.getPredecessorCount() == 0 &&
+                    !instruction.getInstruction().getFormat().variableSizeFormat) {
+                if (!lastIsUnreachable) {
+                    methodItems.add(
+                            new CommentMethodItem(stg, "Unreachable code", currentCodeAddress, Double.MIN_VALUE));
+                }
+
+                methodItems.add(new CommentedOutMethodItem(stg, methodItem));
+                lastIsUnreachable = true;
             } else {
                 methodItems.add(methodItem);
+                lastIsUnreachable = false;
             }
 
             if (instruction.getInstruction().getFormat() == Format.UnresolvedNullReference) {
-                methodItems.add(new CommentedOutMethodItem(stg, InstructionMethodItemFactory.makeInstructionFormatMethodItem(this,
-                        encodedMethod.codeItem, currentCodeAddress, stg, instruction.getOriginalInstruction(), false)));
+                methodItems.add(new CommentedOutMethodItem(stg,
+                        InstructionMethodItemFactory.makeInstructionFormatMethodItem(this, encodedMethod.codeItem,
+                                currentCodeAddress, stg, instruction.getOriginalInstruction(), false)));
             }
 
             if (i != instructions.size() - 1) {