From 3fcfb964c48a4de6bd4569f1eb7dc65f2f973d36 Mon Sep 17 00:00:00 2001 From: Jay Cho Date: Mon, 3 Sep 2018 17:40:38 +0900 Subject: [PATCH] Fix ABIChecker to cover the corner case (#442) --- tools/bin/ABIChecker/ABIChecker.dll | Bin 13312 -> 13312 bytes tools/bin/ABIChecker/ABIChecker.pdb | Bin 4000 -> 4024 bytes tools/src/ABIChecker/AssemblyChecker.cs | 6 ++++++ 3 files changed, 6 insertions(+) diff --git a/tools/bin/ABIChecker/ABIChecker.dll b/tools/bin/ABIChecker/ABIChecker.dll index bd61eee411d0ce037a12cf293dc8ae84329b2cc9..30c5c2e8d8ea88349e4624d5b7753825e42159f4 100644 GIT binary patch delta 3638 zcma)9eQ;FO6+h>`xA(o>B%6J2KUhc%S@OBrkPyC1h!K&1tVSS$bePx*Y6f>iS0Gry z$}Tc!Kd_oUt#uR&T1P9>v6#^!Rcp$iWTy5*QK{dIwvIAY=tyU@cIoflT{K$%=$qW% zJ->6#J?Gr7_cr+}^H<*fee<55AN}d@j%pE04?nUZIJ$^v3E^2qbcJs?5iZXYm4ioM z==2hz)mzC;qB`l_#9L}lLa83r3G&hBDWZ5a5rex#((7oMHnLPyvcDNh|Bo{}n!PKH zJ={DJF^>yzmGGps#O+t^R(2{;V8Y6J&L9=3qKztbjibhn&!y`=H;@ z0RM85*)H^9CpF!5n&&9drS;bcy4G>CEuiS)=$a=e2m{E5s#^(!5obY|dho4E*D1to z%s87+mN&@C72}2xH(ZPxq4mE|aU;dJk^hYwIUP6rW!&&r;@aV8ikxT*G4@o@Gd%Y{ zT&cD|P*luaF0@=V&7{FHY$3M5AtT%4Rr}-dvr$+>9y2hTO>9%M4-hb6?DNO@Y;Vxt z7Mu$gU6qC9oa^oOSNWBy$PW5jQi?e;+lX$5IzQu9g`htN`mmjfICgfPHz_cS&-IoD zV!$jAZVpkW=k4^Rg$gC66P_?_%&U`W|S2p+p05SRL^yWq*Ev*MxQ{V*3Hw) z$5>g$j=U%DY{rOlkpE}PJs-YTN8KvHy5QVhSkGGpZh`YSe%4BXHqz;_@Nn|8K zbWk&ws>$Gx-ntHKYXZ_KS-_y*`96aDw#LVVF#7WcEuXy*!GyM3QQ-AfG>7g0PXfMfPcmlHZCry{$7l-hPK{kaNo{t@SX!%Q ze{(!(wIkX0ii{rS*@j8SHQP$kuh@_}hP0KAiEgl;)fL%K#6m>c_XX=SEXonyZ3s#` zt!0Lv?r18qgJP9YM)BlncC}GK`-%+dB?W1;$n1N?0N7ZGJtVF-g7jjEJ?LwpN_wrt z9`l93-Yu~)*g|wHSE7eu4ACb=rc*dXc&QQ%Q?In*Vtz`}I>IL`=eP36?UZM1@KF(P#LIAfIVFAcm7wkYk_Y*;6Z z(R1TGWAvwz=VZDS+xBXS-3K;--Y&6o!Q%A(xN#Hdcna&U(*KY=L%lVap2fRX&^thb zM(~Yf91^A34rF>&YkmL}v|r1Y;6@0_0GZyzYevwAK&DSMUV=DG*rjov#^ zO7oDhmm*YU9mWOzjr|_=^I=3-$(wQRlicqA2ye&PvYby)UX*h^M&XA^D;=;CJd@(G zmDlkF=5)^RO~yGqOy?U5;B{qm;8~iEn`FX~1S+mGwvNRVC(-UM1)yRp|+O)T$7DdN#{-piA^@ zuF$htuG25qgV$NVT&&fIOZQJ5Y9R?!%+j$Q<&$cA+W#ev;a z2b@pSfEQ@}GGH1JHkujWUUQT#N90kuin`4MGywUi)*RKEcXOIBD<@{C4Lk01}z?cz?fd*~28qbFk@_!n_B_cH_vL z>XZ>UZ*WMF!6oaxZ%=-B#HgKTw!ZSW!m)2XfB*ca_ih>JnK81E%vxsKs3rD6a2!R0 zQi=JkUbeoEcY06N_wbG0XZ6*<2@QS0O+guTFJw1uMcw>fZ(T!T;Bm8-oOJ+qP=yH- zP=wVAa&_8@72Qwc0t^+lE!>Qo5kf?rtJzsM9+hq*oZK{e@AZbM5m_|bwWKUz0^jIG z8@o|ae`9+H&V%k?)K!tS>GsCt%+bne%&71n*HF~$;h-5{H>7GFLmv;Z_`+E7$&Y#e zXskj^f798MZWYotq!Tyg8E%&$b!)aU^BcX@P4k1B+)aU6gjXruO(TyrZD#!cU@y+> zCcbc~+S-k1eT&dqymOONLi@k_`9n8cw0qH`mp`@TU$5<{_J)$H-49?t{TOLTwZn-R ZpByP9>v<&D`k7C}yGESpAM@}u>%RkfW^Dif delta 3582 zcmZuz4RBP|75?shZ|{4%+1>2hO?EdVhK-P9lMOTpiV1&#fL3?7z$LP;u;~g zpk;&j!?a?FZz$@hL+Ou-Gia@$-@Th4IKG+t z-SeGu?m6fF?)Go!->`e9J**OM58PfQ8y5^5xFq`Kd|)y7bpz`H12u_oKM*F*($MDD z$R>Yf;Zm!I8^RxW@ zq4U!nRE*e(kQbWPqPHxV`cWjP@*VzXp|)|R{_?Zy$(VZlIVIw2!aVv}C>-CWMuT)YX(m*LeU5TkCw{NQ!0f0>W?CX0#V_8yhJP!!~(Lq!(P>*qG&Mk zl`6$>M{JGtMt;Q7>GwH0%{oi#H`9MHlquyeuF;E>ieo!VjN>>li6`u|H4Znp2bq4S zNxU(T;=y}M>VlRVO`(~?&c$kZh(S-P6HL=Xv%=S=#*^0ToaLWP;=7Fe6Bd-juu5A= zREV^t@Hw>RxRbW@itRKDC%C49dvQz+h!!L3o%y?A0evmVluKKhOQ|;|hA#rzHOR+G zGQ>uIajc;*l~N0@&^TB%F+6Qp996JH%xqc~_8?uzON~b9~H&H5E4t zo3l>BCGIiUPE<&`p0y;yS>V>R=agFlHx?Q06IGUtVZ*lLxU1P_eE_i?@5mamyCxLb zZL*1xo;=N3Er(AXUq}YUEl#@?M7X}lo|YF`CD@%EW6P`vni~vbdW9(3i_9I6E6L`J zvU}xfD~gLp*{(nXO7VkHc26KiwrZ3;Mq3PP3#0TI8e_P+$V>_kKR0XuO=_*>;YvQ# z#n~%v;3mTc(kZ9MilcCrZKq*7(2I?xJjnN1;sv6G2c_0@^C(Lm7%d+&nr%dhM~%FcH$q}HQDBe{jKm?Lz$*slF^<5Q z_^gS;6GuHy916uw=tD@=cVQ5oBX~pfzE==KXduS)ts%A>oMW)l;8KGt3_e6uc*@|H z#BvDXIh9yrG`;W&4B?6Y$p+r^W$q-@h>6w|^w6yJZSG3SH#)10bpwZ8#be`%6UP5z zH*fTP{LA7w2hc8htb-_n<-E=dyvuzTbHo8g=oERL`w9^Veu5!Xs}eDUK3O6ra#TT~ z33t00aUNgXoLD1f+bv>+_?guq2GC($NT>J3#i9up2bNIQp1Q$bJe4i=ehzDSx`ydbh#aJof*7EtZ}>L7SZ7TR9 z_LSjO>2k7f5}WZ);(2&m^8Rf?qdl1~# z8SjbrNPgwsMrz`nr~9~nq^>UFW}r0*D0cp-y6LQKdj0oebY34{U#!KLw$?W+dA77! z2-bR-MU}^Aim1)HV!HYx?9(wJPa8*lXsG7Vkq5K#{iX$$Hh6a@_;@ds+Y zM3Q4I+es^F#-%D zSPaPsF1$P8+?9l;9-@I8Q;xuxsk5OaExcu{FxD8K7~eYDL7u~S9<(E&p$IQK`I}CB z-;Ty7u&M+;GQPBH7QVCJ;z7(Pz);)6T)(EznR5bAa1dfO#Y&z{hKHG(uS|6KZsrx{ ze;7uOGGAtGe~0%m-zAz`qF<;U40Cmd9&|3zpk8wJB?cUjg`E;)BPshiukveSQH}@; zi)uvJsH!=c!EwvY=)%5%xWxYws&1rCwYzOMLDZfoa> ziY4tYM80_{z3<=E8!O6q{lb>-4YDsGTB zNtG*N8+mo|eu>g3l~$;%M5!Ullj7!S{+{r@3U5hP8dPb>>O58Fd#U(@H%_D4-@Q)L s`bYOH-PWgqmxDivC{C3vs=8DS>9yefQ2MYru7B)EJItg^2*hT9e=SXN7ytkO delta 612 zcmYLGO=uHA82!H4-5JxQYf%gs80M9NLd*4wEgw=mhjI_^VJKfUbg< zL!E>^fwP05J_z05_Fs_}%B7=lyL7KJ$uT|W9Lc&4u|=(G!D|WNrV*i(@oaV|p zSCyzNiE2UkTf(1{wG!7#vYzL9KF%}GaIt(+XF4~zs3Y!G_VuJ&c0V(7hU=SL|H-#W YZ@UW#@0@wVj#KA@Hkvannku3G0}K&vSO5S3 diff --git a/tools/src/ABIChecker/AssemblyChecker.cs b/tools/src/ABIChecker/AssemblyChecker.cs index 973fe5eca..63119ec12 100644 --- a/tools/src/ABIChecker/AssemblyChecker.cs +++ b/tools/src/ABIChecker/AssemblyChecker.cs @@ -32,6 +32,12 @@ namespace Checker_ABI continue; } } + if (originalMembers[i].GetCustomAttribute()?.State + != targetMembers[j].GetCustomAttribute()?.State) + { + + continue; + } originalMembers.RemoveAt(i); targetMembers.RemoveAt(j); break; -- 2.34.1