Fix regression from hack for SR-6796.
That hack resulted in already matching argument and parameter to end
up not matching in this case.
Fixes https://bugs.swift.org/browse/SR-7191
and rdar://problem/38798063
(cherry picked from commit 3479806d92821906cb4256556b583bdd516199ad)
