Port 97a4b795
https://crrev.com/c/2162366

Port f8be9948
https://crrev.com/c/2166959

Change-Id: Id0cebfe0761ff75fb95c9ceacf95e53fee12eb73
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2168978Reviewed-by: Clemens Backes <clemensb@chromium.org>
Commit-Queue: Zhao Jiazhong <zhaojiazhong-hf@loongson.cn>
Cr-Commit-Position: refs/heads/master@{#67434}