Fixes btraceio#236: Verifier does not allow simple 'return' from handler methods.

jbachorik · jbachorik · commit 827591b1f3a1 · 2016-08-03T20:39:57.000+02:00
diff --git a/src/share/classes/com/sun/btrace/compiler/VerifierVisitor.java b/src/share/classes/com/sun/btrace/compiler/VerifierVisitor.java
@@ -351,7 +351,20 @@ public Boolean visitNewClass(NewClassTree node, Void v) {
 
     @Override
     public Boolean visitReturn(ReturnTree node, Void v) {
-        reportError("return.type.should.be.void", node);
+        if (node.getExpression() != null) {
+            TreePath tp = verifier.getTreeUtils().getPath(verifier.getCompilationUnit(), node);
+            while (tp != null) {
+                tp = tp.getParentPath();
+                Tree leaf = tp.getLeaf();
+                if (leaf.getKind() == Tree.Kind.METHOD) {
+                    if (isAnnotated((MethodTree)leaf)) {
+                        return reportError("return.type.should.be.void", node);
+                    } else {
+                        return super.visitReturn(node, v);
+                    }
+                }
+            }
+        }
         return super.visitReturn(node, v);
     }
 
