From dcb2473da044211101743c8dd1fa8f21d55e29cd Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Wed, 22 Jan 2003 01:25:44 +0000
Subject: [PATCH] fix for failing test case that aspects must be constructed
 after their clinit has run

---
 .../internal/compiler/ast/AspectClinit.java   |  27 +++++++++++++++--
 .../compiler/ast/AspectDeclaration.java       |   8 ++---
 tests/new/options11/aspectlib1.jar            | Bin 1198 -> 1201 bytes
 tests/new/options11/aspectlib2.jar            | Bin 966 -> 966 bytes
 tests/new/options11/injar.jar                 | Bin 363 -> 363 bytes
 .../org/aspectj/weaver/AjcMemberMaker.java    |  13 ++++++--
 .../src/org/aspectj/weaver/NameMangler.java   |   4 ++-
 .../weaver/bcel/BcelCflowStackFieldAdder.java |   2 +-
 .../org/aspectj/weaver/bcel/BcelShadow.java   |  28 +++++++++++++-----
 .../org/aspectj/weaver/bcel/LazyClassGen.java |   6 ++--
 weaver/testdata/dummyAspect.jar               | Bin 589 -> 589 bytes
 weaver/testdata/megatrace.jar                 | Bin 3555 -> 3558 bytes
 weaver/testdata/megatraceNoweave.jar          | Bin 2709 -> 2712 bytes
 weaver/testdata/tracing.jar                   | Bin 2291 -> 2293 bytes
 14 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java
