swift234

Fix a couple test issues found by running the module verifier.

A patch I have to run the module verifier at PassManager-creation time
exposed some verification issues (rdar://problem/21989088).

This patch fixes a couple of them.

Swift SVN r30604