tree 2cf01dddea7853fa998e5efbedd64d34806cfb25
parent 18606ba869070e472c92b4b476c3d0286311b4e9
parent 1ab45fe3917f805d3bcf3fd23a351b5a1f76f883
author Derek Schuff <dschuff@chromium.org> 1430496453 -0700
committer Derek Schuff <dschuff@chromium.org> 1430496453 -0700

Merge remote-tracking branch 'llvm-upstream/master'

This brings in r236319:
Fix float->uint conversion for inputs less than 0