added check if method has only a return statement for ShadowFramePlug…

…in, otherwise java.lang.System.java fails to compile. (MobiVM#26)
lew487 · Jul 11, 2016 · f4f7fb1 · f4f7fb1
1 parent 4770f7e
commit f4f7fb1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...iler/compiler/src/main/java/org/robovm/compiler/plugin/shadowframe/ShadowFramePlugin.java b/...iler/compiler/src/main/java/org/robovm/compiler/plugin/shadowframe/ShadowFramePlugin.java
@@ -5,7 +5,6 @@
 
 import org.robovm.compiler.Functions;
 import org.robovm.compiler.ModuleBuilder;
-import org.robovm.compiler.Types;
 import org.robovm.compiler.clazz.Clazz;
 import org.robovm.compiler.config.Config;
 import org.robovm.compiler.llvm.BasicBlock;
@@ -17,7 +16,6 @@
 import org.robovm.compiler.llvm.Ret;
 import org.robovm.compiler.llvm.Type;
 import org.robovm.compiler.llvm.Value;
-import org.robovm.compiler.llvm.Variable;
 import org.robovm.compiler.llvm.VariableRef;
 import org.robovm.compiler.plugin.AbstractCompilerPlugin;
 
@@ -42,6 +40,11 @@ public void afterMethod(Config config, Clazz clazz, SootMethod method, ModuleBui
         }
 
         BasicBlock entryBlock = function.getBasicBlocks().get(0);
+
+        //Method has only a return null statement
+        if (entryBlock.getInstructions().size() == 1) {
+        	return;
+        }
 
         // get functionsAddress for shadowframe
         String functionSignature = function.getSignature();