[ci skip] Always add return to patterns

cafejojo · Jul 2, 2018 · 11637ef · 11637ef
1 parent 153472e
commit 11637ef
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/...kotlin/org/cafejojo/schaapi/miningpipeline/testgenerator/jimpleevosuite/ClassGenerator.kt b/...kotlin/org/cafejojo/schaapi/miningpipeline/testgenerator/jimpleevosuite/ClassGenerator.kt
@@ -23,6 +23,7 @@ import soot.Unit
 import soot.Value
 import soot.VoidType
 import soot.jimple.ArrayRef
+import soot.jimple.AssignStmt
 import soot.jimple.DoubleConstant
 import soot.jimple.FieldRef
 import soot.jimple.FloatConstant
@@ -147,8 +148,16 @@ internal class ClassGenerator(className: String) {
                 else lastStatement.op.type
             is JReturnVoidStmt -> VoidType.v()
             else -> {
-                jimpleBody.units.add(Jimple.v().newReturnVoidStmt())
-                VoidType.v()
+                val lastAss = jimpleBody.units
+                    .filterIsInstance<AssignStmt>()
+                    .lastOrNull()
+                if (lastAss == null) {
+                    jimpleBody.units.add(Jimple.v().newReturnVoidStmt())
+                    VoidType.v()
+                } else {
+                    jimpleBody.units.add(Jimple.v().newReturnStmt(lastAss.leftOp))
+                    lastAss.leftOp.type
+                }
             }
         }
     }