[llvm-rc] Allow omitting components from VERSIONINFO version numbers

[mstorsjo]

Summary

MS rc.exe doesn't require specifying all 4 components.

[amccarth]

LGTM.

I never realized rc.exe would accept having too few values for a FILEVERSION or PRODUCTVERSION. The documentation implies that you must provide four components--it is the _fixed_ portion of the VERSIONINFO after all. Not that it matters; this looks harmless.

llvm/test/tools/llvm-rc/Inputs/tag-versioninfo.rc

 1 VERSIONINFO
 FILEVERSION 1, 2, 3, 4
-PRODUCTVERSION 5, 6, 7, 8
+PRODUCTVERSION 5, 6, 7
 FILEFLAGSMASK 50
 FILEFLAGS 555
 FILEOS 110
 FILETYPE 555555
 FILESUBTYPE 14
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN

llvm/test/tools/llvm-rc/tag-versioninfo.test

 ; RUN: llvm-rc /FO %t -- %p/Inputs/tag-versioninfo.rc
 ; RUN: llvm-readobj %t | FileCheck %s
 
 ; CHECK:      Resource type (int): VERSIONINFO (ID 16)
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x30
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 672
 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: A0023400 00005600 53005F00 56004500  |..4...V.S._.V.E.|
 ; CHECK-NEXT:   0010: 52005300 49004F00 4E005F00 49004E00  |R.S.I.O.N._.I.N.|
 ; CHECK-NEXT:   0020: 46004F00 00000000 BD04EFFE 00000100  |F.O.............|
-; CHECK-NEXT:   0030: 02000100 04000300 06000500 08000700  |................|
+; CHECK-NEXT:   0030: 02000100 04000300 06000500 00000700  |................|
 ; CHECK-NEXT:   0040: 32000000 2B020000 6E000000 237A0800  |2...+...n...#z..|
 ; CHECK-NEXT:   0050: 0E000000 00000000 00000000 00020000  |................|
 ; CHECK-NEXT:   0060: 01005300 74007200 69006E00 67004600  |..S.t.r.i.n.g.F.|
 ; CHECK-NEXT:   0070: 69006C00 65004900 6E006600 6F000000  |i.l.e.I.n.f.o...|
 ; CHECK-NEXT:   0080: DC010000 01003000 34003000 39003000  |......0.4.0.9.0.|
 ; CHECK-NEXT:   0090: 34004500 34000000 24000200 01004300  |4.E.4...$.....C.|
 ; CHECK-NEXT:   00A0: 6F006D00 70006100 6E007900 4E006100  |o.m.p.a.n.y.N.a.|
 ; CHECK-NEXT:   00B0: 6D006500 00000000 61000000 50001400  |m.e.....a...P...|

llvm/tools/llvm-rc/ResourceScriptParser.cpp

while (!isNextTokenKind(Kind::BlockBegin)) {
     if (!RetType::isTypeSupported(FixedType))
       return getExpectedError("fixed VERSIONINFO statement type", true);
     if (Result.IsTypePresent[FixedType])
       return getExpectedError("yet unread fixed VERSIONINFO statement type",
                               true);
 
     // VERSION variations take multiple integers.
     size_t NumInts = RetType::isVersionType(FixedType) ? 4 : 1;
-    ASSIGN_OR_RETURN(ArgsResult, readIntsWithCommas(NumInts, NumInts));
+    ASSIGN_OR_RETURN(ArgsResult, readIntsWithCommas(1, NumInts));
     SmallVector<uint32_t, 4> ArgInts(ArgsResult->begin(), ArgsResult->end());
+    while (ArgInts.size() < NumInts)
+      ArgInts.push_back(0);
     Result.setValue(FixedType, ArgInts);
   }
 
   return Result;
 }
 
 RCParser::ParseOptionType RCParser::parseLanguageStmt() {
   ASSIGN_OR_RETURN(Args, readIntsWithCommas(/* min = */ 2, /* max = */ 2));