index d82e00cf0..4c929b91c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectClinit.java
@@ -21,28 +21,49 @@ import org.eclipse.jdt.internal.compiler.codegen.CodeStream;
 import org.eclipse.jdt.internal.compiler.lookup.ClassScope;
 
 public class AspectClinit extends Clinit {
-	public AspectClinit(Clinit old, CompilationResult compilationResult) {
+	private boolean hasPre, hasPost;
+	
+	public AspectClinit(Clinit old, CompilationResult compilationResult, boolean hasPre, boolean hasPost) {
 		super(compilationResult);
 		this.needFreeReturn = old.needFreeReturn;
 		this.sourceEnd = old.sourceEnd;
 		this.sourceStart = old.sourceStart;
 		this.declarationSourceEnd = old.declarationSourceEnd;
 		this.declarationSourceStart = old.declarationSourceStart;
+		
+		this.hasPre = hasPre;
+		this.hasPost = hasPost;
 	}
 
 	protected void generateSyntheticCode(
 		ClassScope classScope,
 		CodeStream codeStream) 
 	{
-		if (!classScope.referenceContext.binding.isAbstract()) {
+		if (hasPre) {
 			final EclipseWorld world = EclipseWorld.fromScopeLookupEnvironment(classScope);
 
 			codeStream.invokestatic(world.makeMethodBindingForCall(
-				AjcMemberMaker.ajcClinitMethod(
+				AjcMemberMaker.ajcPreClinitMethod(
 					world.fromBinding(classScope.referenceContext.binding)
 				)));
 		}
 		super.generateSyntheticCode(classScope, codeStream);
 	}
+	
+	protected void generatePostSyntheticCode(
+		ClassScope classScope,
+		CodeStream codeStream)
+	{
+		super.generatePostSyntheticCode(classScope, codeStream);
+		if (hasPost) {
+			final EclipseWorld world = EclipseWorld.fromScopeLookupEnvironment(classScope);
+
+			codeStream.invokestatic(world.makeMethodBindingForCall(
+				AjcMemberMaker.ajcPostClinitMethod(
+					world.fromBinding(classScope.referenceContext.binding)
+				)));
+		}
+		
+	}
 
 }
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
index 1ce398ea4..2ea980df5 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
@@ -169,13 +169,13 @@ public class AspectDeclaration extends MemberTypeDeclaration {
 			} else if (perClause.getKind() == PerClause.SINGLETON) {
 				binding.addField(world.makeFieldBinding(AjcMemberMaker.perSingletonField(
 						typeX)));
-				methods[0] = new AspectClinit((Clinit)methods[0], compilationResult);
+				methods[0] = new AspectClinit((Clinit)methods[0], compilationResult, false, true);
 			} else if (perClause.getKind() == PerClause.PERCFLOW) {
 				binding.addField(
 					world.makeFieldBinding(
 						AjcMemberMaker.perCflowField(
 							typeX)));
-				methods[0] = new AspectClinit((Clinit)methods[0], compilationResult);
+				methods[0] = new AspectClinit((Clinit)methods[0], compilationResult, true, false);
 			} else if (perClause.getKind() == PerClause.PEROBJECT) {
 //				binding.addField(
 //					world.makeFieldBinding(
@@ -367,7 +367,7 @@ public class AspectDeclaration extends MemberTypeDeclaration {
 		ClassFile classFile) 
 	{
 		final EclipseWorld world = EclipseWorld.fromScopeLookupEnvironment(this.scope);
-		generateMethod(classFile, world.makeMethodBinding(AjcMemberMaker.ajcClinitMethod(
+		generateMethod(classFile, world.makeMethodBinding(AjcMemberMaker.ajcPreClinitMethod(
 				world.fromBinding(binding))), 
 		new BodyGenerator() {
 			public void generate(CodeStream codeStream) {
@@ -549,7 +549,7 @@ public class AspectDeclaration extends MemberTypeDeclaration {
 		ClassFile classFile) 
 	{
 		final EclipseWorld world = EclipseWorld.fromScopeLookupEnvironment(this.scope);
-		generateMethod(classFile, world.makeMethodBinding(AjcMemberMaker.ajcClinitMethod(
+		generateMethod(classFile, world.makeMethodBinding(AjcMemberMaker.ajcPostClinitMethod(
 				world.fromBinding(binding))), 
 		new BodyGenerator() {
 			public void generate(CodeStream codeStream) {
diff --git a/tests/new/options11/aspectlib1.jar b/tests/new/options11/aspectlib1.jar
index fe2883cb42e9a5d022cca131bd182c06e84c11ac..4028b829cd7bb378241bb0090126ae41e2cb00da 100644
GIT binary patch
delta 1111
zcmV-d1gQJ239$(cP)h>@6aWYS2mqmtHIWT8e{v$fonRaXj3e8L#v+h_?EroS9E5F9
z%3u~iYt)uU$TO;$mhDi*o?l=AUywx}Rd#}_V3!3y5O%<pFQAGl;C9bgj-w$Ig;YoV
zx_$4t=XSS#{PVl-5yd4G8M<m#$>r{?yio``2{49CmG5w)#_fu+TB-_DCJ<#9<W+OD
ze=gjjWmjrKI`*>dNp72hp{LN|Xoev<Yt}5=l5a3Xv*YUwu?440)~B>1$CC?sIgJ#O
zDMZl0aJpdGVx_TN67Ef2s*!Pb!7+Jlox7GA2a|2H+HV@C)y^0)<Xdi89>a+8T@ss)
zD@KnveR{-cG@rlBa4uVL+={`yI%QV%f786-SoRu0&M2N|XgwFK=XM3(5pHg-ykn_U
z`;WCLN|&UVZ)|P~H-UbJgdcb$i9v?GY~g8Ba;_+!O<@4fkv^`l%fekQGfX|3Q>&*m
zp2x5f?HsAW>vi(Pa4{@o%al);Je<c1iph(_L^}Q&LvJ=T+DjNywig)AK1oyxe@~Ku
zag$ml!Z<@*><F8RI;rxUz(s~mRhnit3`5V#^<PVPwX8DUq;RBj{wY2uoh3l!PFI91
zS{0kihD-Guru<rVG}kH9S8=5Sui$E!=cZi(uT#0n^9tV<Y0O}(1Jjsgh*aw&r@v`+
zQ=NkG(7Q1lcEqa1TejR1(lXPCf1|CP$~(_+p@qhZGpC31PQxxQ?U|x3Eyqq^F@+^{
z7uvVD=UeET_px@Q4ofC*nJPLB*A&++b(uPkXysJh8OB1WX*tb?Toh)FyIh6)hiejq
z9SK?UgDyC>6nipUf)905lw1<A7<VgEbV?(1!vTt?M4?`iz6k;)N~0n8f1lU`r0;6G
zPWo-57G%ZL6A@S%)T-I|!~wdLX#}U}H?1duZteW!<{tEtRUeI}SQ5xcq9kPVfO)`Q
z!G{756O0J`^r(&wxkfK7&0z2l0~_6E4lpz^xsQ>3jP4`*0GEzg^i$j3WRW6#pb2;C
zQA9HvAWM2H{tKtC2wy8se_yIj2&b3-7pE@b)J^4~$0!i_3bkq_J^2u?F+9XIhC3}<
zAN%pO?xVeL;w`e8)9Zd=qq?8DhlPzth}}8F(#8R<{}5QbjdxDi_XoaH_ptm3@!0L?
zZGWu(UrtyKXof(?AtL1Q#(lhdS5L%I&{W^U3bnhT|7$*{R?%5he+v)+TUQpp6aI)J
zw#_XYEOuOyupWM+{pyhaLTwzYiYIF>uhDQHA1zE9bo;EjCyZUk{oJc_Qy5R)Azm%Z
zoJr57k<00q*)wdhYdHFK@bY=1B^iC=wRF(p^#=WE!Y72!2wxDsB|Ih*I&O^0$SxBc
z!VY1N@D1T7!q0?XHc5jF;TmBP?<>!dzX4E72MFS8sR0oL0049d002-+0Rj{N6aWYS
d2mqmtH7??7sR0oL004B8Yy><8Rs;Y5003uz2H*ey

delta 1108
zcmV-a1grb839bnZP)h>@6aWYS2mnZrE|Cp1e=?EZPB4xG#*ytrV-ZNeb^?9{9E5F9
z%3u~iYt)iQ$TO-@OLnMY&o8imFUTT~Dm%edu*-rU2s>cQ7f?kNaJy$L$I%dqLaL*F
z-M;tSbGutV{`uYa2;(C13_Vq=;Bxm?*2wvt7#KsU!kgTva=UD-7b?P(F@zb0dBq&B
ze+f5l+2yK`j=gHvCAUq%(3fj-G{+F1H>;Ly$!iSZ^yDT(WXUO#bwWAvmXb&yo<Im)
z45xCIE!G-41>xT0g(?~L<{Xn(H@R!6u|L@{uYD$QO6`mwMSkVBRc9DeehZ@HxMKW>
z&!<Ox#<ST=3}@3h$1NMYUZbokUWzvyf6Lw=$T`LFG_7a+^~|o|P2px1icL$UIe4r~
zUb-a1Vxv?NZVZDAF)#2~9K#F)>D<$%<XllclfV$3Cv99|7lpf8WSDt2r*=<Cyns<9
z+F4SA*J|X6;X+WzwkeM=c{qm`6_b~UiFCX*hW>P5w3jiVY|k^Cd6K9Ubx8)se@$wY
z2$Kv^(G)fnbz0>)g$oSbsx+-^7)G9z>%W%pN>OE8qHv^h_9;Fmoy9=qPL_qtTV<Qe
zhD-GurTp4<wALxp*KoNDui{FO=ayXzZ&10(^BUg~Nz7rQ3$vJK2vuq%r?+Xnq)x$P
z;Jp|PI%1XlEn992X_-kx(a}lee_doa-$rB2S<u5pr(qXY_DoTemSe}ToWP2@3!U4%
z?pf$t_px@Q4ok{+naDd0*A&++b(y-4Xk}F0872a#X*tb?Toz`PyIh6)hil@89Sd0V
zf-X6>6nipQf)90*ms}FD2zSdfbV@^X!vTt?M4?`szA*wNN}~~YpU49wfA4C$Zu;$@
z7G%ZL6X9DL)T-I&)B$>wX$a5JZ&FVJz1sQ7&3))6s{tC#usD#CL`lfj0jmRl`5y{A
zN-#q7)2BK*<OaR6G=t$o3~lwEKETM-^ghP+F}{!V16(|2F-UD^i$#L)fhOFoM<LB@
zh%D)?_%EEkB7ChleW^MDf1F<VUz~b~Q!kZ=9wT4m%hals<n%+l&hQXd8Sb=ceXZrk
z(|UmRzKOTUYC*4ig$?U|>K>N19wBn)5Gz{;xc-B0@iyK$VL#~mPTa%lBSa&&!?(S$
z`hPiLIiwi^U55yf#~b(Y?p-|*MNU(F4{Ox!2L7jcoZ3ZaVJ$!ie{54({7(2IipUPP
zY_Q02NrHO#jrOZU{tLBHtSg?ZwY)*YeSEYuYtZepYIR}kI_~H78aIXU<Q?LbqRg1|
zY#N!2ewpirEp`n@zYg_m)@Vyc-*_z@w0Qk~f0pnG;WNS)gl`Ft$%Kv@qcXBf1c%Th
z>=C{p{6zSf@GEJMGa_6iEaQFUIrKMBO9u#lwQQpf1ONbV2mk<3O928D02BZS00;m`
ak1j5MwQQpf1ONbVlWzn(22%t800000Yz+he

diff --git a/tests/new/options11/aspectlib2.jar b/tests/new/options11/aspectlib2.jar
index 816803da4017ab18e638c837324ed036bcecee9e..698acc6381b3d26d739a0a0810317cb4f14d8aa5 100644
GIT binary patch
delta 30
icmX@cevF+rz?+#xgn<JH7xtQN<jrDc2GWzOn0)|m-v_<`

delta 30
icmX@cevF+rz?+#xgn<JHJ^J-F@@6qJ1L?_C%sv2T;|Br&

diff --git a/tests/new/options11/injar.jar b/tests/new/options11/injar.jar
index 93ac53fa740af912f3667b2d594866957a54df50..e19ead4bf6799fce13c4d673b029a9df94ee7553 100644
GIT binary patch
delta 30
icmaFO^qPq`z?+#xgn<JH7xtQN<P~LP2GWyN8QlPKya!4E

delta 30
icmaFO^qPq`z?+#xgn<JHJ^J-F@`^Gt1L?`CjBWsGzy^*0

diff --git a/weaver/src/org/aspectj/weaver/AjcMemberMaker.java b/weaver/src/org/aspectj/weaver/AjcMemberMaker.java
index 2a63a6e5e..ae29a0d4c 100644
--- a/weaver/src/org/aspectj/weaver/AjcMemberMaker.java
+++ b/weaver/src/org/aspectj/weaver/AjcMemberMaker.java
@@ -40,12 +40,21 @@ public class AjcMemberMaker {
 	public static final TypeX NO_ASPECT_BOUND_EXCEPTION =
 		TypeX.forName("org.aspectj.lang.NoAspectBoundException");
 
-	public static ResolvedMember ajcClinitMethod(TypeX declaringType) {
+	public static ResolvedMember ajcPreClinitMethod(TypeX declaringType) {
 		return new ResolvedMember(
 			Member.METHOD, 
 			declaringType,
 			PRIVATE_STATIC,
-			NameMangler.AJC_CLINIT_NAME,
+			NameMangler.AJC_PRE_CLINIT_NAME,
+			"()V");
+	}
+
+	public static ResolvedMember ajcPostClinitMethod(TypeX declaringType) {
+		return new ResolvedMember(
+			Member.METHOD, 
+			declaringType,
+			PRIVATE_STATIC,
+			NameMangler.AJC_POST_CLINIT_NAME,
 			"()V");
 	}
 
diff --git a/weaver/src/org/aspectj/weaver/NameMangler.java b/weaver/src/org/aspectj/weaver/NameMangler.java
index f3a9e4c28..e510cc3e7 100644
--- a/weaver/src/org/aspectj/weaver/NameMangler.java
+++ b/weaver/src/org/aspectj/weaver/NameMangler.java
@@ -39,7 +39,9 @@ public class NameMangler {
 
 	public static final String PEROBJECT_BIND_METHOD = PREFIX + "perObjectBind";
 
-	public static final String AJC_CLINIT_NAME = PREFIX + "clinit";
+	public static final String AJC_PRE_CLINIT_NAME = PREFIX + "preClinit";
+
+	public static final String AJC_POST_CLINIT_NAME = PREFIX + "postClinit";
 
 
 
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelCflowStackFieldAdder.java b/weaver/src/org/aspectj/weaver/bcel/BcelCflowStackFieldAdder.java
index 75c515218..405e28cb3 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelCflowStackFieldAdder.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelCflowStackFieldAdder.java
@@ -36,7 +36,7 @@ public class BcelCflowStackFieldAdder extends BcelTypeMunger {
     		gen.getConstantPoolGen()).getField();
     	gen.addField(f);
 
-		LazyMethodGen clinit = gen.getAjcClinit(); //StaticInitializer();
+		LazyMethodGen clinit = gen.getAjcPreClinit(); //StaticInitializer();
 		InstructionList setup = new InstructionList();
 		InstructionFactory fact = gen.getFactory();
 
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
index bd8c76288..26d2d7f1d 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
@@ -309,13 +309,27 @@ public class BcelShadow extends Shadow {
             LazyMethodGen enclosingMethod) 
     {
         InstructionList body = enclosingMethod.getBody();
-        InstructionHandle ih = body.getStart();
-        if (ih.getInstruction() instanceof InvokeInstruction) {
-        	InvokeInstruction ii = (InvokeInstruction)ih.getInstruction();
-        	if (ii.getName(enclosingMethod.getEnclosingClass().getConstantPoolGen()).equals(NameMangler.AJC_CLINIT_NAME)) {
-        		ih = ih.getNext();
+        // move the start past ajc$preClinit
+        InstructionHandle clinitStart = body.getStart();
+        if (clinitStart.getInstruction() instanceof InvokeInstruction) {
+        	InvokeInstruction ii = (InvokeInstruction)clinitStart.getInstruction();
+        	if (ii.getName(enclosingMethod.getEnclosingClass().getConstantPoolGen()).equals(NameMangler.AJC_PRE_CLINIT_NAME)) {
+        		clinitStart = clinitStart.getNext();
         	}
         }
+        
+        InstructionHandle clinitEnd = body.getEnd();
+        
+        //XXX should move the end before the postClinit, but the return is then tricky...
+//        if (clinitEnd.getInstruction() instanceof InvokeInstruction) {
+//        	InvokeInstruction ii = (InvokeInstruction)clinitEnd.getInstruction();
+//        	if (ii.getName(enclosingMethod.getEnclosingClass().getConstantPoolGen()).equals(NameMangler.AJC_POST_CLINIT_NAME)) {
+//        		clinitEnd = clinitEnd.getPrev();
+//        	}
+//        }
+        
+        
+        
         BcelShadow s =
             new BcelShadow(
                 world,
@@ -326,8 +340,8 @@ public class BcelShadow extends Shadow {
         ShadowRange r = new ShadowRange(body);
         r.associateWithShadow(s);
         r.associateWithTargets(
-            Range.genStart(body, ih),
-            Range.genEnd(body));
+            Range.genStart(body, clinitStart),
+            Range.genEnd(body, clinitEnd));
         return s;
     }
     
diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
index 0953d1884..da0a2db8f 100644
--- a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
+++ b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java
@@ -319,15 +319,15 @@ public final class LazyClassGen {
         return clinit;
     }
     
-    public LazyMethodGen getAjcClinit() {
+    public LazyMethodGen getAjcPreClinit() {
         for (Iterator i = methodGens.iterator(); i.hasNext();) {
             LazyMethodGen gen = (LazyMethodGen) i.next();
-			if (gen.getName().equals(NameMangler.AJC_CLINIT_NAME)) return gen;
+			if (gen.getName().equals(NameMangler.AJC_PRE_CLINIT_NAME)) return gen;
         }
         LazyMethodGen ajcClinit = new LazyMethodGen(
         	Modifier.STATIC,
         	Type.VOID,
-        	NameMangler.AJC_CLINIT_NAME,
+        	NameMangler.AJC_PRE_CLINIT_NAME,
         	new Type[0],
         	CollectionUtil.NO_STRINGS,
         	this);
diff --git a/weaver/testdata/dummyAspect.jar b/weaver/testdata/dummyAspect.jar
index 100b7d8f187183d4b8b1f885750ed57005491ae8..54b76f013f5bc1828c839fcb54e97f6f2f1105d2 100644
GIT binary patch
delta 30
jcmX@ha+ZZRz?+#xgn<JH7xtQN<o(Xb45TNsGr0i(bleBm

delta 30
icmX@ha+ZZRz?+#xgn<JHJ^J-F@_uJz2GWz+ncM(u;0GH3

diff --git a/weaver/testdata/megatrace.jar b/weaver/testdata/megatrace.jar
index 927615c58c0b63683fd1b12aa2294c461ae000dc..8c0843c286c0775cc32f230506e0e01b46b42b87 100644
GIT binary patch
delta 788
zcmaDX{Y;uSz?+#xgn<JH7xbD=-p3?9QAN03*ippx^1GlY?Vx~tt^rT9H%i~{5fWN6
zV}^*zw1j~8wwE{ZG<TnUBl02sN7AGI2aX>Yl{@!+e9#~C{!AXngu749ov|%`c4lw!
z`+q-we-__V(Zbpm9aX5f_o}m|*;y_2GRAc$+58Xa9KK*$kk-38c4bk4q+5menUW=|
zemXAJEv=W>!=-eVSy9sKYPPve@{3rZT>B4SjhxHs61xwsY$<*8Epn#8CDGlnE`qI0
zMmszeL;pIgEB{`$<kl1GTqXVx=YzMSV}2g<KQK>qb+pULIVA=Tw|2dBFH!He3VLx}
zUXty(cu><Up3ucIlcSz8pZva5YyFn2`Am1G+!A+va$)xJ`UE$LXC1FpL)M>dZrd)m
zF5-LT4c=F)+nvg`$g^4Yh#KTIoiMKyG0r*le$52WT!o1`R}QTc`m{8E(~I35tM5Ge
zJtxsjbzAQR{w*(Fi3e@j`RJKl+eVQjABCG2xA06}uq^1?qX}Ax3!X0Yt6#9aY*pqu
z)n%H(>><pX0zXGF#7KRv*AOUb-otrh{%7Xe<0iq8nI<&>_C~>5T3%kv2`K+4(%d%7
z(Z1J}n`!&nA5RZg-Z?0+vF&YLP2{z8zx@q%)$%>REqQFazv0K*iz@FNeIoiVU{S2a
z!M(*h&INwc_~t7fm&i9c{d)R|36HLn`^ZNxVE>-Gg5SXT^Y1D5wwrukpgFaE$(PM$
zp4VBUS&ILu%1_vKh}~%Z8{SB6{>++53nyQ(z52!ea@@C>Z%(U<rq-O9wMV9`@%+U7
z-CIuu_g5W#?{dkS<7(a&!%fpypNlSy6<auI-n5D9iqG!#=sbRJt4Z$lTi-jnLzJS`
zZY#f@P<wRG%DQLv0p9E!<}K}|g-i?#oh<we3@FKR^FAg)PG(^G+<b}KoRJsE(1R<U
zEXHdFlA7$#E6ucpY4TYnah(8fMkWykc&gTWdP?{HI|c@ZDU1vZGC&#uPH<0t$SpVd
MEUy3?120Gz0Ig|bApigX

delta 802
zcmaDR{aBhez?+#xgn<JHJ^J+~A7m1rs3Kf1VklyJcW&a%LRY&f`GO)pz3z18yK!<V
zsi|=bO-~4j_uBsM+@>=*R<Q@_A9i=zH?bdN?@{@6tl8dc?^_>^2{WH;+q-=E^6%g7
z{rvp>x&D)n9G`i%Z+YbOYjt~2&a6<zH%u{;OXoFJwjIoV@I@+ocaZ1<Bc9L8X5@K?
z@*b-4epRngBYJFByOYtE&~<k|^en6n+|p!l!JFsj&Y!w$>8h&)uNxbk4C7R-kSp5Z
z`7op@U|spQvL&~kSnDc%3s*WA9Ua4Z%>Upz*VU0u^DSR4m|s$=-0{**Zu`;;>+Owr
z&YVqWF%eu@WvOU-ntjrH@6fosF#FbBilqu(8Vh!N9ON;sKO=P2e`Q^FduhFG)V6n@
zR|sDV<8RG*t-!@C@zo%$NyDsSjzP|@_iHA2uC<@~WmTX%=T9Sp$S*NRLi0Y=o->#%
zc-u{+C932Lw`NpKVX^$-3^qf>32!{Y+A;$sOICY&Xa}x%y6{}xg6(Civev0C(-3A4
zVcsP8If@}hs`~@S&U(jt7L(5ZY@C-oYvmdfDZ3ToGc}`5eaSRivAdv)(fRDc>BlCq
zHr@{V^XZ||yMzf5&SmyHb@H$8RhPJF*Z%n}Px9^M6902AD!og3#8q!_^_yS8dzp2`
zQ|!HJF1LoyaDH<0t7Op<i=VQ=$HiV8s+E4l>~r~#-QxGUXKgb)R5kzZsrS89dQj}Z
zocfpSDQiD8>L^q@UpwL~HUG&Al~RAz-|M$buT}e9<moCYZ>*-@9{XVPllMuvPgnZy
z721;gQr;!YJWu-O>CoqAXX$l&c*dWOxW40A-I^oG|D$GY%YIv};`&NCTIsfO_T<{5
zb5_>9vk&lQ=Qz%h8kWbzz|hLVz!1QLoF+FPWD?|L1}4tUSGmm@d4UW)xZ=r@yk-g@
z5pgzG=ZhQ+3~xml7=Q=~Y-E~zfk|9Dz?+dtgaMw=^`4&6z5foVYziX-gA9^#28N@P
NH}dMU{pA4(0s!M`Qvv`0

diff --git a/weaver/testdata/megatraceNoweave.jar b/weaver/testdata/megatraceNoweave.jar
index 8a62739958f60833c968af3908fdcbdf7990f1a9..dba8efbff861bd7ae49f6b1e677e26061971471a 100644
GIT binary patch
delta 697
zcmbO#IzyB<z?+#xgn<JH7xbD=<Q1Q+%&x_<X2uML$${*4j9({DVArp|UL`Wm=!<S=
zngCnXOvUJ^8)*evfm1gyPgCnEJ(?#T(C}Qb`E|&pD1lSG-~O!&iLTl1`QYJJj}Onx
z!W%zMey~;bbhN|86e|g}yjcFEOHT^Dx&FRlKJ1aHxOBxzkE^F-0~Xh4{A>()I`!DI
z;{n%~^0_ctetEibhGAP}(=W~|`SqVRJj-{{zE&%?_3*1#6DR1(x+L-m%c=Pa{<P}1
z=D7VS+B+pm+D~Ke*%fPBY6NHKvF$3ID*dOy_{`EP->kTtbZ`CIDdM|s$Hn9s9*kuS
zF4ps|B?et7ITg2jiI+%L<q|{ZR;vZdYSQNIj0cvQ^7kwKeR6iuXN&uW1y1jI*fLG)
zD=zHdy~%MxyUe(zYIbb-M;_&unyq{c=4%q<%niL(M2DRSn4+s`P}22rF1JPedBdH>
zZMXNYxl-S@Q17s;Pi&&b&DsOjNAGg)I9K>>hx&EzB3t7L;YH#?U;h=Sc$EH<PV=jp
z^m}rO`1hRV?{6*ldjB-knOq$)-Al;znq2Serh45b%lgUe9={J&Z)$kM8_CR{Q9Ea$
zkJQ?&U+!P)s#W@3)9ETHU%V{1z4Y<tC+`#Yemb(;kt=HB7k=ff;@f%NK3(~+ca>hZ
zhiClhi13}y>ed`l-oM<}`qH;aiTb-ew)t%Hzozv26Muj=JIDS46@vmM28Q`83=Hs;
z!2(Je8+kR^n1S?UOSTgMj7%a7@I<4BtVxss9h4L$Ca3DVR-`6}fLMCTIf=!^0p2J^
rOy0*S&9s?m@@-CKupNwC(oFX`Cd+Xth_JGO3}gnv3qX1kCx{0Cn;sYa

delta 709
zcmbOsI#rZ6z?+#xgn<JHJ^J-FA7IjCV+JxNzu`E+jU+Mo0F(ISXPo>Kjip&!e0;bj
z2H7#boj6gyUfY(-U-H*97h?|Qy=Nxq>gE_*tPY&IVcx=*Iidj#&lQ_rhxn;-JawzC
z4_~Fb@3zW=0#%_sJI{tD{86dMJy|3cU^0`htuy?3^NcSQcP2UQ|8>A1D9S@KLn~-&
z5&IPld9ON!(8{G7e;QsXUCA8iz*k$TmDZCuZ$TZ?*V#5}e%4E0>?)n_`gX&vGL;l>
z_P`m3TiQK?UG|-O%y($p?`uLcueAw#<r`;dE5@@d>u$`8eadG4fTvh<>)yVmfbMN|
zdajeT^S(%^1vSVrT<lw3Izz;C?xyRSnWkJ@Z7$7N=p=hVaB}bL!we5D&1!d_SobOI
zV&$Co5*7=~*_yXV*<@U)Z_8nMBD!1BZtvN3yDQozewpIL-XI-j&_7#3^@^@`ipHsF
zA`(_df1G2Tv;O&vJC=vv#)rMKKO8XqA>Xof22<YHJ(&CG9c#>Ui|RX*U#sq%CwW49
zCwFJne@mk!R)2Yo)ooAy_1x55z3t%dZ*%S~{Ub8%r0p7S)lQ}C{$r&F#SYG?-+z*M
zN$o@1NQZB2YZ}?N*qsYd>kU)=JAG@?{1bNZNrA_X&v|(z@$L_spVblZwT~_<u&#~x
z)jsi7cXZpgPgg#;g-&-}vSfYgn$<DI_F<1E-oLy|HnaNVhUu{?(Q3EVvnSU6WDoFW
z=kQ^gawwOHfnhca14Do}Ba;XNB+c*v(~92K@b0TGSs55=`6i#?l$xx`C9MDwo_$J&
zsgr?$VJ#5L05JmSuucBWA*X|E5J&^EC87w`K-Pb@$@e%VMOfKDqRc>e0Z6as1n~fP
C3K@3*

diff --git a/weaver/testdata/tracing.jar b/weaver/testdata/tracing.jar
index 99744a6bc99d9432ef45e864439096a6775f5d1b..18bf1b7597bd5dcaa44302e5bfab23e216cb432d 100644
GIT binary patch
delta 1001
zcmV<F0~Y-A5%m!bP)h>@6aWYS2mqjsHIWS<e_d}IMHD@gUB@3;+7Q~Lg{E~Ov`GnG
zML?lRC?sx*K<<a?swjw;$$IRJadxcPaX$VCZ}7l#A83#gL?n3Y1AnLwm4G|5tHx25
zTDso3Gw0rW?wPy$_dkF92@fCQD~95|y~mnIq6o%N$d(?%1>TKj`a(Bl-02CU;;-Yx
zfABaG4CO`^v&2wZj(Red<~D;jJNJaaud5be&bV-un7TU-P(i7J5sWdMZOB;MA8c(1
z{g`j`2t3hH5$`?WT3SEb99?#K1Dv&yKE^4x*^~*xw9U=iM(9Vv40KEkXEH`JH!1S^
zY@^G!dD!D|Cw#Ec6_Hswy<^E<RJv2+e@UPGZf!^KZJ}!`t!-($96yd|?j=TS6){Oo
zs)1oRpQe*4e5hq?nnnx0wG`k2E|xKcw;3jfq77j>tAlo1=prsL1Y%d3#cFj&n$2nn
zmnq*c;}lQ)Z0pqurg4?j;QhXcTMY9#&CQ*PPOA~4_b_8KyiYe}RC>m6ZuWEpe_^j<
z)?()v-pXmOh!1F5`gWri2Q)lHZ5}lSrtA%#B1KwhL0XkkeIK+L#;ES`=v>YdzuVl4
z&89Fi3Q)jknMUR&-6%oB44M|XuU4G9ss?duZ8s8qBUN0)XBFJCqf*}FNs4fT`JGE-
z2XH(~S!t?)j>KJQXD!HB)od3Gf7f!DJyg_qG%$BW)Z?1lYX37oS=DOJSz5EMVk34<
zz5?I6N7HaaynL=Z3%E**eE?L?YC@|~lu#t2KFPa;^ymMM;F-g{;V{gtVPBvO8Pe14
z6mA^iO$!~t8Tt?0CNSZW4+qmI;2fdOlegxV=)hQ=T3}w@ox3bQS^GEpf6@9!vY&0b
z*e)E8HR{Ks=hQylIl}b%#Faz5JAZ&{2e@&7@FcT<o_Dc8JC>QfLuvq%#IcNz@G<$H
zxVotno?DOa<J0x$@P9qRt@T4J{*@t?uzUhPnRQ;-$LG&c@Sl25Q{R5CP9UdTU1018
zBb4#>Z}{Sw+bG~mM|TCQf3ErCucK4&m0)>#6};Ez_zhXZi3Qwao+DZ)z;7vO!2Dx{
z^H%ttOprYyYiC*7sN3Fr_6m20{0M9H#gN8Y_7f5ADE&jyC(7aQaPn@;)FP!tXhdRK
z-0(2b(Ly-<-ng*=u8>Kx9@#HsFUVfH@@(WkP)i30AbqDiZvy}T5qSmx08mQ<1QY-W
z00;n}jWx5i1Hc3gpp7*yAbqDiZvy}Td6R+&E+3$cH7+7;Zi0ve004~%000XB00000
X0000000000s*}$M9tLX&00000LuuHk

delta 999
zcmV<D0~q}E5%UoZP)h>@6aWYS2mnWqE|Co&e@$;3MG$@Mne~2nAdX4w1ma{vOkyWy
zM-~u>Z34FAAfnBOvQdyxF74Ugbua7bRZp)!{zz`&z&QtEBpYD~ZaMIWazFyAdq(kE
z9$2Y%y1HLgy?R|UfBya3@9^+3zF{cd-+iKaB#K}Rg>30Doa3EnswZ?q#_g^!D*iT3
ze+-W!!BDPeF$)Z(#i%P|X>K!k(=$&Q{1w$COvQ$$M*%7*RWO7RhEsJJiwFJ9b)lc|
z^)3O&>MG*hr(8?xXPd)|E@yyKHqyr^<uw~JVVJaedCLg>SeU+!iQQDjX6hzIUYo9W
z_!bYlJZ^^%*E=FI3nzCh(ep~TYdq<Zf8VKX3%(_EZK=5>ZHJ>r5slr%h|MC#sX^5@
z3}@4HQiYGSj7`I6!8aEIoWuDtCh$JP_&~HFOnbTCY6)G$1%^QENHbrpZcDRKE#V^N
z8)Tf~iJxt~TEQePlN!9&6LFJaHmA9n6VYikVsr&lHp54BOGc$<3}>cKMiBNIf2J*V
zhT*-O_KLVclhU&r-8i7ZA!@UzF)(Fs@B}H+N(<7el<NDi#V|s3kH+R=p7@={ZfrJ$
zkx_sGhRZZEH|a(R8fMV6$OE<H+-22|o2xsK=ozWvBEG2LmK~My22WCi8_MrpB0GSi
zS;|U7^>rlfN;_*o#;Rt!V7QvYf9#Q>#-qNuBcd+X+*bRK`N^tQbI#J5D=Ic($K)&U
zoqIG4H^j^5x;=->#MlQw^{ghe8b%34GU}7O3rK(duLxc_+&d1#+#2=;%8(&F?M~tP
z0Zv=!5Z<N#z-<C!F8N?EjRMXP>MVJyeu)l@)u{>Q<=wf<^1|9b*^k!Gf60Ed>0-NZ
zJXWb6kDe2I_}~zeYh#xV@Zsz}uI}UdKEmV70(#!X9PL<U_7155j1$K)KEbEtf9C3@
zQh07Xx`)r#Uc>+S5VzJ2F#kt}Sis^j{CL)RWe;DzM!|pSy-a=ky*h@RaCL!^Lkv;I
z+rQweS8k(#uN~bbEW759f4+=P!MB3t=~eLlN5^|)bte{ZpLvdGp#Z<Bqyh7f6wX`W
z8JQq^OxDV>w6J1(^VwV69r7cruFQut*0Ps~a9imgk{(eG2Zxh)nx+;hEkYv_)8vMS
ziH_#N!S}|E4RDD}l6A>`B6~yjmn+YP{smA=2MD9LRE2E=004Cc4*&pAO9KQH00;mG
z07s85v$q4l1Pw=zE-s_DRE2E=004E9ga|GlM~^NpB5iJhhy(xtjR^n%3jhEB00000
V00000005|y(Fh&}X$SxS005bc*0TTr

-- 
2.39.5