[GitHub] jlahoda closed pull request #1003: Avoiding crash on orphaned catch block, and ensuring its content is r…

[GitBox <gi...@apache.org>]

jlahoda closed pull request #1003: Avoiding crash on orphaned catch block, and ensuring its content is r…
URL: https://github.com/apache/incubator-netbeans/pull/1003
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBAttr.java b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBAttr.java
index 07d94a4a31..edd5f6c8d6 100644
--- a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBAttr.java
+++ b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBAttr.java
@@ -23,11 +23,14 @@
 import com.sun.tools.javac.comp.Env;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCBlock;
+import com.sun.tools.javac.tree.JCTree.JCCatch;
 import com.sun.tools.javac.tree.JCTree.JCClassDecl;
 import com.sun.tools.javac.tree.JCTree.JCExpression;
 import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
 import com.sun.tools.javac.tree.JCTree.JCNewClass;
+import com.sun.tools.javac.tree.TreeMaker;
 import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.List;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Field;
@@ -49,10 +52,12 @@ public Attr make(Context c) {
     }
 
     private final CancelService cancelService;
+    private final TreeMaker tm;
 
     public NBAttr(Context context) {
         super(context);
         cancelService = CancelService.instance(context);
+        tm = TreeMaker.instance(context);
     }
 
     @Override
@@ -73,6 +78,11 @@ public void visitBlock(JCBlock tree) {
         super.visitBlock(tree);
     }
 
+    @Override
+    public void visitCatch(JCCatch that) {
+        super.visitBlock(tm.Block(0, List.of(that.param, that.body)));
+    }
+
     private boolean fullyAttribute;
     private Env<AttrContext> fullyAttributeResult;
 
diff --git a/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBAttrTest.java b/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBAttrTest.java
index 5ab20625ae..683613abf4 100644
--- a/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBAttrTest.java
+++ b/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBAttrTest.java
@@ -19,6 +19,9 @@
 package org.netbeans.lib.nbjavac.services;
 
 import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.tree.ErroneousTree;
+import com.sun.source.tree.IdentifierTree;
+import com.sun.source.tree.MemberSelectTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.util.JavacTask;
 import com.sun.source.util.TreePathScanner;
@@ -64,6 +67,38 @@ public Void visitMethodInvocation(MethodInvocationTree tree, Void p) {
         }.scan(parsed.second(), null);
     }
 
+    public void testCrashOrphanedCatch() throws Exception {
+        String code = "public class Test { void t() { catch (Exception ex) { System.err.println(0); } } }";
+        Pair<JavacTask, CompilationUnitTree> parsed = compile(code);
+
+        new TreePathScanner<Void, Void>() {
+            @Override
+            public Void visitErroneous(ErroneousTree node, Void p) {
+                return scan(node.getErrorTrees(), null);
+            }
+            @Override
+            public Void visitMethodInvocation(MethodInvocationTree tree, Void p) {
+                checkIsAttributed();
+                return super.visitMethodInvocation(tree, p);
+            }
+            @Override
+            public Void visitIdentifier(IdentifierTree node, Void p) {
+                checkIsAttributed();
+                return super.visitIdentifier(node, p);
+            }
+            @Override
+            public Void visitMemberSelect(MemberSelectTree node, Void p) {
+                checkIsAttributed();
+                return super.visitMemberSelect(node, p);
+            }
+
+            private void checkIsAttributed() {
+                Trees trees = Trees.instance(parsed.first());
+                assertNotNull(getCurrentPath().getLeaf().toString(), trees.getElement(getCurrentPath()));
+            }
+        }.scan(parsed.second(), null);
+    }
+
     //<editor-fold defaultstate="collapsed" desc=" Test Infrastructure ">
     private static class MyFileObject extends SimpleJavaFileObject {
         private String text;
@@ -97,7 +132,7 @@ protected void setUp() throws Exception {
         Context context = new Context();
         NBMessager.preRegister(context, null, DEV_NULL, DEV_NULL, DEV_NULL);
         NBAttr.preRegister(context);
-        final JavacTaskImpl ct = (JavacTaskImpl) ((JavacTool)tool).getTask(null, std, null, Arrays.asList("-source", "1.6", "-target", "1.6"), null, Arrays.asList(new MyFileObject(code)), context);
+        final JavacTaskImpl ct = (JavacTaskImpl) ((JavacTool)tool).getTask(null, std, null, Arrays.asList("-source", "1.8", "-target", "1.8"), null, Arrays.asList(new MyFileObject(code)), context);
 
         CompilationUnitTree cut = ct.parse().iterator().next();
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists