swift234

Also, don't test for a trap message in release builds that don't trap with messages.

Fixes rdar://problem/22081452.

Swift SVN r30825