The previous patch busted the build because one hunk in 15-return-to-exit.patch is
malformed. It changes WriteNewControlFile to take a size_t &NumFiles out-param, but the
line removing the old end of the parameter list is missing, so the generated
FuzzerMerge.cpp closes the parameter list twice:
const std::vector<MergeFileInfo> &KnownFiles) {
size_t &NumFiles) {
The hunk was correct before bug 1996685 rebased it against the new upstream, where the
"-" line was dropped along with the patches themselves. Restoring it is the whole fix;
the hunk's line counts were already right for the corrected form.
Differential Revision: https://phabricator.services.mozilla.com/D320103
Timothy Nikkel
e1671e244b