Skip to content

Commit 171bee3

Browse files
author
Juan Farré
committed
Revert the initialization to include enclosing types that can match a method or constructor signature only
1 parent 2b0e11d commit 171bee3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithincodePointcut.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ public class WithincodePointcut extends Pointcut {
3434
static {
3535
int flags = Shadow.ALL_SHADOW_KINDS_BITS;
3636
for (int i = 0; i < Shadow.SHADOW_KINDS.length; i++) {
37-
if (Shadow.SHADOW_KINDS[i].isEnclosingKind()) {
37+
if (!Shadow.SHADOW_KINDS[i].isEnclosingKind()) {
3838
flags -= Shadow.SHADOW_KINDS[i].bit;
3939
}
4040
}
41-
// these next two are needed for inlining of field initializers
42-
flags |= Shadow.ConstructorExecution.bit;
43-
flags |= Shadow.Initialization.bit;
41+
flags -= Shadow.StaticInitialization.bit;
42+
// Should we consider that initialization is withincode(ConstructorSignature)?
43+
// flags -= Shadow.Initialization.bit;
4444
matchedShadowKinds = flags;
4545
}
4646

0 commit comments

Comments
 (0)