d44c077dce
Reason for revert: Looks like the Chrome iOS build is broken because of these two changes. So I'm going to have to revert. Here's the error: https://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ninja/builds/185624/steps/compile/logs/stdio FAILED: rm -f arch/libsafe_numerics.arm64.a && ./gyp-mac-tool filter-libtool libtool -static -o arch/libsafe_numerics.arm64.a error: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool: no files specified Usage: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -static [-] file [...] [-filelist listfile[,dirname]] [-arch_only arch] [-sacLT] [-no_warning_for_no_symbols] Usage: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -dynamic [-] file [...] [-filelist listfile[,dirname]] [-arch_only arch] [-o output] [-install_name name] [-compatibility_version #] [-current_version #] [-seg1addr 0x#] [-segs_read_only_addr 0x#] [-segs_read_write_addr 0x#] [-seg_addr_table <filename>] [-seg_addr_table_filename <file_system_path>] [-all_load] [-noall_load] FAILED: rm -f arch/libsafe_numerics.armv7.a && ./gyp-mac-tool filter-libtool libtool -static -o arch/libsafe_numerics.armv7.a error: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool: no files specified Usage: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -static [-] file [...] [-filelist listfile[,dirname]] [-arch_only arch] [-sacLT] [-no_warning_for_no_symbols] Usage: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -dynamic [-] file [...] [-filelist listfile[,dirname]] [-arch_only arch] [-o output] [-install_name name] [-compatibility_version #] [-current_version #] [-seg1addr 0x#] [-segs_read_only_addr 0x#] [-segs_read_write_addr 0x#] [-seg_addr_table <filename>] [-seg_addr_table_filename <file_system_path>] [-all_load] [-noall_load] ninja: build stopped: subcommand failed. Original issue's description: > Safe numeric library added: base/numerics (copied from Chromium) > > This copies the contents (unittest excluded) of base/numerics in > chromium to base/numerics in webrtc. Files added: > - safe_conversions.h > - safe_conversions_impl.h > - safe_math.h > - safe_math_impl.h > > A really old version of safe_conversions[_impl].h previously existed in > base/, this has been deleted and sources using it have been updated > to include the new base/numerics/safe_converions.h. > > This CL also adds a DEPS file to webrtc/base. > > NOPRESUBMIT=True > BUG=webrtc:5548, webrtc:5623 > > Committed: https://crrev.com/de1c81b2d2196be611674aa6019b9db3a9329042 > Cr-Commit-Position: refs/heads/master@{#11907} TBR=kjellander@webrtc.org,kwiberg@webrtc.org,tina.legrand@webrtc.org,hbos@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:5548, webrtc:5623 Review URL: https://codereview.webrtc.org/1792613002 . Cr-Commit-Position: refs/heads/master@{#11965}
71 lines
2.3 KiB
C++
71 lines
2.3 KiB
C++
/*
|
|
* Copyright 2014 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
// Borrowed from Chromium's src/base/numerics/safe_conversions.h.
|
|
|
|
#ifndef WEBRTC_BASE_SAFE_CONVERSIONS_H_
|
|
#define WEBRTC_BASE_SAFE_CONVERSIONS_H_
|
|
|
|
#include <limits>
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/base/safe_conversions_impl.h"
|
|
|
|
namespace rtc {
|
|
|
|
// Convenience function that returns true if the supplied value is in range
|
|
// for the destination type.
|
|
template <typename Dst, typename Src>
|
|
inline bool IsValueInRangeForNumericType(Src value) {
|
|
return internal::RangeCheck<Dst>(value) == internal::TYPE_VALID;
|
|
}
|
|
|
|
// checked_cast<> is analogous to static_cast<> for numeric types,
|
|
// except that it CHECKs that the specified numeric conversion will not
|
|
// overflow or underflow. NaN source will always trigger a CHECK.
|
|
template <typename Dst, typename Src>
|
|
inline Dst checked_cast(Src value) {
|
|
RTC_CHECK(IsValueInRangeForNumericType<Dst>(value));
|
|
return static_cast<Dst>(value);
|
|
}
|
|
|
|
// saturated_cast<> is analogous to static_cast<> for numeric types, except
|
|
// that the specified numeric conversion will saturate rather than overflow or
|
|
// underflow. NaN assignment to an integral will trigger a RTC_CHECK condition.
|
|
template <typename Dst, typename Src>
|
|
inline Dst saturated_cast(Src value) {
|
|
// Optimization for floating point values, which already saturate.
|
|
if (std::numeric_limits<Dst>::is_iec559)
|
|
return static_cast<Dst>(value);
|
|
|
|
switch (internal::RangeCheck<Dst>(value)) {
|
|
case internal::TYPE_VALID:
|
|
return static_cast<Dst>(value);
|
|
|
|
case internal::TYPE_UNDERFLOW:
|
|
return std::numeric_limits<Dst>::min();
|
|
|
|
case internal::TYPE_OVERFLOW:
|
|
return std::numeric_limits<Dst>::max();
|
|
|
|
// Should fail only on attempting to assign NaN to a saturated integer.
|
|
case internal::TYPE_INVALID:
|
|
FATAL();
|
|
return std::numeric_limits<Dst>::max();
|
|
}
|
|
|
|
FATAL();
|
|
return static_cast<Dst>(value);
|
|
}
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // WEBRTC_BASE_SAFE_CONVERSIONS_H_
|