This was fixed by Doug's work in e15f67e453. It isn't actually the underlying problem in rdar://problem/43312726, but it's worth recording the test case so we don't regress.
e15f67e453