merge followup: fix incorrect merging of PromoteIntegers.cpp