Add system property to include exception basic blocks

Author: jcoultas

README.md

@@ -70,6 +70,12 @@ There are command line options that can be used:
 | `-a`        | Report the ancestry of the entrypoint                           | `-a`                                                       |
 | `-o`        | The name of the output file                                     | `-o example`                                               |
 
+### System Properties
+| Property | Usage | Example |
+| --- | --- | --- |
+| jcg.includeExceptionBasicBlocks | Set to "true" to included exception basic blocks, otherwise these will be excluded by default | -Djcg.includeExceptionBasicBlocks=true |
+
+
 ## Known Restrictions
 
 * The static call graph generator does not account for methods invoked via reflection.

src/main/java/gr/gousiosg/javacg/stat/MethodVisitor.java

@@ -149,10 +149,12 @@ private List<LinkedList<InstructionHandle>> computeBasicBlocks(InstructionList i
     public Set<Pair<String, String>> start() {
         if (mg.isAbstract() || mg.isNative()) return Collections.emptySet();
 
+        boolean includeExceptionBasicBlocks = Boolean.getBoolean("jcg.includeExceptionBasicBlocks");
+
         List<LinkedList<InstructionHandle>> bbs = this.computeBasicBlocks(mg.getInstructionList());
 
         for (LinkedList<InstructionHandle> bb : bbs) {
-            if (bb.getLast().getInstruction() instanceof ATHROW) {
+            if (!includeExceptionBasicBlocks && bb.getLast().getInstruction() instanceof ATHROW) {
                 // skip BBs that throw exceptions
                 continue;
             }