[match-and-simplify] Merge from trunk

[Richard Biener]

Bootstrapped on x86_64-unknown-linux-gnu.

Richard.

2015-04-07  Richard Biener  <rguent...@suse.de>

        Merge from trunk r219384 through r221893.