Fix g++.dg regressions introduced at r115347 (rdar://8529993)