aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>2018-07-31 18:48:30 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-31 19:30:48 +0000
commit1935aa3d27cd4ed4aef2dc04360f247a541d4b00 (patch)
treec09f73af20a4ee900b70d464348dedcaaad48f01
parente782f8472f61a5a553c57fef788ad4405844887b (diff)
Roll skia/third_party/skcms f80f027f8ac9..dc97dc542b6d (1 commits)
https://skia.googlesource.com/skcms.git/+log/f80f027f8ac9..dc97dc542b6d 2018-07-31 mtklein@google.com turn on -fsanitize=integer on portable bot The AutoRoll server is located here: https://skcms-skia-roll.skia.org Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel TBR=scroggo@google.com Change-Id: Ided624d7a976be030f278d86d1ef91c57b1d4ad0 Reviewed-on: https://skia-review.googlesource.com/144623 Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
-rw-r--r--third_party/skcms/src/Transform_inl.h5
-rwxr-xr-xthird_party/skcms/version.sha12
2 files changed, 6 insertions, 1 deletions
diff --git a/third_party/skcms/src/Transform_inl.h b/third_party/skcms/src/Transform_inl.h
index 8cc9f77173..49d324aba7 100644
--- a/third_party/skcms/src/Transform_inl.h
+++ b/third_party/skcms/src/Transform_inl.h
@@ -140,6 +140,11 @@ SI ATTR F F_from_Half(U16 half) {
#endif
}
+#if defined(__clang__)
+ // The -((127-15)<<10) underflows that side of the math when
+ // we pass a denorm half float. It's harmless... we'll take the 0 side anyway.
+ __attribute__((no_sanitize("unsigned-integer-overflow")))
+#endif
SI ATTR U16 Half_from_F(F f) {
#if defined(USING_NEON_F16C)
return (U16)vcvt_f16_f32(f);
diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1
index 943689e61c..c7eeae456d 100755
--- a/third_party/skcms/version.sha1
+++ b/third_party/skcms/version.sha1
@@ -1 +1 @@
-f80f027f8ac98fcefd0ce327930c842978dffbac \ No newline at end of file
+dc97dc542b6dc25d78a945b084425204ab380dd8 \ No newline at end of file