commit 95dd66b152b0477ad942c5a39bfc838a8dce1c4d
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Jun 11 09:12:45 2018 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Jun 11 09:12:45 2018 +0200
tree 06fd02b8959714eab1e73589373d12b48eb8b65f
parent 8fdef07235fb0083db4ea837c2c3ba750ec246fe

Rename merged exception classes in DeadCodeRemover

This CL renames the guards in catch handlers in the DeadCodeRemover, and removes catch handlers that are clearly not needed after renaming.

Example:

  try { ... }
  catch (ExceptionB e) { ... }
  catch (ExceptionA e) {
    // If ExceptionA gets merged into ExceptionB, then this handler is clearly dead
    ...
  }

Bug: 73958515
Change-Id: I85613f28ee45fe1f6edad2644252fb3ba14a747a

src/test/examples/classmerging/ExceptionTest.java

diff --git a/src/test/examples/classmerging/ExceptionTest.java b/src/test/examples/classmerging/ExceptionTest.java
index b365b2a..28442f3 100644
--- a/src/test/examples/classmerging/ExceptionTest.java
+++ b/src/test/examples/classmerging/ExceptionTest.java
@@ -8,12 +8,27 @@
   public static void main(String[] args) {
     // The following will lead to a catch handler for ExceptionA, which is merged into ExceptionB.
     try {
-      throw new ExceptionB("Ouch!");
+      doSomethingThatMightThrowExceptionB();
+      doSomethingThatMightThrowException2();
+    } catch (ExceptionB exception) {
+      System.out.println("Caught exception: " + exception.getMessage());
     } catch (ExceptionA exception) {
       System.out.println("Caught exception: " + exception.getMessage());
+    } catch (Exception2 exception) {
+      System.out.println("Caught exception: " + exception.getMessage());
+    } catch (Exception1 exception) {
+      System.out.println("Caught exception: " + exception.getMessage());
     }
   }
 
+  private static void doSomethingThatMightThrowExceptionB() throws ExceptionB {
+    throw new ExceptionB("Ouch!");
+  }
+
+  private static void doSomethingThatMightThrowException2() throws Exception2 {
+    throw new Exception2("Ouch!");
+  }
+
   // Will be merged into ExceptionB when class merging is enabled.
   public static class ExceptionA extends Exception {
     public ExceptionA(String message) {
@@ -26,4 +41,16 @@
       super(message);
     }
   }
+
+  public static class Exception1 extends Exception {
+    public Exception1(String message) {
+      super(message);
+    }
+  }
+
+  public static class Exception2 extends Exception1 {
+    public Exception2(String message) {
+      super(message);
+    }
+  }
 }