src/jdk.compiler/share/classes/com/sun/tools/javac/comp/AttrRecover.java

rev 58628 : imported patch 8240658
rev 58629 : [mq]: 8240658-2

@@ -150,11 +150,11 @@
                                 @Override
                                 public void visitClassDef(JCClassDecl tree) {
                                     //do not touch nested classes
                                 }
                             }.translate(lambda.body);
-                            if (!voidCompatible) {
+                            if (!voidCompatible && lambda.body.hasTag(Tag.BLOCK)) {
                                 JCReturn ret = make.Return(make.Erroneous().setType(syms.errType));
                                 ((JCBlock) lambda.body).stats = ((JCBlock) lambda.body).stats.append(ret);
                                 rollback.append(() -> {
                                     ((JCBlock) lambda.body).stats = List.filter(((JCBlock) lambda.body).stats, ret);
                                 });