Skip to content

Commit

Permalink
reduce checks for common annotations and propagate compilation abort
Browse files Browse the repository at this point in the history 
#957
  • Loading branch information
@eric-milles
eric-milles committed Sep 22, 2019
1 parent ea55d68 commit 34ea574
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 114 deletions.
39 changes: 20 additions & 19 deletions .../e410/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1398,39 +1398,40 @@ public void setPersistibleAnnotation(ContainerAnnotation container) {

// GROOVY add
private boolean isFakeGroovyAnnotation(TypeBinding tb) {
char[][] packageName = tb.getPackage().compoundName;
try {
if (tb instanceof ReferenceBinding) {
ReferenceBinding trb = (ReferenceBinding) tb;
if (isInterestingGroovyType(trb)) {
AnnotationBinding[] abs = trb.getAnnotations();
if (abs != null && abs.length > 0) {
for (AnnotationBinding ab : abs) {
if (ab == null) continue;
ReferenceBinding arb = ab.getAnnotationType();
if (arb != null && arb.compoundName != null) {
String name = CharOperation.toString(arb.compoundName);
if (name.equals("groovy.transform.AnnotationCollector")) { //$NON-NLS-1$
return true;
}
if ((packageName.length==0 || !CharOperation.equals(packageName[0], TypeConstants.JAVA)) &&
tb instanceof ReferenceBinding && isInterestingGroovyType((ReferenceBinding) tb)) {
AnnotationBinding[] annotations = tb.getAnnotations();
if (annotations != null && annotations.length > 0) {
for (AnnotationBinding ab : annotations) {
if (ab == null) continue;
ReferenceBinding arb = ab.getAnnotationType();
if (arb != null && arb.compoundName != null) {
String name = CharOperation.toString(arb.compoundName);
if (name.equals("groovy.transform.AnnotationCollector")) { //$NON-NLS-1$
return true;
}
}
}
}
}
} catch (Throwable t) {
} catch (org.eclipse.jdt.internal.compiler.problem.AbortCompilation abort) {
throw abort;
} catch (Exception e) {
// Protect the JDT!
t.printStackTrace();
e.printStackTrace();
}
return false;
}

/**
* Try to eliminate things we don't care about from being 'special groovy handled'.
*/
private static boolean isInterestingGroovyType(ReferenceBinding rtb) {
return (!rtb.isBinaryBinding() || // TODO: stricter check for source bindings
rtb.getField(SPECIAL_GROOVY_FIELD_NAME, /*needResolve:*/ false) != null ||
rtb.getPackage().knownTypes.containsKey(CharOperation.concat(rtb.sourceName(), COLLECTOR_HELPER_NAME)));
private static boolean isInterestingGroovyType(ReferenceBinding tb) {
return (!tb.isBinaryBinding() || // TODO: stricter check for source bindings
tb.getField(SPECIAL_GROOVY_FIELD_NAME, /*needResolve:*/ false) != null ||
tb.getPackage().knownTypes.containsKey(CharOperation.concat(tb.sourceName(), COLLECTOR_HELPER_NAME)));
}

private static final char[] COLLECTOR_HELPER_NAME = "$CollectorHelper".toCharArray(); //$NON-NLS-1$
Expand Down
39 changes: 20 additions & 19 deletions .../e411/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1398,39 +1398,40 @@ public void setPersistibleAnnotation(ContainerAnnotation container) {

// GROOVY add
private boolean isFakeGroovyAnnotation(TypeBinding tb) {
char[][] packageName = tb.getPackage().compoundName;
try {
if (tb instanceof ReferenceBinding) {
ReferenceBinding trb = (ReferenceBinding) tb;
if (isInterestingGroovyType(trb)) {
AnnotationBinding[] abs = trb.getAnnotations();
if (abs != null && abs.length > 0) {
for (AnnotationBinding ab : abs) {
if (ab == null) continue;
ReferenceBinding arb = ab.getAnnotationType();
if (arb != null && arb.compoundName != null) {
String name = CharOperation.toString(arb.compoundName);
if (name.equals("groovy.transform.AnnotationCollector")) { //$NON-NLS-1$
return true;
}
if ((packageName.length==0 || !CharOperation.equals(packageName[0], TypeConstants.JAVA)) &&
tb instanceof ReferenceBinding && isInterestingGroovyType((ReferenceBinding) tb)) {
AnnotationBinding[] annotations = tb.getAnnotations();
if (annotations != null && annotations.length > 0) {
for (AnnotationBinding ab : annotations) {
if (ab == null) continue;
ReferenceBinding arb = ab.getAnnotationType();
if (arb != null && arb.compoundName != null) {
String name = CharOperation.toString(arb.compoundName);
if (name.equals("groovy.transform.AnnotationCollector")) { //$NON-NLS-1$
return true;
}
}
}
}
}
} catch (Throwable t) {
} catch (org.eclipse.jdt.internal.compiler.problem.AbortCompilation abort) {
throw abort;
} catch (Exception e) {
// Protect the JDT!
t.printStackTrace();
e.printStackTrace();
}
return false;
}

/**
* Try to eliminate things we don't care about from being 'special groovy handled'.
*/
private static boolean isInterestingGroovyType(ReferenceBinding rtb) {
return (!rtb.isBinaryBinding() || // TODO: stricter check for source bindings
rtb.getField(SPECIAL_GROOVY_FIELD_NAME, /*needResolve:*/ false) != null ||
rtb.getPackage().knownTypes.containsKey(CharOperation.concat(rtb.sourceName(), COLLECTOR_HELPER_NAME)));
private static boolean isInterestingGroovyType(ReferenceBinding tb) {
return (!tb.isBinaryBinding() || // TODO: stricter check for source bindings
tb.getField(SPECIAL_GROOVY_FIELD_NAME, /*needResolve:*/ false) != null ||
tb.getPackage().knownTypes.containsKey(CharOperation.concat(tb.sourceName(), COLLECTOR_HELPER_NAME)));
}

private static final char[] COLLECTOR_HELPER_NAME = "$CollectorHelper".toCharArray(); //$NON-NLS-1$
Expand Down
39 changes: 20 additions & 19 deletions .../e412/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1398,39 +1398,40 @@ public void setPersistibleAnnotation(ContainerAnnotation container) {

// GROOVY add
private boolean isFakeGroovyAnnotation(TypeBinding tb) {
char[][] packageName = tb.getPackage().compoundName;
try {
if (tb instanceof ReferenceBinding) {
ReferenceBinding trb = (ReferenceBinding) tb;
if (isInterestingGroovyType(trb)) {
AnnotationBinding[] abs = trb.getAnnotations();
if (abs != null && abs.length > 0) {
for (AnnotationBinding ab : abs) {
if (ab == null) continue;
ReferenceBinding arb = ab.getAnnotationType();
if (arb != null && arb.compoundName != null) {
String name = CharOperation.toString(arb.compoundName);
if (name.equals("groovy.transform.AnnotationCollector")) { //$NON-NLS-1$
return true;
}
if ((packageName.length==0 || !CharOperation.equals(packageName[0], TypeConstants.JAVA)) &&
tb instanceof ReferenceBinding && isInterestingGroovyType((ReferenceBinding) tb)) {
AnnotationBinding[] annotations = tb.getAnnotations();
if (annotations != null && annotations.length > 0) {
for (AnnotationBinding ab : annotations) {
if (ab == null) continue;
ReferenceBinding arb = ab.getAnnotationType();
if (arb != null && arb.compoundName != null) {
String name = CharOperation.toString(arb.compoundName);
if (name.equals("groovy.transform.AnnotationCollector")) { //$NON-NLS-1$
return true;
}
}
}
}
}
} catch (Throwable t) {
} catch (org.eclipse.jdt.internal.compiler.problem.AbortCompilation abort) {
throw abort;
} catch (Exception e) {
// Protect the JDT!
t.printStackTrace();
e.printStackTrace();
}
return false;
}

/**
* Try to eliminate things we don't care about from being 'special groovy handled'.
*/
private static boolean isInterestingGroovyType(ReferenceBinding rtb) {
return (!rtb.isBinaryBinding() || // TODO: stricter check for source bindings
rtb.getField(SPECIAL_GROOVY_FIELD_NAME, /*needResolve:*/ false) != null ||
rtb.getPackage().knownTypes.containsKey(CharOperation.concat(rtb.sourceName(), COLLECTOR_HELPER_NAME)));
private static boolean isInterestingGroovyType(ReferenceBinding tb) {
return (!tb.isBinaryBinding() || // TODO: stricter check for source bindings
tb.getField(SPECIAL_GROOVY_FIELD_NAME, /*needResolve:*/ false) != null ||
tb.getPackage().knownTypes.containsKey(CharOperation.concat(tb.sourceName(), COLLECTOR_HELPER_NAME)));
}

private static final char[] COLLECTOR_HELPER_NAME = "$CollectorHelper".toCharArray(); //$NON-NLS-1$
Expand Down
39 changes: 20 additions & 19 deletions .../e413/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1398,39 +1398,40 @@ public void setPersistibleAnnotation(ContainerAnnotation container) {

// GROOVY add
private boolean isFakeGroovyAnnotation(TypeBinding tb) {
char[][] packageName = tb.getPackage().compoundName;
try {
if (tb instanceof ReferenceBinding) {
ReferenceBinding trb = (ReferenceBinding) tb;
if (isInterestingGroovyType(trb)) {
AnnotationBinding[] abs = trb.getAnnotations();
if (abs != null && abs.length > 0) {
for (AnnotationBinding ab : abs) {
if (ab == null) continue;
ReferenceBinding arb = ab.getAnnotationType();
if (arb != null && arb.compoundName != null) {
String name = CharOperation.toString(arb.compoundName);
if (name.equals("groovy.transform.AnnotationCollector")) { //$NON-NLS-1$
return true;
}
if ((packageName.length==0 || !CharOperation.equals(packageName[0], TypeConstants.JAVA)) &&
tb instanceof ReferenceBinding && isInterestingGroovyType((ReferenceBinding) tb)) {
AnnotationBinding[] annotations = tb.getAnnotations();
if (annotations != null && annotations.length > 0) {
for (AnnotationBinding ab : annotations) {
if (ab == null) continue;
ReferenceBinding arb = ab.getAnnotationType();
if (arb != null && arb.compoundName != null) {
String name = CharOperation.toString(arb.compoundName);
if (name.equals("groovy.transform.AnnotationCollector")) { //$NON-NLS-1$
return true;
}
}
}
}
}
} catch (Throwable t) {
} catch (org.eclipse.jdt.internal.compiler.problem.AbortCompilation abort) {
throw abort;
} catch (Exception e) {
// Protect the JDT!
t.printStackTrace();
e.printStackTrace();
}
return false;
}

/**
* Try to eliminate things we don't care about from being 'special groovy handled'.
*/
private static boolean isInterestingGroovyType(ReferenceBinding rtb) {
return (!rtb.isBinaryBinding() || // TODO: stricter check for source bindings
rtb.getField(SPECIAL_GROOVY_FIELD_NAME, /*needResolve:*/ false) != null ||
rtb.getPackage().knownTypes.containsKey(CharOperation.concat(rtb.sourceName(), COLLECTOR_HELPER_NAME)));
private static boolean isInterestingGroovyType(ReferenceBinding tb) {
return (!tb.isBinaryBinding() || // TODO: stricter check for source bindings
tb.getField(SPECIAL_GROOVY_FIELD_NAME, /*needResolve:*/ false) != null ||
tb.getPackage().knownTypes.containsKey(CharOperation.concat(tb.sourceName(), COLLECTOR_HELPER_NAME)));
}

private static final char[] COLLECTOR_HELPER_NAME = "$CollectorHelper".toCharArray(); //$NON-NLS-1$
Expand Down
39 changes: 20 additions & 19 deletions ...h/e48/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1395,39 +1395,40 @@ public void setPersistibleAnnotation(ContainerAnnotation container) {

// GROOVY add
private boolean isFakeGroovyAnnotation(TypeBinding tb) {
char[][] packageName = tb.getPackage().compoundName;
try {
if (tb instanceof ReferenceBinding) {
ReferenceBinding trb = (ReferenceBinding) tb;
if (isInterestingGroovyType(trb)) {
AnnotationBinding[] abs = trb.getAnnotations();
if (abs != null && abs.length > 0) {
for (AnnotationBinding ab : abs) {
if (ab == null) continue;
ReferenceBinding arb = ab.getAnnotationType();
if (arb != null && arb.compoundName != null) {
String name = CharOperation.toString(arb.compoundName);
if (name.equals("groovy.transform.AnnotationCollector")) { //$NON-NLS-1$
return true;
}
if ((packageName.length==0 || !CharOperation.equals(packageName[0], TypeConstants.JAVA)) &&
tb instanceof ReferenceBinding && isInterestingGroovyType((ReferenceBinding) tb)) {
AnnotationBinding[] annotations = tb.getAnnotations();
if (annotations != null && annotations.length > 0) {
for (AnnotationBinding ab : annotations) {
if (ab == null) continue;
ReferenceBinding arb = ab.getAnnotationType();
if (arb != null && arb.compoundName != null) {
String name = CharOperation.toString(arb.compoundName);
if (name.equals("groovy.transform.AnnotationCollector")) { //$NON-NLS-1$
return true;
}
}
}
}
}
} catch (Throwable t) {
} catch (org.eclipse.jdt.internal.compiler.problem.AbortCompilation abort) {
throw abort;
} catch (Exception e) {
// Protect the JDT!
t.printStackTrace();
e.printStackTrace();
}
return false;
}

/**
* Try to eliminate things we don't care about from being 'special groovy handled'.
*/
private static boolean isInterestingGroovyType(ReferenceBinding rtb) {
return (!rtb.isBinaryBinding() || // TODO: stricter check for source bindings
rtb.getField(SPECIAL_GROOVY_FIELD_NAME, /*needResolve:*/ false) != null ||
rtb.getPackage().knownTypes.containsKey(CharOperation.concat(rtb.sourceName(), COLLECTOR_HELPER_NAME)));
private static boolean isInterestingGroovyType(ReferenceBinding tb) {
return (!tb.isBinaryBinding() || // TODO: stricter check for source bindings
tb.getField(SPECIAL_GROOVY_FIELD_NAME, /*needResolve:*/ false) != null ||
tb.getPackage().knownTypes.containsKey(CharOperation.concat(tb.sourceName(), COLLECTOR_HELPER_NAME)));
}

private static final char[] COLLECTOR_HELPER_NAME = "$CollectorHelper".toCharArray(); //$NON-NLS-1$
Expand Down
39 changes: 20 additions & 19 deletions ...h/e49/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Annotation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1398,39 +1398,40 @@ public void setPersistibleAnnotation(ContainerAnnotation container) {

// GROOVY add
private boolean isFakeGroovyAnnotation(TypeBinding tb) {
char[][] packageName = tb.getPackage().compoundName;
try {
if (tb instanceof ReferenceBinding) {
ReferenceBinding trb = (ReferenceBinding) tb;
if (isInterestingGroovyType(trb)) {
AnnotationBinding[] abs = trb.getAnnotations();
if (abs != null && abs.length > 0) {
for (AnnotationBinding ab : abs) {
if (ab == null) continue;
ReferenceBinding arb = ab.getAnnotationType();
if (arb != null && arb.compoundName != null) {
String name = CharOperation.toString(arb.compoundName);
if (name.equals("groovy.transform.AnnotationCollector")) { //$NON-NLS-1$
return true;
}
if ((packageName.length==0 || !CharOperation.equals(packageName[0], TypeConstants.JAVA)) &&
tb instanceof ReferenceBinding && isInterestingGroovyType((ReferenceBinding) tb)) {
AnnotationBinding[] annotations = tb.getAnnotations();
if (annotations != null && annotations.length > 0) {
for (AnnotationBinding ab : annotations) {
if (ab == null) continue;
ReferenceBinding arb = ab.getAnnotationType();
if (arb != null && arb.compoundName != null) {
String name = CharOperation.toString(arb.compoundName);
if (name.equals("groovy.transform.AnnotationCollector")) { //$NON-NLS-1$
return true;
}
}
}
}
}
} catch (Throwable t) {
} catch (org.eclipse.jdt.internal.compiler.problem.AbortCompilation abort) {
throw abort;
} catch (Exception e) {
// Protect the JDT!
t.printStackTrace();
e.printStackTrace();
}
return false;
}

/**
* Try to eliminate things we don't care about from being 'special groovy handled'.
*/
private static boolean isInterestingGroovyType(ReferenceBinding rtb) {
return (!rtb.isBinaryBinding() || // TODO: stricter check for source bindings
rtb.getField(SPECIAL_GROOVY_FIELD_NAME, /*needResolve:*/ false) != null ||
rtb.getPackage().knownTypes.containsKey(CharOperation.concat(rtb.sourceName(), COLLECTOR_HELPER_NAME)));
private static boolean isInterestingGroovyType(ReferenceBinding tb) {
return (!tb.isBinaryBinding() || // TODO: stricter check for source bindings
tb.getField(SPECIAL_GROOVY_FIELD_NAME, /*needResolve:*/ false) != null ||
tb.getPackage().knownTypes.containsKey(CharOperation.concat(tb.sourceName(), COLLECTOR_HELPER_NAME)));
}

private static final char[] COLLECTOR_HELPER_NAME = "$CollectorHelper".toCharArray(); //$NON-NLS-1$
Expand Down

0 comments on commit 34ea574

Please sign in to comment.