swift234

Significantly step up the validity asserting around the cleanup stack.
With that in place, fix ~Scope so that it uses the same code for
popping as Scope::pop() does, i.e. the code that modifies InnermostScope
before popping out.

This properly fixes the issue Doug patched over in r1387.

Swift SVN r1393