Merge pull request projectlombok#3602 from oleludwig/fix_sneak_throws…

…_and_prevent_null_analysis_remover

Fix removal of SneakyThrows and PreventNullAnalysis from bytecode

AUTHORS

@@ -34,6 +34,7 @@ Mateusz Matela <[email protected]>
 Michael Dardis <[email protected]>
 Michael Ernst <[email protected]>
 Michiel Verheul <[email protected]>
+Ole Ludwig <[email protected]>
 Pascal Bihler <[email protected]>
 Peter Grant <[email protected]>
 Philipp Eichhorn <[email protected]>

src/core/lombok/bytecode/FixedClassWriter.java

@@ -28,6 +28,10 @@ class FixedClassWriter extends ClassWriter {
 	FixedClassWriter(ClassReader classReader, int flags) {
 		super(classReader, flags);
 	}
+
+	FixedClassWriter(int flags) {
+		super(flags);
+	}
 
 	@Override protected String getCommonSuperClass(String type1, String type2) {
 		//By default, ASM will attempt to live-load the class types, which will fail if meddling with classes in an
@@ -40,4 +44,4 @@ class FixedClassWriter extends ClassWriter {
 			return "java/lang/Object";
 		}
 	}
-}
+}

src/core/lombok/bytecode/PreventNullAnalysisRemover.java

@@ -44,7 +44,7 @@ public class PreventNullAnalysisRemover implements PostCompilerTransformation {
 		byte[] fixedByteCode = fixJSRInlining(original);
 
 		ClassReader reader = new ClassReader(fixedByteCode);
-		ClassWriter writer = new FixedClassWriter(reader, 0);
+		ClassWriter writer = new FixedClassWriter(0);
 
 		final AtomicBoolean changesMade = new AtomicBoolean();
 

src/core/lombok/bytecode/SneakyThrowsRemover.java

@@ -46,7 +46,7 @@ public class SneakyThrowsRemover implements PostCompilerTransformation {
 		byte[] fixedByteCode = fixJSRInlining(original);
 
 		ClassReader reader = new ClassReader(fixedByteCode);
-		ClassWriter writer = new ClassWriter(reader, 0);
+		ClassWriter writer = new ClassWriter(0);
 
 		final AtomicBoolean changesMade = new AtomicBoolean();
 

test/bytecode/resource/PostCompilePreventNullAnalysis.java

@@ -0,0 +1,15 @@
+public class PostCompilePreventNullAnalysis {
+	public void test() {
+		Object o = "Hello World!";
+		try {
+			System.out.println(o);
+		} finally {
+			if (o != null) {
+				if (lombok.Lombok.preventNullAnalysis(o) != null) {
+					o.toString();
+				}
+			}
+		}
+	}
+
+}

test/bytecode/src/lombok/bytecode/TestPostCompiler.java

@@ -33,7 +33,7 @@
 
 public class TestPostCompiler {
 	@Test
-	public void testPostCompiler() throws IOException {
+	public void testPostCompilerSneakyThrows() {
 		byte[] compiled = TestClassFileMetaData.compile(new File("test/bytecode/resource/PostCompileSneaky.java"));
 		DiagnosticsReceiver receiver = new DiagnosticsReceiver() {
 			@Override public void addWarning(String message) {
@@ -50,5 +50,31 @@ public void testPostCompiler() throws IOException {
 
 		assertNotSame("Post-compiler did not do anything; we expected it to remove a Lombok.sneakyThrow() call.", compiled, transformed);
 		assertTrue("After removing a sneakyThrow the classfile got... bigger (or stayed equal in size). Huh?", transformed.length < compiled.length);
+
+		assertFalse("After post compilation, expected no lombok.Lombok.sneakyThrow() call in compiled code, but it's there",
+				new ClassFileMetaData(transformed).usesMethod("lombok/Lombok", "sneakyThrow"));
+	}
+
+	@Test
+	public void testPostCompilerPreventNullAnalysis() {
+		byte[] compiled = TestClassFileMetaData.compile(new File("test/bytecode/resource/PostCompilePreventNullAnalysis.java"));
+		DiagnosticsReceiver receiver = new DiagnosticsReceiver() {
+			@Override public void addWarning(String message) {
+				fail("Warning during post compilation processing of a sneakyThrow call: " + message);
+			}
+
+			@Override public void addError(String message) {
+				fail("Error during post compilation processing of a sneakyThrow call: " + message);
+			}
+		};
+		assertTrue("Before post compilation, expected lombok.Lombok.preventNullAnalysis() call in compiled code, but it's not there",
+				new ClassFileMetaData(compiled).usesMethod("lombok/Lombok", "preventNullAnalysis"));
+		byte[] transformed = PostCompiler.applyTransformations(compiled, "PostCompilePreventNullAnalysis.java", receiver);
+
+		assertNotSame("Post-compiler did not do anything; we expected it to remove a Lombok.preventNullAnalysis() call.", compiled, transformed);
+		assertTrue("After removing a sneakyThrow the classfile got... bigger (or stayed equal in size). Huh?", transformed.length < compiled.length);
+
+		assertFalse("After post compilation, expected no lombok.Lombok.preventNullAnalysis() call in compiled code, but it's there",
+				new ClassFileMetaData(transformed).usesMethod("lombok/Lombok", "preventNullAnalysis"));
 	}
 }