From e0e948bf68905ab22029732423efe4adcc8d3293 Mon Sep 17 00:00:00 2001 From: Martin Robertson Date: Fri, 23 Apr 2010 12:24:52 +0100 Subject: [PATCH] Fix Entry trace handling for implicit constructors Update binaries --- binaries/jars/cuitraceclient.jar | Bin 8410 -> 8410 bytes binaries/jars/guitraceclient.jar | Bin 2266024 -> 2266024 bytes binaries/jars/traceagent.jar | Bin 349747 -> 349931 bytes org.intrace.test/lib/traceagent.jar | Bin 349749 -> 349931 bytes .../src/org/test/intrace/TraceExample.java | 4 ++-- .../agent/InstrumentedClassWriter.java | 15 +++++++-------- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/binaries/jars/cuitraceclient.jar b/binaries/jars/cuitraceclient.jar index 895dbe87e4dd8f198ea965d933b68358d889941f..947601f0d846e78f84a843de4fe0226ece748151 100644 GIT binary patch delta 217 zcmccRc*~JDz?+$civa{~CrzKotHFE=NLgHAzMeFFGC!j{m^Nfo2h-7vdLVjp4`V$G zn8C+p&ID$7a3nK>8SA)rf*F&e8D%HGX2P(5lICvKAn_ zCeM_$2P?QOs}H7m<;=mfyPO@E?vRTB(~sq%z_f#WB$%Ef4-x+^4^d~K-~<-0Rfq)u D-KtZ5 delta 217 zcmccRc*~JDz?+$civa{CrB0d1tHC@GNLgHA2J$BJGs=T$Lq>Hl9nGi*qBr+2*0X>a zd~D`SV1@@rGBcR5j(aDVF*%x1cJf<(_Q`$xTp)?bv-yp{3NG+>^MVE9WGz5;O`a)h z59Z&N)d$nOa^_&#UCs_ncgRJ6>Bn+WVA?@G5=_sLhlqcdhp4kqZ~}|hD#QW+G)+wQ diff --git a/binaries/jars/guitraceclient.jar b/binaries/jars/guitraceclient.jar index bb2132bda3d1b2968eff8d71a7f61d983a104502..e1951fda0e73709b1a73a297088daa6b1a16649c 100644 GIT binary patch delta 2170 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 L)&-~XckTZI0pLu@ delta 5760 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 diff --git a/org.intrace.test/lib/traceagent.jar b/org.intrace.test/lib/traceagent.jar index 23b7f63586cb53b0df5cdc92c8cda71d978df3a4..87c3c7d0a4cf163a5d22a1bb641df7e1cf78b1cc 100644 GIT binary patch delta 6269 zcmaJ_33wD$wm!G2Z*S>NI!kBiEQAn9(n%l-G}#yS1V{o2Lk^HEHLkT{e5+pbIv{cIaRk0 z?Qys7bvvp?swO+h-y^_}wR{#Yr#o0OCQ(_-!nG|d66=;$cFZE@1-7|Cfxs19IJ)?c zbvB}PHm%VXsl_jKwuD7(wMm+n6B-k&l4ks4pT5^pF!WuOJ*@Gv`*m2V?bNcC#-)n%HLTwdxFv zm#d2~_N{5;&rlLpI~N;AUzy<=_(?pGd`9R;*H4So28;`0b=uHz^BT_4c{`1v@9Z>| z{%)gp>4Kex()SY9E{BVD`hhOV;j$clw9-GU^iMl|O+Q)bXDj_;1JSQ`I!C_+&=tBW zhu^LAFDqTM&>wb6r@vY0x}0xV8DVA&Buue0m6V zFl(+AR_z&2xc1J(2rYNgb|%E~0#k(c%cO4^7q4e3VJ(;LxW?Eq@$q((N3=X?%D0>D znf}oIjFgFGE$x#dnE7!B-A)s=<7>mTm?;%~EG)^vvRJl*))7!^F|hvhR|gxwd=7et z-gnRjdR*H$<$nV9(S8dnbFgye6PMmHC1~5GTGYSLGup1HePWtvr-O~B`3_bqhugq{ zUZgz^Hi6x)vAD2A2OW?k6Iq6XUZz71Iznv@dV}7C8y)OUdfUM!x5Q2RhHK{8Jy~i? z@@zLNok^T#!S5r7s= z_i4-S-aO<^Qi!2+qP;H@J3^7Qm;(+{#0zBcwo()x&jFxSdJtncL=r6~D=ncAdKmlV z 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 delta 5916 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 diff --git a/org.intrace.test/src/org/test/intrace/TraceExample.java b/org.intrace.test/src/org/test/intrace/TraceExample.java index cfd49b4..869439f 100644 --- a/org.intrace.test/src/org/test/intrace/TraceExample.java +++ b/org.intrace.test/src/org/test/intrace/TraceExample.java @@ -19,7 +19,7 @@ public class TraceExample while(true) { Thread.sleep(1000); - InnerTest.foo(); + InnerTestClass.foo(); workMethod("foobar"); } } @@ -44,7 +44,7 @@ public class TraceExample System.setProperty("a",Arrays.toString(intArg)); } - private static class InnerTest + private static class InnerTestClass { private static void foo() { diff --git a/org.intrace/src/org/intrace/agent/InstrumentedClassWriter.java b/org.intrace/src/org/intrace/agent/InstrumentedClassWriter.java index 37976a3..8a1d51d 100644 --- a/org.intrace/src/org/intrace/agent/InstrumentedClassWriter.java +++ b/org.intrace/src/org/intrace/agent/InstrumentedClassWriter.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.Set; import org.intrace.output.AgentHelper; -import org.objectweb.asm.Attribute; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; @@ -114,13 +113,6 @@ public class InstrumentedClassWriter extends ClassWriter } } - // MCHR: Need to preserve Synthetic attribute - @Override - public void visitAttribute(Attribute attr) - { - super.visitAttribute(attr); - } - /** * Initial entry point - generate ENTRY call. */ @@ -287,6 +279,13 @@ public class InstrumentedClassWriter extends ClassWriter if (xiOpCode == Opcodes.RETURN) { + // Ensure that cTor entry call gets written even if the cTor is + // implicit and therefore has only a single line number. + if (ctorEntryState == CTorEntryState.SEEN_SPECIAL) + { + addEntryCalls(); + ctorEntryState = CTorEntryState.ENTRY_WRITTEN; + } generateCallToAgentHelper(InstrumentationType.EXIT, lineNumber); } super.visitInsn(xiOpCode);