Trying to reland http://crrev.com/1902823002.

This time some blocks have been shuffled around in the AddStub so that the frame still doesn't get built for the fast path.

Review-Url: https://codereview.chromium.org/1974293002
Cr-Commit-Position: refs/heads/master@{#36251}