Unrevert the tests from r183298 as they pass with both old and new code

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@183306 91177308-0d34-0410-b5e6-96231b3b80d8
Add a test for the breakage from r183298

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@183308 91177308-0d34-0410-b5e6-96231b3b80d8
... and actually run it

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@183309 91177308-0d34-0410-b5e6-96231b3b80d8