From 8355a030c0e12690b201f67e3d6e70566d0d169a Mon Sep 17 00:00:00 2001
From: CarlosAlbertoEnciso <carlos.alberto.enciso@gmail.com>
Date: Tue, 15 Jun 2021 06:52:50 +0100
Subject: [PATCH] [Debug-Info][CodeView] Fix GUID string generation for MSVC
 generated objects.

This patch is to address https://bugs.llvm.org/show_bug.cgi?id=50459.
  YAML:455:28: error: GUID strings are 38 characters long

The valid format for a GUID is {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
where X is a hex digit (0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F).
The length of the individual components must be: 8, 4, 4, 4, 12.

For some cases, the converted string generated by obj2yaml, does not
comply with those lengths. yaml2obj checks that the GUID string must
be 38 characters including the dashes and braces.

Reviewed By: amccarth

Differential Revision: https://reviews.llvm.org/D103089
---
 lib/DebugInfo/CodeView/Formatters.cpp         |  21 ++-
 test/tools/obj2yaml/COFF/Inputs/test-1.o      | Bin 0 -> 3312 bytes
 test/tools/obj2yaml/COFF/Inputs/test-2.o      | Bin 0 -> 1908 bytes
 test/tools/obj2yaml/COFF/Inputs/test-3.o      | Bin 0 -> 3631 bytes
 test/tools/obj2yaml/COFF/Inputs/test-4.o      | Bin 0 -> 3284 bytes
 test/tools/obj2yaml/COFF/Inputs/test-5.o      | Bin 0 -> 3083 bytes
 test/tools/obj2yaml/COFF/Inputs/test-6.o      | Bin 0 -> 2748 bytes
 test/tools/obj2yaml/COFF/test-1.test          |   4 +
 test/tools/obj2yaml/COFF/test-2.test          |   4 +
 test/tools/obj2yaml/COFF/test-3.test          |   4 +
 test/tools/obj2yaml/COFF/test-4.test          |   4 +
 test/tools/obj2yaml/COFF/test-5.test          |   4 +
 test/tools/obj2yaml/COFF/test-6.test          |   4 +
 unittests/DebugInfo/CodeView/CMakeLists.txt   |   1 +
 .../DebugInfo/CodeView/GUIDFormatTest.cpp     | 143 ++++++++++++++++++
 15 files changed, 184 insertions(+), 5 deletions(-)
 create mode 100755 test/tools/obj2yaml/COFF/Inputs/test-1.o
 create mode 100755 test/tools/obj2yaml/COFF/Inputs/test-2.o
 create mode 100755 test/tools/obj2yaml/COFF/Inputs/test-3.o
 create mode 100755 test/tools/obj2yaml/COFF/Inputs/test-4.o
 create mode 100755 test/tools/obj2yaml/COFF/Inputs/test-5.o
 create mode 100755 test/tools/obj2yaml/COFF/Inputs/test-6.o
 create mode 100755 test/tools/obj2yaml/COFF/test-1.test
 create mode 100755 test/tools/obj2yaml/COFF/test-2.test
 create mode 100755 test/tools/obj2yaml/COFF/test-3.test
 create mode 100755 test/tools/obj2yaml/COFF/test-4.test
 create mode 100755 test/tools/obj2yaml/COFF/test-5.test
 create mode 100755 test/tools/obj2yaml/COFF/test-6.test
 create mode 100755 unittests/DebugInfo/CodeView/GUIDFormatTest.cpp

diff --git a/lib/DebugInfo/CodeView/Formatters.cpp b/lib/DebugInfo/CodeView/Formatters.cpp
index 3a67f313d33..f1f51bcb39c 100644
--- a/lib/DebugInfo/CodeView/Formatters.cpp
+++ b/lib/DebugInfo/CodeView/Formatters.cpp
@@ -23,6 +23,17 @@ GuidAdapter::GuidAdapter(StringRef Guid)
 GuidAdapter::GuidAdapter(ArrayRef<uint8_t> Guid)
     : FormatAdapter(std::move(Guid)) {}
 
+// From https://docs.microsoft.com/en-us/windows/win32/msi/guid documentation:
+// The GUID data type is a text string representing a Class identifier (ID).
+// All GUIDs must be authored in uppercase.
+// The valid format for a GUID is {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} where
+// X is a hex digit (0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F).
+//
+// The individual string components must be padded to comply with the specific
+// lengths of {8-4-4-4-12} characters.
+// The llvm-yaml2obj tool checks that a GUID follow that format:
+// - the total length to be 38 (including the curly braces.
+// - there is a dash at the positions: 8, 13, 18 and 23.
 void GuidAdapter::format(raw_ostream &Stream, StringRef Style) {
   assert(Item.size() == 16 && "Expected 16-byte GUID");
   struct MSGuid {
@@ -33,11 +44,11 @@ void GuidAdapter::format(raw_ostream &Stream, StringRef Style) {
   };
   const MSGuid *G = reinterpret_cast<const MSGuid *>(Item.data());
   Stream
-      << '{' << format_hex_no_prefix(G->Data1, sizeof(G->Data1), /*Upper=*/true)
-      << '-' << format_hex_no_prefix(G->Data2, sizeof(G->Data2), /*Upper=*/true)
-      << '-' << format_hex_no_prefix(G->Data3, sizeof(G->Data3), /*Upper=*/true)
-      << '-' << format_hex_no_prefix(G->Data4 >> 48, 2, /*Upper=*/true) << '-'
-      << format_hex_no_prefix(G->Data4 & ((1ULL << 48) - 1), 6, /*Upper=*/true)
+      << '{' << format_hex_no_prefix(G->Data1, 8, /*Upper=*/true)
+      << '-' << format_hex_no_prefix(G->Data2, 4, /*Upper=*/true)
+      << '-' << format_hex_no_prefix(G->Data3, 4, /*Upper=*/true)
+      << '-' << format_hex_no_prefix(G->Data4 >> 48, 4, /*Upper=*/true) << '-'
+      << format_hex_no_prefix(G->Data4 & ((1ULL << 48) - 1), 12, /*Upper=*/true)
       << '}';
 }
 
diff --git a/test/tools/obj2yaml/COFF/Inputs/test-1.o b/test/tools/obj2yaml/COFF/Inputs/test-1.o
new file mode 100755
index 0000000000000000000000000000000000000000..d351d4bef53d4a49a46766da26e61537dbca3052
GIT binary patch
literal 3312
zcmb_fU1%It6h51z$#yqFHb1qbsU6~K)0%8j8k=-%<0jcnQ^=nt1uffdXLo0JCvJAe
znc1|~RD$LqZ3@;m5d~lRB={s0OF^MUP>Krr*asB^ANmrtpwJS(GdnZcZ9+{#4!LvA
z{q8yUo^R&vy(c4{9mI0gPgG}FM4^-}C(T*e?oua=drrsEzB>5Hi9#kg=|FQ{qFN8p
z;?5${2o<Kf0o!lN@yo%O@HxGrw){-_f*G92J0puQZow~t+*m5n1e!P(N@m|Mj&xfX
zKibezwvP)UP7s97NOY+G)X3Dx$pNtykHOKY)^c!sBr?`N8l7wvs0zW$Xg{G%k|)4(
zT@+)woY7^&P}F>fQBX`drWQ=CV8+fX`B+j-$+L=lzC%kTVrpVKmXq?Cf|QYCmTNp+
z$R|xi#=8!MR1)b}z#|aVPy=4}b%k6#sw8#QP}8Q+_UZv)Tr-s!<)V_$2!ra3rsQOu
z>M0nA$7hpq$uxB(Q7~nL8i8fyoF?m~Xf;sD%n@tDOj&wta)Rgq_yo}$VS>z=8_NKi
z)93f_4qAv#SnmO*B~Hv!=v6oyhCG;G6cdt8EmU9U%x8x<YQ7!``vce{q@hhnx->JG
zMGT`W5JpGTq?EJJ3L3{^e*)`8bHqu8*J!svq%qHZjLq}5s)y$M8lX4Jc@A+;;#|3D
z&J8wa6Ej<!Pv%Xe<_|msWd<$E3^L=5@NEJw=DQ1;`92NJe0M`{H($?VeABA>Ki_!!
z`GVs-^Tkix;#&*Ne9_kM<+Gqvcu(`W!STyzV`v8-+tVDwKF_07t@6b$%(S=yUQe)}
zSNG^}iHDOzHLzng-i%y%jXiemEzrPdFLV(48E9UAA2jFL1LqF%2F8%jV?TRQlxO9<
z88_5|o|OBY<A9FB{ltddMNuuDGICs|7ZDoWM5y_e#$kO38(c4J&7mZUvxnkR&g8(=
zjE4~4xAk~YwDVx*FKuw1f`QX{HH86$9@$c;C|XnDH5|kohu53K%<8g~!ZE(OUJrcR
zH|7g^PCORj&2V77Kq-UkDI=LuB3HtTzi8`*-Q73YiLia^g%!6P>H=ArmGyEyyEYNv
zuCyO3HLMpnqoxX_OgJU)1{~d)>2Lgga266u5vucq@24jckED0MdH?%`oAkvf(O<yd
zMxzU2%t-2rW*TcRc_q(x{1dM8q^41Ds!IsU2~9W-rDy{8yM-5ovlalHfnvufc6u>-
zTqvGJUZhY>BZ0kO_Xlh~%WJ3`X|v_0Ufc4~$1e7%i`|38MNbX2RTM2hwcD1DuDaMY
z7rP4!XD1?d<8)!mPc63Pqd6DjgNjFebPE=rv^C_#0m_!2YHiC$VHb<I7z|2NQ`2Xa
z-%@tx(V>NZF7>_n(VkzC>~_{tD7R?&)YAP|u0*|y(UmLFm8IX$+`d~bJiZk5UXDIo
z!rzw0r<43)=)F5t*?&R7=}e~_>+siSZl~eFU#yV~Jo(Kv(k0g-dbTFrw7>bQ=J`86
zXTJOVQTFVQzudT~UH-Bo@!W5pe7JA}u9k$8DE2~1>bkPSv$Dc>QaCM3W~i&{0}ss?
zk<!|n-)W_XtMhUxt;_Mr;lq`AW0_NFO^%NYpIq5EcS0rgIDgkl&muq39wdI4gtCRl
zSgJ_CjmUxu1$HUIcU!m&=|S(Di<H*%{2xiBrwz|?iJ<#3ip(&o&2aej{zxQzx(pZ|
TW&kCM<52|oB4_{M*G|)an`y^c

literal 0
HcmV?d00001

diff --git a/test/tools/obj2yaml/COFF/Inputs/test-2.o b/test/tools/obj2yaml/COFF/Inputs/test-2.o
new file mode 100755
index 0000000000000000000000000000000000000000..746a0873057454c3b81778fc73294e94a92d8c9d
GIT binary patch
literal 1908
zcmb_dy>HV%6n`f4Lv4c+AV`$O3Xxh6O;eQ*)dHHNNuiS4N^OW3B3X`oO|GP|WuH?~
z38^a*3la+hY!&}Nkzn9+VPj!sVnhrSrcULZV<!$|NGndd+`XTFzjyCB=l5ix5BQM#
z0ZzC(fTV5_jWvj8!X$3K`i8#_MUY3zP9?GGL)*szMg)LIO_zWsq#=^^cm<zl;%3+5
z_?XKp+qQ4>bv$Tz`)x?QPiobB_SMU+r<|9-_&dfBfGCQSx%_<Qj$DuzvQiv><`xU_
zPH<VyEoBz-t8vkdcMqL>##sa*%KdFgC5u!nV%yZHPuLD+q+~eEbXaMV)=Qe9lLjT5
z6Q*7+8Rhj-O|4fPwL(fRRiX7Nu_#mP8c|YHNdqLf9u-7@0XPK_*rCu`7pZ0$wz0;<
z@s$hWvdQQM-J<o1IA?5_v_>pA35lqpG&DtJ%%Ww75gSe;RwXr)SV6QOQI*wzuQt;$
z51!Y95I_{dQT*$?kyUMiF2d0>EhvZaHi(XwVbDc$`IUuYJ_o~Sb73~KnuiHA6g2*d
zMv_Q_)R|%%j-`=|A0^Bn{cg{6Niv$r6NSJPlok&mW%o@kyNR+wH`zb$N|G8=idth_
z*p7G}^~*=sOOh7{&s^@&k7MJ#X@`(S>8&G4CCPP#ui+y4$aV9<suodoyj|_{t|9kE
zZ(K~z*W)4lGDzKoY6U->iptb-Esz)gN2hzHx8CF=%2M5A%`1l$i{QPrI`bJjgrIfO
z7@m~qCfqP|CzuHj>1+?gmS_Cxe&fUv=??x)4&v+wIeHHL{J=eyE&SAedb=SwaBYr-
zP&Vx1ysoZ8EEakCaz+S0y!|>g_wC@r{1fi?|JEz4YVd3C{J>glZ1mmee*DYZ7rRSu
zQlCDCpMQV#43Fy=X$>n?lIlCOPdLE9Ly%r0DodtPj|JFnBEjCm;|&SCyL66VUpa=4
zLIUqBJnQxd_7p5@$T8awy<IZUPq;cHbn7T>&z!^01Bl@q!P!KD{f4)#ZhkHyKFiB#
WIz3(FH8P#fz^qqHIp)<-4*vmtfajtB

literal 0
HcmV?d00001

diff --git a/test/tools/obj2yaml/COFF/Inputs/test-3.o b/test/tools/obj2yaml/COFF/Inputs/test-3.o
new file mode 100755
index 0000000000000000000000000000000000000000..e23fbff66e33c611e87657635abe9f20267950ae
GIT binary patch
literal 3631
zcmcInO>7%g5FXcc+$N>9(?p<Bp(PmlL*w`-c9NxOoiu+`Hfh=v+G1kX_Or98|Fm8^
zC6p=$4y93n9*{UfrCxv&2u@H6rAQSB6{#FJ0V)L!97qdDNGW0F?XJB^jp|15q_=P0
z?0oZPX5X868@8+kYAx#k?&TDKJE^dQT4wqbI*>SSF=qPM=s-CZFQr`vj5jA60Nz2l
z&NUjxhC>J({kq(^A(ug7QkOA!Tux=jR97}<@VrP|MLC;hBCNu>0Q;VGFOzd1f3q%Q
zU<C)tEwir$ZQFrzp+-%L+vh<0YUopSnLFuw5#?TQTBa{Cd9)bpG@vko)R($Ug^4&p
z5IP11hx!hN$HR~Ji*5MW6B%z?${Y<3Jkb{!JkTb<Y6Q<?zl?nhEKbrjBSsaLR#>qp
z=X34FlB}|5zN8jPYIIu8MHBfXE6Z%Uy^xGY^YN)@M#`m2Qkq4%Xe=XT<4Gyz@wxLL
z!cM0}0I<VGaKJekDq}=WDEVSOr3zd3Zxcofs+^T)<Xl?Vlg}393{#*PT+UdmoQO%P
zs>tz@%8Jl}yh)ZRFvZMmK(3@_fX1SlBp?33?jk~O^xer<qlJ*LA;<9lPn>UuVeY>n
zLm2v=JFr`6L-1xnJ5<;V%?`6Z6Fu9EW;Qt&78e)W5T%7<d^*p$w~*_sa7S|tcETDb
zaY(Hw#$p+tDDKo_=<8%jugB+4FxJ)Oi6;Zyl0Og#c)iK49*l8d7e~`7wa^L4C;5Zk
zKo3hvfk1aK=t(7eyvaa3=<&wAJ^o#|`$y5^8|YU^bB;gBZ))VbvE%R<&eGhDBW+{s
zvm0<+k0Zqg>DhT4yQ~21=url3TK4fok(F6ajTQ4HCBgcPj|x2~&gvEy#k{sxSd2jc
zp^3YIs?QY&whLiWE!b^aOBBoAn3PcoShaWv@zIszMNzkdJU?8go>CD{Sk;7ngpRKW
zDvDechG9GE7^|g2om7~V#KTx!uM1`O)+dYZ8F*ZTHp6f&pp?cGla^E|o-z4FUo=#=
zcqNh@2<xo{)3zMe9wwKWveci>y8u*H+JY;2YXP(QWXbFane<2<f)&m1JD#8Wuv1xd
zSlkQWb+iqCbp74lugWu9f5HTP6Zsdh!!a>hOek_eE#97}<s9Yde@)4WLIGUk9>K-p
z1)&!QxggNIQ+QOE;0)vwLz@(}NjJXj6$F>h&);<m?fm_UHEA`6%5?*ToeyA?zDK$l
zyB&6*`$RQ?N2eNL9hPa0=g=w2L6mb-(AxTQgYS(qsfoU`eN9L1S$}PY;`g7`Ff4L#
z^TzzaxnIYg^j|nRxahxpGV=G7<#goMFSriO{Wg_29a-S?hVxgfH|9Q{n7jVW#a4W`
z5qk?f$e%=EBRwxg7Ul-mpwOpU{aIeCFdW=Bqo$m~Ip$r?qa1q{`_nLlnY-EuLoz%r
zG~vxscOjv)$`nb>D_ghSR@@AAc)h^lwm~m$t8f{0QZ8a)Z*tPNRI%@q6e(+}E1oJA
z<+O$+qEefwo{-&$=XC|IQnPq%<e{^}A)RW1s7^J)j};!poI*@K>v28xf5z2jH~^Kn
z-m%24Ag(RT<61!f?l!I%6CPK*BJ#LmOnF>s6KZiKN{cH|T3j_A#Z}`0JY-L`ZrSwl
zrZ<nyPu%)p@0F+4x?lY(Haz{|^K-p#g<tvL;rH0JOR<A5e{%G*b&s9+R(w1Be(;;@
z_7m<4uSL%v{$dJM@fJ$pwazUk&&f8+;v(LsAe3T~>h^ffSYTG;nEw&z3|lSqm$0;%
z@86gTP=@{x=w?!F=6?g)YgS99`ckLN_j5XDRtw#FNaN`Jle)NBhE}jzj13U{+J04&
zHrs=SpbY&H81~pWW!6J`y{e~l={P2ITGgzF&eBpn_KHR$C#(j6;{c2_U_%ah3oy)|
z^qq<0HvKu^=|asT`upne0+PGw3K<F=?i)FD1a|M<Uw7&Vg~s{^M@B+RP<K2S95pb2
GsDA(=o)($_

literal 0
HcmV?d00001

diff --git a/test/tools/obj2yaml/COFF/Inputs/test-4.o b/test/tools/obj2yaml/COFF/Inputs/test-4.o
new file mode 100755
index 0000000000000000000000000000000000000000..6d5a4863fad13fba8e896fa5e1e6b6e983ae6976
GIT binary patch
literal 3284
zcmb_e&2Jk;6n|ScA9d0;PMQjZ2CWi{6ha(-B`GV~`rAU}gOH>O;IgdkiL>C?%kJ1o
zE44)G5ecc63UR1<Xe6!(4jhm`;vaxskPrt1LW%^JwB=mhtoLKQF;ZGF((JtVoA-P3
zW_CW_ywDA-{CEQ3tSJG6$~r00Cb3kQM&Y<%YgX$YKs!=wRDvsZ&xIa<INDWvTgVVL
z2^dIOcB{5s6@^!DJieHAMZ@5+bG%~7yAb|9M9B^fZq@AWE)+iV_!HsH_d})44~^Nl
zZ3bbK?s@FM4<L%-bS9fiuFbE`zn+rD@RMFx9cu@d<}-`Qh3v|h2*=US0oDZ0bs2;J
z8{oQB&`CunhN0GLQ$|Cjq)=~Atw9UhYOPSJmq}A4+f!P(Sg032C{&eNrJ+<v!8Da?
z#Gs@sha;gnNbp)f5CM8%2nJwJ1*ct5OM2a?Z&304TQ7-A8dbN{>uRkcrt4dpS|vIR
zLNFl9&62E8s;k8YB?g>9Y?D+qqVs4sq6)17YYke4)7UO5Tg1?m5|L9850F0uL_HQ+
zuSL!aWDWsQ_y^Z6h}ACaU-Bh^iVv&3=4=y%A#biZie_OPX2UA3m{kOvJ6$x_70$t+
zgWLU9yE_QSU@7nrRgvqm<6ztVjD;@)>>i+e6N4FslYvpk=L*#uB`QZuxZev$O}N_&
z$4vN?7ml0oSuZ?e!XsXI)`W+=@Eoo~Z(tK)E3{+;o=1d*>>!e4i&2=u&JFDJY#vD>
zO;V$>QE%ualC(D!yo%=Xk<BHk-rB1~CNP84t4~3t*EB}EgtT`%(GG2GNoq!9rAism
zjW~z=E6>iCBr6U!^OYm|X&89I-4IepU3@00B$=*o8D2&oZ*=lOH+7<v@iK77n?u{o
z(QI*gHXjFJn<3eWs8sNZt0+_{R=IhxKPnyB+*!$Kq|J4rwYD6-K}2m5y?s8Rryw{Z
zP2fnAorqiYa)X}<3rReJq2u`lB(U?&-<-~|N=406*o*zvK})wzA-<h1;+UtS@FKcn
z_k?54b-H2<@1Vz6pTo-Trvc$c@Y6eT;lww-%!9&u`ip*mM~Gj;3OiE4DCw$3jl&O=
zT4V3ie?CPeO@rWSSPYV)CSJrw)kLPp#Yyo!6F{5+EyZXl7qIuD$cAQjB})amVLlMV
zS*>EQEGOuJdzRD(_btf}zdG1&4%UAR*aHoHFknf37)Pnk#3n4s4-!f^X~ZvCk{^~)
zI%#5SmgI*`lunsg)sp=1F-oUR?3N|@;SNd|F#7x4l2{b%4cdU=VPpKK(Z76S*{^=?
z`TEvlxf{d%|K5L05a7|ngSAiozWM|D9q-u~o*4OVWdH8nz3pFaU(QAMx4Zs$5XLUE
ze6;gz*TJ9KO<PZtFck=?<vq1ac=Ck3iHQxO&`>yhTY%jb!smA^cAvm9y!OK9cDMv+
z!?HW}_uRtgb>{mku*|N#gt(lJt)EZml-0G?mNA(P8xP<-R;Ibg5^8KexyTLF*nfAC
zFHvKE&P9GljlJM5GK!OCXQzem*`%3C2=?25Wq-1QW>z6=sjzf`h!OI+CCi|Fg7ZsE
zEB4tz#%1d$M-qwHn)BQyYzg6{V-w|UQqcr|r|@Pm&MY0XU8SRr)aEqKS!ZIL(+odC
zrj0Yhak9<`S)Pz>Bg}GyT-**M=TLJzHP=R+<EZ%=o0@l=<oTHMyq|o_kDKNt5^pEh
I*WZDE0XhByiU0rr

literal 0
HcmV?d00001

diff --git a/test/tools/obj2yaml/COFF/Inputs/test-5.o b/test/tools/obj2yaml/COFF/Inputs/test-5.o
new file mode 100755
index 0000000000000000000000000000000000000000..ca6ecd155fee33604a8c0da998d753bfedcbee4b
GIT binary patch
literal 3083
zcmb_eOKcle6undD>!dVJnu4MTO;eW?syL40Brs4ij(-Zxk0ymu8Qk&s#Tn|)F!RPu
zDujZBgeX5Dv10=gkys-ZEGiWViAA?8L5KwiB)Ulp>vG?CKF^Mk(uya&dH0?<_rCi+
zGxshDUBKFCFTe>~0*Dk1qS88XRG37eLvS@`3=SZV6s%Hs-F@>8x{4$3+wKN3go6wN
z3l49?<&{y`?s2uoX!8oD$)lsZ;>f!Y{VqbuHVs#*?(0qzerxe3!rGOHx^>l@jk`36
zqI9Q)2SET)6em;ZOyc6w#?s<~G=`7l^2S&*xVn^DNi3(=$3*BrKl|8aT<eP<gxCbv
zrJO-Z1~E;oR-G^{jgnl=qPj(M*R*O*trbaKBiAPMVj)*6yq+s7)sm%@NY19_tHh+F
zn2*LHHIU%BkRSqd!w?L>o(A5ytf@xLtZh>9%!Mb#Rh?=T?YdSiiOE_;*UH3zK?sNP
z`MR1{C^fW#MTrT=5!)hVoftgYg{VTyz($i6;TVo9N`;uZqLTc=R11(j0K{4t=~hOj
z6-XTbV(<^{T^PID*je&TMkRpV-E(${qL8)s97Ve^8^&QBcg$%5uAQ#f`wF8l=;7{r
zXWSixBd{8}i>k=Ia^qmv{<woD0e0EB-^PiC;Ap7V^O>$%mHd<qb~l4D8|-Wbr){vK
z8I0RtPct}UgMnsn)&{$p!8w?Kp3nsZTh3pSNS#z^-mF=MN)qn9fM<|?{?K$usx__~
z$rG4C)5Qlcr8_z^dmhcQ?aU6`PD!dy<&`pJhJM5uv|o65dr5NQU@M<Lq#w(~kJJxg
z0ZpZcGL<CT6>h^*=wq&(54vR#rHJ3NKi?d3qle?-@?3kIgk6S-c7{p`|57D|Dupt)
zE_R|%9GdR!<RqG%YG>BCa+pSlRwqXDdPW|=z?*3tXL_`qVWn2I_?57b`VT?$JOliV
z-}GbH*|$C*l!pI!@66jD{MGyB%^yCzA<YBaLwpB2Y)d&)H8h=?2Y>cjmHq4g^S7?*
zI)pc(Vwe<k@f;4CE;2nXo)urS0mK>5P|Sw%G`>A2vZ>jBho!DASPGrQ<!xZFEWdWc
z=Z@3|Upi6{e)h0mJ*@u-uw(~)FyKf*IEhl9jh%L+Ak3oFZ)1`p1>rnOM{R7?k%Djq
zrAKV6=tx1ZP&#H~JB}2D8z^DGIL}9p#G+vT^Gz5Yz8yKyR~(OIzrOm@FJFE9tbpPE
zf4LNsE!?}ifARf0uYQkyPjzn&kB{6MS(Cna{L^nbE~}rtU|R3qV%uo9H@0tf?*Fd8
z<?6DEX*Hr1_q0yo{(Y8T<V~W`NHqG10J{x@ua#Kr0fALZ&5f^<a0`&bDkX1Po6Ofp
zERO{QRwXsJ2v;Am{R;@~Dx}8VGE2r`^8uX3&NLrcM2+1iAEBtRbN7)w)Y!@S$d9P8
zZ0I9>xM=q6G!VWrv$L|`=Fyk_JX=DV)7IElVe14DBjoEeR*eRPsQs3IsAw_YNVBp$
z{c_wE6ES(68kS1)i78o5IE0u_Scu7dP2+Q>eNJ-Pb&~YlB{_F-pPHKH+@*NmDb8TV
zH%NQF(>y!Pv1fgDChkU(@$53ZU52xp^X;-Tu3gsikmW<o@=mf1Cw_G#%daFZUAhea
E0-e6Z%K!iX

literal 0
HcmV?d00001

diff --git a/test/tools/obj2yaml/COFF/Inputs/test-6.o b/test/tools/obj2yaml/COFF/Inputs/test-6.o
new file mode 100755
index 0000000000000000000000000000000000000000..edc3a44b4273ba9fa4c67dfd0999b6a4051a5871
GIT binary patch
literal 2748
zcmb_e&2Jk;6n~4`B-%98hU5|<utG#rP#k|GsTfsc?R5eOrwJqxLbAGA+Y@KO@mjmH
z4)hcW4qOm$fdg>tg#-Kv<;aB#=W^jxAugrYO6_~={g^dIIB7?+=gn{4@Au|w=S@wy
z2vlaL0G{(LfLzPrP0{B;6IRf;8#cmPO`{)gc<sf#5PFDGmlS}h$pLZ+D-F_>z;8eF
z>!5KO_=K46*KpmiO?6ss1okQ9f5|nEK62MrquwR7{vOf;6(F0<u2eU-$_KUm+S?Vj
zfPeb-{z4Mmsa0>3w>S3|vTy-)?&EI-=kP8l847TV)g9h;xa(SWciHtU!RxjsdY-7C
zSlxQlZt=dwPnLVFM%`|FSnrtKwr93^-FG#*+!efK<V!gl7+lXNS%67+9;bHOf~elM
znvU(-ha$W5-qq|*Pguv+Evwtk>h^KZ>Tn0QW-((J{ib0G;aCk%a2I9~JK~)lcVu(|
zQB!o_GS>dYcFX#vp%;dM;xJGe0?Gv-EmyRLIx53jmEvICzQ+Yj!%Su(+PIxA_mK}G
zWdFp*$;@P?W8}!;95RT_MA(+?IX*NMLlz!LQoj&Ed)CLW3{#o+5gA$>#(1B1h2f%5
zlb6FqgV)i0cWigY?7?1egToq9Z=8WDKIswd4W!jZ(f+k{jP(nK*%3sHN4$mnH_y*!
zEEosPygH_i=i&*DhfqQ4#<{4B`BJzHucF5FQ5pib-)!MwkK<iK-?j04ae5&igV13p
zjv|_E{Dj-4FdH3dUbLgHjqM(-<O<T3M$raG4)0EmXVpp0=cO|cqDWUT(hH-A$9Bt;
zXF@|tkKq_8GbGUGCf^W@Nv&d{Rbp&UI9^j2`YLQ9m%dBMyO8kyZ*DBJ2D>Oj-|~~m
z#ER?iA}Z3|6DyW+V8Ou4MR<VsIbQ94p?e-v9$s;^4DC$~J1}LyH0%bJ3OCW3_OV7_
zsnA1<^4c_rz*6Bev}Szl^T1N!TeP0_vF`#)g&)zn>|;L#mg?u6LztUW@8thFRTrzD
z&i(wym(?%+M2DxBdoVe{gMaS7Jb5^GW&Y0mTi>|v6z<;p{hF)(`a|mKJcddXt%+$T
zXSHry7nMhk08*eGa#Q5;`L7i?9U$@>fySCr=#`Kx^84T!>`EyQ>4lJRlHUd?--liY
z$&!=a1(c&x3U1hlLVZ-Irg#9a;E!4{a)2$`_ZayKTl5Bsk>9X2kw9i~iZt$lkNo~1
zW=f$KNV2q$v4QDN(@F=?3Do41scB`{z;q~iR7#RZr6@NF19!@mGGSE<#Q&E{DOF<X
itCG4d$JOPy`XKHWUT89TEev}$8BEx+%6g=7KE20nVV@5G

literal 0
HcmV?d00001

diff --git a/test/tools/obj2yaml/COFF/test-1.test b/test/tools/obj2yaml/COFF/test-1.test
new file mode 100755
index 00000000000..0d7880b06a3
--- /dev/null
+++ b/test/tools/obj2yaml/COFF/test-1.test
@@ -0,0 +1,4 @@
+# RUN: obj2yaml %S/Inputs/test-1.o | yaml2obj -o %t.o
+# RUN: llvm-pdbutil dump --types %t.o | FileCheck %s -check-prefix=ALL
+
+# ALL: {{.*}} guid = {00C903AB-0968-4639-84F8-7D3E719A1BE1}
diff --git a/test/tools/obj2yaml/COFF/test-2.test b/test/tools/obj2yaml/COFF/test-2.test
new file mode 100755
index 00000000000..3cc9e531c85
--- /dev/null
+++ b/test/tools/obj2yaml/COFF/test-2.test
@@ -0,0 +1,4 @@
+# RUN: obj2yaml %S/Inputs/test-2.o | yaml2obj -o %t.o
+# RUN: llvm-pdbutil dump --types %t.o | FileCheck %s -check-prefix=ALL
+
+# ALL: {{.*}} guid = {39B59910-0D01-4889-B930-43E2FFC14694}
diff --git a/test/tools/obj2yaml/COFF/test-3.test b/test/tools/obj2yaml/COFF/test-3.test
new file mode 100755
index 00000000000..d3ebbec7d9f
--- /dev/null
+++ b/test/tools/obj2yaml/COFF/test-3.test
@@ -0,0 +1,4 @@
+# RUN: obj2yaml %S/Inputs/test-3.o | yaml2obj -o %t.o
+# RUN: llvm-pdbutil dump --types %t.o | FileCheck %s -check-prefix=ALL
+
+# ALL: {{.*}} guid = {A03206E7-6691-415E-A241-0B5A0D0EE37A}
diff --git a/test/tools/obj2yaml/COFF/test-4.test b/test/tools/obj2yaml/COFF/test-4.test
new file mode 100755
index 00000000000..27bf5327bd8
--- /dev/null
+++ b/test/tools/obj2yaml/COFF/test-4.test
@@ -0,0 +1,4 @@
+# RUN: obj2yaml %S/Inputs/test-4.o | yaml2obj -o %t.o
+# RUN: llvm-pdbutil dump --types %t.o | FileCheck %s -check-prefix=ALL
+
+# ALL: {{.*}} guid = {1DD12373-03EB-4522-B3D7-07B483F45F06}
diff --git a/test/tools/obj2yaml/COFF/test-5.test b/test/tools/obj2yaml/COFF/test-5.test
new file mode 100755
index 00000000000..82e7b221680
--- /dev/null
+++ b/test/tools/obj2yaml/COFF/test-5.test
@@ -0,0 +1,4 @@
+# RUN: obj2yaml %S/Inputs/test-5.o | yaml2obj -o %t.o
+# RUN: llvm-pdbutil dump --types %t.o | FileCheck %s -check-prefix=ALL
+
+# ALL: {{.*}} guid = {0B162ECA-2764-472E-B26B-DBDEA88F3B01}
diff --git a/test/tools/obj2yaml/COFF/test-6.test b/test/tools/obj2yaml/COFF/test-6.test
new file mode 100755
index 00000000000..f0cf103cf75
--- /dev/null
+++ b/test/tools/obj2yaml/COFF/test-6.test
@@ -0,0 +1,4 @@
+# RUN: obj2yaml %S/Inputs/test-6.o | yaml2obj -o %t.o
+# RUN: llvm-pdbutil dump --types %t.o | FileCheck %s -check-prefix=ALL
+
+# ALL: {{.*}} guid = {EA30BF0A-0A80-4424-8315-AFDD8F448DE2}
diff --git a/unittests/DebugInfo/CodeView/CMakeLists.txt b/unittests/DebugInfo/CodeView/CMakeLists.txt
index 70a7b8af144..5044b9bde29 100644
--- a/unittests/DebugInfo/CodeView/CMakeLists.txt
+++ b/unittests/DebugInfo/CodeView/CMakeLists.txt
@@ -3,6 +3,7 @@ set(LLVM_LINK_COMPONENTS
   )
 
 add_llvm_unittest(DebugInfoCodeViewTests
+  GUIDFormatTest.cpp
   RandomAccessVisitorTest.cpp
   TypeHashingTest.cpp
   TypeIndexDiscoveryTest.cpp
diff --git a/unittests/DebugInfo/CodeView/GUIDFormatTest.cpp b/unittests/DebugInfo/CodeView/GUIDFormatTest.cpp
new file mode 100755
index 00000000000..e9ac469de0e
--- /dev/null
+++ b/unittests/DebugInfo/CodeView/GUIDFormatTest.cpp
@@ -0,0 +1,143 @@
+//===- unittest/DebugInfo/CodeView/GUIDFormatTest.cpp - GUID formatting ---===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/DebugInfo/CodeView/Formatters.h"
+#include "llvm/DebugInfo/CodeView/GUID.h"
+#include "llvm/Support/FormatVariadic.h"
+#include "gtest/gtest.h"
+
+using namespace llvm;
+using namespace llvm::codeview;
+
+// Variant 1 UUIDs, nowadays the most common variant, are encoded in a
+// big-endian format.
+// For example, 00112233-4455-6677-8899-aabbccddeeff is encoded as the bytes
+// 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff
+//
+// Variant 2 UUIDs, historically used in Microsoft's COM/OLE libraries, use a
+// mixed-endian format, whereby the first three components of the UUID are
+// little-endian, and the last two are big-endian.
+// For example, 00112233-4455-6677-8899-aabbccddeeff is encoded as the bytes
+// 33 22 11 00 55 44 77 66 88 99 aa bb cc dd ee ff.
+//
+// Note: Only Variant 2 UUIDs are tested.
+namespace {
+
+using GuidPair = std::pair<StringRef, GUID>;
+using GuidData = SmallVector<GuidPair>;
+
+void checkData(GuidData &Data) {
+  for (auto Item : Data) {
+    std::string GuidText(formatv("{0}", Item.second).str());
+    StringRef Scalar(GuidText);
+
+    // GUID strings are 38 characters long.
+    EXPECT_EQ(Scalar.size(), size_t(38));
+
+    // GUID must be enclosed in {}
+    EXPECT_EQ(Scalar.front(), '{');
+    EXPECT_EQ(Scalar.back(), '}');
+
+    Scalar = Scalar.substr(1, Scalar.size() - 2);
+    SmallVector<StringRef, 6> Component;
+    Scalar.split(Component, '-', 5);
+
+    // GUID must have 5 components.
+    EXPECT_EQ(Component.size(), size_t(5));
+
+    // GUID components are properly delineated with dashes.
+    EXPECT_EQ(Scalar[8], '-');
+    EXPECT_EQ(Scalar[13], '-');
+    EXPECT_EQ(Scalar[18], '-');
+    EXPECT_EQ(Scalar[23], '-');
+
+    // GUID only contains hex digits.
+    struct {
+      support::ulittle32_t Data0;
+      support::ulittle16_t Data1;
+      support::ulittle16_t Data2;
+      support::ubig16_t Data3;
+      support::ubig64_t Data4;
+    } G = {};
+    EXPECT_TRUE(to_integer(Component[0], G.Data0, 16));
+    EXPECT_TRUE(to_integer(Component[1], G.Data1, 16));
+    EXPECT_TRUE(to_integer(Component[2], G.Data2, 16));
+    EXPECT_TRUE(to_integer(Component[3], G.Data3, 16));
+    EXPECT_TRUE(to_integer(Component[4], G.Data4, 16));
+
+    // Check the values are the same.
+    EXPECT_EQ(Scalar, Item.first);
+  }
+}
+
+TEST(GUIDFormatTest, ValidateFormat) {
+  // Shifting 2 (0x00)
+  GuidData Data = {
+      // Non-zero values in all components.
+      {"11223344-5566-7788-99AA-BBCCDDEEFFAA",
+       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
+        0xdd, 0xee, 0xff, 0xaa}},
+
+      // Zero values in all components.
+      {"00000000-0000-0000-0000-000000000000",
+       {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00}},
+
+      // Shift 2 (0x00) across all components
+      {"00003344-5566-7788-99AA-BBCCDDEEFFAA",
+       {0x44, 0x33, 0x00, 0x00, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
+        0xdd, 0xee, 0xff, 0xaa}},
+      {"11000044-5566-7788-99AA-BBCCDDEEFFAA",
+       {0x44, 0x00, 0x00, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
+        0xdd, 0xee, 0xff, 0xaa}},
+      {"11220000-5566-7788-99AA-BBCCDDEEFFAA",
+       {0x00, 0x00, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
+        0xdd, 0xee, 0xff, 0xaa}},
+      {"11223300-0066-7788-99AA-BBCCDDEEFFAA",
+       {0x00, 0x33, 0x22, 0x11, 0x66, 0x00, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
+        0xdd, 0xee, 0xff, 0xaa}},
+      {"11223344-0000-7788-99AA-BBCCDDEEFFAA",
+       {0x44, 0x33, 0x22, 0x11, 0x00, 0x00, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
+        0xdd, 0xee, 0xff, 0xaa}},
+      {"11223344-5500-0088-99AA-BBCCDDEEFFAA",
+       {0x44, 0x33, 0x22, 0x11, 0x00, 0x55, 0x88, 0x00, 0x99, 0xaa, 0xbb, 0xcc,
+        0xdd, 0xee, 0xff, 0xaa}},
+      {"11223344-5566-0000-99AA-BBCCDDEEFFAA",
+       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x00, 0x00, 0x99, 0xaa, 0xbb, 0xcc,
+        0xdd, 0xee, 0xff, 0xaa}},
+      {"11223344-5566-7700-00AA-BBCCDDEEFFAA",
+       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x00, 0x77, 0x00, 0xaa, 0xbb, 0xcc,
+        0xdd, 0xee, 0xff, 0xaa}},
+      {"11223344-5566-7788-0000-BBCCDDEEFFAA",
+       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x00, 0x00, 0xbb, 0xcc,
+        0xdd, 0xee, 0xff, 0xaa}},
+      {"11223344-5566-7788-9900-00CCDDEEFFAA",
+       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0x00, 0x00, 0xcc,
+        0xdd, 0xee, 0xff, 0xaa}},
+      {"11223344-5566-7788-99AA-0000DDEEFFAA",
+       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0x00, 0x00,
+        0xdd, 0xee, 0xff, 0xaa}},
+      {"11223344-5566-7788-99AA-BB0000EEFFAA",
+       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0x00,
+        0x00, 0xee, 0xff, 0xaa}},
+      {"11223344-5566-7788-99AA-BBCC0000FFAA",
+       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
+        0x00, 0x00, 0xff, 0xaa}},
+      {"11223344-5566-7788-99AA-BBCCDD0000AA",
+       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
+        0xdd, 0x00, 0x00, 0xaa}},
+      {"11223344-5566-7788-99AA-BBCCDDEE0000",
+       {0x44, 0x33, 0x22, 0x11, 0x66, 0x55, 0x88, 0x77, 0x99, 0xaa, 0xbb, 0xcc,
+        0xdd, 0xee, 0x00, 0x00}},
+  };
+
+  checkData(Data);
+}
+} // namespace