[llvm] 794467b - [llvm-rc] Allow omitting components from VERSIONINFO versions
Martin Storsjö via llvm-commits
llvm-commits at lists.llvm.org
Tue Sep 15 23:34:48 PDT 2020
Author: Martin Storsjö
Date: 2020-09-16T09:34:26+03:00
New Revision: 794467b916e87e8fb09380c67d0d433a29d93a2f
URL: https://github.com/llvm/llvm-project/commit/794467b916e87e8fb09380c67d0d433a29d93a2f
DIFF: https://github.com/llvm/llvm-project/commit/794467b916e87e8fb09380c67d0d433a29d93a2f.diff
LOG: [llvm-rc] Allow omitting components from VERSIONINFO versions
MS rc.exe doesn't require specifying all 4 components.
Differential Revision: https://reviews.llvm.org/D87570
Added:
Modified:
llvm/test/tools/llvm-rc/Inputs/tag-versioninfo.rc
llvm/test/tools/llvm-rc/tag-versioninfo.test
llvm/tools/llvm-rc/ResourceScriptParser.cpp
Removed:
################################################################################
diff --git a/llvm/test/tools/llvm-rc/Inputs/tag-versioninfo.rc b/llvm/test/tools/llvm-rc/Inputs/tag-versioninfo.rc
index 54dbff55067c..4b567dabcb2b 100644
--- a/llvm/test/tools/llvm-rc/Inputs/tag-versioninfo.rc
+++ b/llvm/test/tools/llvm-rc/Inputs/tag-versioninfo.rc
@@ -1,6 +1,6 @@
1 VERSIONINFO
FILEVERSION 1, 2, 3, 4
-PRODUCTVERSION 5, 6, 7, 8
+PRODUCTVERSION 5, 6, 7
FILEFLAGSMASK 50
FILEFLAGS 555
FILEOS 110
diff --git a/llvm/test/tools/llvm-rc/tag-versioninfo.test b/llvm/test/tools/llvm-rc/tag-versioninfo.test
index 92c91972a221..3ce534b88096 100644
--- a/llvm/test/tools/llvm-rc/tag-versioninfo.test
+++ b/llvm/test/tools/llvm-rc/tag-versioninfo.test
@@ -14,7 +14,7 @@
; 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.|
diff --git a/llvm/tools/llvm-rc/ResourceScriptParser.cpp b/llvm/tools/llvm-rc/ResourceScriptParser.cpp
index 2155985c61b8..5141ac0c3864 100644
--- a/llvm/tools/llvm-rc/ResourceScriptParser.cpp
+++ b/llvm/tools/llvm-rc/ResourceScriptParser.cpp
@@ -777,8 +777,10 @@ RCParser::parseVersionInfoFixed() {
// 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);
}
More information about the llvm-commits
mailing list