Version 3.25.28.18 (merged r20967)

Don't adopt the AST id from previous if id is none, since previous may have mismatching expected stack height. Additionally, harden merging of simulates after instructions with side effects and ensure there's a simulate before HEnterInlined.

R=hpayer@chromium.org

Review URL: https://codereview.chromium.org/298633002

git-svn-id: https://v8.googlecode.com/svn/branches/3.25@21371 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Merge remote-tracking branch 'upstream/3.25' into 3.25