Commit Graph

6336 Commits

Author SHA1 Message Date
Dan Albert
d5604cec74 Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb am: 8e233cb5c6 am: 11569624aa
am: df33d93cca

Change-Id: I96aa9c9749407b88f022e0bcbe0034475937d7bd
2019-09-16 12:48:36 -07:00
Dan Albert
7309dd9c9b Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb am: 8e233cb5c6 am: 11569624aa
am: f2239112f1

Change-Id: I22d8d6a7c9a641b5d829c98178fcaed15ef4bfec
2019-09-16 12:48:35 -07:00
Dan Albert
cfb266803e [automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646 am: 7858a1bf96
am: ad802fbf1f

Change-Id: I76964bb3ce886d0d12018f75e1301f7fc0ef281e
2019-09-16 12:48:31 -07:00
Dan Albert
225fcd51d5 [automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646 am: 7858a1bf96
am: 6206713fe8

Change-Id: I8579b9be0f51a639d1356fe9b4071a49c213d588
2019-09-16 12:48:30 -07:00
Dan Albert
df33d93cca Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb am: 8e233cb5c6
am: 11569624aa

Change-Id: I2d1646f3c49f9eb64b8df86264508afdc7d6212b
2019-09-16 12:42:33 -07:00
Dan Albert
f2239112f1 Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb am: 8e233cb5c6
am: 11569624aa

Change-Id: Ia24ff7316888c10dd36722d7f374558afd092bad
2019-09-16 12:42:33 -07:00
Dan Albert
6206713fe8 [automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646
am: 7858a1bf96

Change-Id: I8a98e392b16e8adf845a79e08cb440ef09900d5e
2019-09-16 12:42:29 -07:00
Dan Albert
ad802fbf1f [automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours am: 4c056ce646
am: 7858a1bf96

Change-Id: I2da4654f10d4ba598061c988ed4e3bb8a47e550f
2019-09-16 12:42:28 -07:00
Dan Albert
11569624aa Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb
am: 8e233cb5c6

Change-Id: I4b54697533c5c92f2a0bb3e8aada41746c4b637c
2019-09-16 12:34:32 -07:00
Dan Albert
7858a1bf96 [automerger skipped] DO NOT MERGE: Fix bug in random. am: 01ed1e9c7b -s ours
am: 4c056ce646

Change-Id: I01cdc10fa37bfa77d10e45f2b83a365f710b63c3
2019-09-16 12:34:27 -07:00
Dan Albert
8e233cb5c6 Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev
am: 74bbe171bb

Change-Id: I596577098430bf27c7817aaa71ec10a13a44c609
2019-09-16 12:27:58 -07:00
Dan Albert
4c056ce646 [automerger skipped] DO NOT MERGE: Fix bug in random.
am: 01ed1e9c7b -s ours
am skip reason: subject contains skip directive

Change-Id: I4cb1a4848ba0f07eef10dde43161bad22152ffc1
2019-09-16 12:27:56 -07:00
TreeHugger Robot
74bbe171bb Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev
* changes:
  DO NOT MERGE: Fix bug in random.
  DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros
  DO NOT MERGE: [libc++] Add `__truncating_cast` for safely casting float types to integers
2019-09-16 19:16:10 +00:00
Dan Albert
7b9d256fcf Merge "Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b am: 93fa160993 am: fda98a6aa7" into qt-qpr1-dev-plus-aosp
am: 0c3e9a75ea

Change-Id: I2b870ddd336fe56645c10895950f93cda52829ee
2019-09-13 23:49:40 -07:00
Dan Albert
054b8706d8 Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b am: 93fa160993 am: 014840f16c
am: 9f44a5f2b0

Change-Id: Ie5ea3df4c904dca4107380f45737f123424144f1
2019-09-13 23:49:24 -07:00
Android Build Merger (Role)
0c3e9a75ea Merge "Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b am: 93fa160993 am: fda98a6aa7" into qt-qpr1-dev-plus-aosp 2019-09-14 06:43:46 +00:00
Dan Albert
9f44a5f2b0 Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b am: 93fa160993
am: 014840f16c

Change-Id: I1862b58537cb923370c09a4537e2c02455ffe350
2019-09-13 23:43:37 -07:00
Dan Albert
93b9a644ff Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b am: 93fa160993
am: fda98a6aa7

Change-Id: Ife30824f8c22cba7dc824075b21f059fd2602c72
2019-09-13 23:43:37 -07:00
Dan Albert
fda98a6aa7 Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b
am: 93fa160993

Change-Id: I039ea994b15db94f26e1c0e106046751fa663477
2019-09-13 23:37:51 -07:00
Dan Albert
014840f16c Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev am: 0540b9fc0b
am: 93fa160993

Change-Id: Id3f527a4b8d185b8b907dade75e4a9835ea904eb
2019-09-13 23:37:51 -07:00
Dan Albert
93fa160993 Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev
am: 0540b9fc0b

Change-Id: I874bfe8e7f05e4f0fa107108607fd864afdeec5d
2019-09-13 23:32:00 -07:00
TreeHugger Robot
0540b9fc0b Merge changes I71708114,Ice92a8ea,I300b6565 into qt-dev
* changes:
  Fix bug in random.
  [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros
  [libc++] Add `__truncating_cast` for safely casting float types to integers
2019-09-14 06:12:53 +00:00
Louis Dionne
1d7a151d54 Merge changes from topic "am-8dc2ba4274a94ce59f511d40f1ff2d77" into qt-qpr1-dev-plus-aosp
am: f2b10b86b3

Change-Id: I57475f176ce99f34d59d94a40fd63550424d90ce
2019-09-13 21:13:28 -07:00
Louis Dionne
fb8d0572c0 [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours am: 00305f086b am: 6bda858567 am: 1f6fdc4fc8
am: 19ac1353b7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic5b0d9db8d85f1b4c7a01e46b80b97eb0ead2dcd
2019-09-13 21:13:26 -07:00
Louis Dionne
609cb418f1 [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours am: 00305f086b am: 6bda858567 am: 0c6e4f21e3
am: 16807dcb4e -s ours
am skip reason: subject contains skip directive

Change-Id: Icf2e0c9bee6f07548259d454461758e976a461d9
2019-09-13 21:13:00 -07:00
Louis Dionne
9ded96d65f [automerger skipped] DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers am: baeddde44d -s ours am: c05874bc7f -s ours am: 88e2778807 am: 43b3af6225 am: 8a1b744bfc
am: 8958f18553 -s ours
am skip reason: subject contains skip directive

Change-Id: Icee284cf26ff5bd0b529b040a320ffff5af8a05a
2019-09-13 21:12:57 -07:00
Android Build Merger (Role)
f2b10b86b3 Merge changes from topic "am-8dc2ba4274a94ce59f511d40f1ff2d77" into qt-qpr1-dev-plus-aosp
* changes:
  [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours am: 00305f086b am: 6bda858567 am: 1f6fdc4fc8
  [automerger skipped] DO NOT MERGE: [libc++] Add `__truncating_cast` for safely casting float types to integers am: baeddde44d -s ours am: c05874bc7f -s ours am: 88e2778807 am: 43b3af6225 am: d9dc534c74
2019-09-14 04:06:47 +00:00
Louis Dionne
19ac1353b7 [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours am: 00305f086b am: 6bda858567
am: 1f6fdc4fc8

Change-Id: I56ce2334817e511694a10c13e82d32c4d839a65d
2019-09-13 21:06:28 -07:00
Louis Dionne
16807dcb4e [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours am: 00305f086b am: 6bda858567
am: 0c6e4f21e3

Change-Id: I6c2b89f661f3a8c52282ed893e5f36062ab0daeb
2019-09-13 21:06:28 -07:00
Louis Dionne
8958f18553 [automerger skipped] DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers am: baeddde44d -s ours am: c05874bc7f -s ours am: 88e2778807 am: 43b3af6225
am: 8a1b744bfc

Change-Id: I6284b8b44e4dfe2ce883051a337010fb7cf41c7e
2019-09-13 21:06:23 -07:00
Louis Dionne
f83f796fe7 [automerger skipped] DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers am: baeddde44d -s ours am: c05874bc7f -s ours am: 88e2778807 am: 43b3af6225
am: d9dc534c74

Change-Id: Ifdf8bccb8554bd761f4cd92c7d9d62f8c30a1506
2019-09-13 21:06:23 -07:00
Louis Dionne
1f6fdc4fc8 [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours am: 00305f086b
am: 6bda858567

Change-Id: I120cc0456fb9fe4ab3bf43392a181f4ac950c8e2
2019-09-13 20:54:22 -07:00
Louis Dionne
0c6e4f21e3 [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours am: 00305f086b
am: 6bda858567

Change-Id: Ia4f8f7554507da7c489f665c63c4464b749316a0
2019-09-13 20:54:22 -07:00
Louis Dionne
8a1b744bfc [automerger skipped] DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers am: baeddde44d -s ours am: c05874bc7f -s ours am: 88e2778807
am: 43b3af6225

Change-Id: I8f53fd278c4fa858e7e0ea213854f5104a1d8a44
2019-09-13 20:54:17 -07:00
Louis Dionne
d9dc534c74 [automerger skipped] DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers am: baeddde44d -s ours am: c05874bc7f -s ours am: 88e2778807
am: 43b3af6225

Change-Id: Ib86b47838d8ec6e8cc34dd334a75c91de6285e9a
2019-09-13 20:54:17 -07:00
Louis Dionne
6bda858567 [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours am: 2a6b690b1d -s ours
am: 00305f086b

Change-Id: I1d7d9299aa3c34bb8a957d229f7260e030655696
2019-09-13 20:47:51 -07:00
Louis Dionne
43b3af6225 [automerger skipped] DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers am: baeddde44d -s ours am: c05874bc7f -s ours
am: 88e2778807

Change-Id: I9b2da949187f515aebc8f8d55cf4c90340b07b5a
2019-09-13 20:47:46 -07:00
Louis Dionne
00305f086b [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros am: 280d459517 -s ours
am: 2a6b690b1d -s ours
am skip reason: subject contains skip directive

Change-Id: Ia0119dff04bbfa079557d8ef584a33015a8a026b
2019-09-13 20:41:17 -07:00
Louis Dionne
88e2778807 [automerger skipped] DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers am: baeddde44d -s ours
am: c05874bc7f -s ours
am skip reason: subject contains skip directive

Change-Id: Ib6288231862ab8412834eadbc4969dc3c287b920
2019-09-13 20:41:14 -07:00
Louis Dionne
2a6b690b1d [automerger skipped] DO NOT MERGE: [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros
am: 280d459517 -s ours
am skip reason: subject contains skip directive

Change-Id: I001eb20e4ab08eb7b6ad1071aaeedc444f3fbfb2
2019-09-13 20:34:45 -07:00
Louis Dionne
c05874bc7f [automerger skipped] DO NOT MERGE: [libc++] Add __truncating_cast for safely casting float types to integers
am: baeddde44d -s ours
am skip reason: subject contains skip directive

Change-Id: I221f8d2e33ebe88267c42f4784c9ccee87c510e7
2019-09-13 20:34:43 -07:00
Dan Albert
819e8133bd Fix bug in random.
Test: ./run_test.py --bitness 32
Test: ./run_test.py --bitness 64
Test: ./run_test.py --bitness 64 --host
Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=994957
Bug: http://b/139690488
Change-Id: I71708114d7fc8ed90c30b4d32b01d3f3aef7600b
(cherry picked from commit a1d1caa3d831030ce802ed335a9743180911d553)
2019-09-13 18:07:48 -07:00
Louis Dionne
44a8861f2c [libc++] Move __clamp_to_integral to <cmath>, and harden against min()/max() macros
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@370900 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit 87e6185621d332d2ef8695b94778663380c83bb9)

Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=994957
Bug: http://b/139690488
Change-Id: Ice92a8ea6f675be069a70c5ad1003cf99b4fc474
(cherry picked from commit 82e0483c4a47233ed2f7bab545b32e5ddd474e59)
2019-09-13 18:07:32 -07:00
Louis Dionne
34d1dd71fa [libc++] Add __truncating_cast for safely casting float types to integers
This is needed anytime we need to clamp an arbitrary floating point
value to an integer type.

Thanks to Eric Fiselier for the patch.

Differential Revision: https://reviews.llvm.org/D66836

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@370891 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit c9ac8d533010d8915bcfdecab891fb451f71ce74)
(cherry picked from commit 4561f55204960c0b3bc4594089ddcf56e5655cad)

Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=994957
Bug: http://b/139690488
Change-Id: I300b6565137b51bb3051bb629ec3316edf7f71e9
2019-09-13 18:07:13 -07:00
Dan Albert
8efd377818 [automerger skipped] DO NOT MERGE: Suppress warnings in tests. am: bb8457c3f4 -s ours am: 4da6874156 am: 6d385bfc4f am: 218855e4f5
am: 0b13afe334 -s ours
am skip reason: subject contains skip directive

Change-Id: Id0967453e34bf13594cc50066609b7ef26239774
2019-09-13 16:57:14 -07:00
Dan Albert
465f876b8a [automerger skipped] DO NOT MERGE: Suppress warnings in tests. am: bb8457c3f4 -s ours am: 4da6874156 am: 6d385bfc4f am: ff9f38b28b
am: d691a8f207 -s ours
am skip reason: subject contains skip directive

Change-Id: I26e52567a90411e7babe216678bf289b76616dab
2019-09-13 16:56:45 -07:00
Dan Albert
0b13afe334 [automerger skipped] DO NOT MERGE: Suppress warnings in tests. am: bb8457c3f4 -s ours am: 4da6874156 am: 6d385bfc4f
am: 218855e4f5

Change-Id: Ia750c7a02aa3c65ea8d059bd29441e1c0e38073e
2019-09-13 16:50:17 -07:00
Dan Albert
d691a8f207 [automerger skipped] DO NOT MERGE: Suppress warnings in tests. am: bb8457c3f4 -s ours am: 4da6874156 am: 6d385bfc4f
am: ff9f38b28b

Change-Id: Iff1a287989a2025cbee8ab4e2242e0f3709e6387
2019-09-13 16:49:18 -07:00
Dan Albert
218855e4f5 [automerger skipped] DO NOT MERGE: Suppress warnings in tests. am: bb8457c3f4 -s ours am: 4da6874156
am: 6d385bfc4f

Change-Id: I3dafc79fa5d70d05f6f6ff3d2c587ff855fc09a5
2019-09-13 16:43:15 -07:00
Dan Albert
ff9f38b28b [automerger skipped] DO NOT MERGE: Suppress warnings in tests. am: bb8457c3f4 -s ours am: 4da6874156
am: 6d385bfc4f

Change-Id: I1f7219ca99283a423d216d4c983c48bfef9ae4c0
2019-09-13 16:42:15 -07:00