Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(535)

Unified Diff: base/numerics/safe_conversions_impl.h

Issue 141583008: Add support for safe math operations in base/numerics (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/numerics/safe_conversions_impl.h
===================================================================
--- base/numerics/safe_conversions_impl.h (revision 248433)
+++ base/numerics/safe_conversions_impl.h (working copy)
@@ -12,92 +12,93 @@
namespace base {
namespace internal {
-enum DstSign {
- DST_UNSIGNED,
- DST_SIGNED
+using std::numeric_limits;
+
+enum DstSignId {
+ DST_UNSIGNED = 0,
+ DST_SIGNED = 1
};
-enum SrcSign {
- SRC_UNSIGNED,
- SRC_SIGNED
+enum SrcSignId {
+ SRC_UNSIGNED = 0,
+ SRC_SIGNED = 1
};
-enum DstRange {
+enum DstRangeId {
OVERLAPS_RANGE,
CONTAINS_RANGE
};
+// Retrieve the max exponent for floating types and compute it for integrals.
+template <typename NumericType>
+struct MaxExponent {
+ static const int value = numeric_limits<NumericType>::is_iec559 ?
+ numeric_limits<NumericType>::max_exponent :
+ (sizeof(NumericType) * 8 -
+ numeric_limits<NumericType>::is_signed);
+};
+
// Helper templates to statically determine if our destination type can contain
-// all values represented by the source type.
+// maximum and minimum values represented by the source type.
template <typename Dst, typename Src,
- DstSign IsDstSigned = std::numeric_limits<Dst>::is_signed ?
- DST_SIGNED : DST_UNSIGNED,
- SrcSign IsSrcSigned = std::numeric_limits<Src>::is_signed ?
- SRC_SIGNED : SRC_UNSIGNED>
+ DstSignId DstSign = numeric_limits<Dst>::is_signed ?
+ DST_SIGNED : DST_UNSIGNED,
+ SrcSignId SrcSign = numeric_limits<Src>::is_signed ?
+ SRC_SIGNED : SRC_UNSIGNED>
struct StaticRangeCheck {};
+// Both signed, narrowing.
template <typename Dst, typename Src>
struct StaticRangeCheck<Dst, Src, DST_SIGNED, SRC_SIGNED> {
- typedef std::numeric_limits<Dst> DstLimits;
- typedef std::numeric_limits<Src> SrcLimits;
- // Compare based on max_exponent, which we must compute for integrals.
- static const size_t kDstMaxExponent = DstLimits::is_iec559 ?
- DstLimits::max_exponent :
- (sizeof(Dst) * 8 - 1);
- static const size_t kSrcMaxExponent = SrcLimits::is_iec559 ?
- SrcLimits::max_exponent :
- (sizeof(Src) * 8 - 1);
- static const DstRange value = kDstMaxExponent >= kSrcMaxExponent ?
- CONTAINS_RANGE : OVERLAPS_RANGE;
+ static const DstRangeId value = MaxExponent<Dst>::value >=
+ MaxExponent<Src>::value ?
+ CONTAINS_RANGE : OVERLAPS_RANGE;
};
+// Both unsigned, narrowing (handled same as both signed narrowing).
template <typename Dst, typename Src>
-struct StaticRangeCheck<Dst, Src, DST_UNSIGNED, SRC_UNSIGNED> {
- static const DstRange value = sizeof(Dst) >= sizeof(Src) ?
- CONTAINS_RANGE : OVERLAPS_RANGE;
-};
+struct StaticRangeCheck<Dst, Src, DST_UNSIGNED, SRC_UNSIGNED> :
+ StaticRangeCheck<Dst, Src, DST_SIGNED, SRC_SIGNED> {};
+// Unsigned to signed, overlapping.
template <typename Dst, typename Src>
struct StaticRangeCheck<Dst, Src, DST_SIGNED, SRC_UNSIGNED> {
- typedef std::numeric_limits<Dst> DstLimits;
- typedef std::numeric_limits<Src> SrcLimits;
- // Compare based on max_exponent, which we must compute for integrals.
- static const size_t kDstMaxExponent = DstLimits::is_iec559 ?
- DstLimits::max_exponent :
- (sizeof(Dst) * 8 - 1);
- static const size_t kSrcMaxExponent = sizeof(Src) * 8;
- static const DstRange value = kDstMaxExponent >= kSrcMaxExponent ?
- CONTAINS_RANGE : OVERLAPS_RANGE;
+ typedef numeric_limits<Dst> DstLimits;
+ typedef numeric_limits<Src> SrcLimits;
+ static const DstRangeId value = MaxExponent<Dst>::value >
+ MaxExponent<Src>::value ?
+ CONTAINS_RANGE : OVERLAPS_RANGE;
};
+// Signed to unsigned, overlapping.
template <typename Dst, typename Src>
struct StaticRangeCheck<Dst, Src, DST_UNSIGNED, SRC_SIGNED> {
- static const DstRange value = OVERLAPS_RANGE;
+ static const DstRangeId value = OVERLAPS_RANGE;
};
-enum RangeCheckResult {
+enum RangeCheckId {
TYPE_VALID = 0, // Value can be represented by the destination type.
TYPE_UNDERFLOW = 1, // Value would overflow.
TYPE_OVERFLOW = 2, // Value would underflow.
TYPE_INVALID = 3 // Source value is invalid (i.e. NaN).
};
-// This macro creates a RangeCheckResult from an upper and lower bound
+// This macro creates a RangeCheckId from an upper and lower bound
// check by taking advantage of the fact that only NaN can be out of range in
// both directions at once.
#define BASE_NUMERIC_RANGE_CHECK_RESULT(is_in_upper_bound, is_in_lower_bound) \
- RangeCheckResult(((is_in_upper_bound) ? 0 : TYPE_OVERFLOW) | \
+ RangeCheckId(((is_in_upper_bound) ? 0 : TYPE_OVERFLOW) | \
((is_in_lower_bound) ? 0 : TYPE_UNDERFLOW))
template <typename Dst,
typename Src,
- DstSign IsDstSigned = std::numeric_limits<Dst>::is_signed ?
- DST_SIGNED : DST_UNSIGNED,
- SrcSign IsSrcSigned = std::numeric_limits<Src>::is_signed ?
- SRC_SIGNED : SRC_UNSIGNED,
- DstRange IsSrcRangeContained = StaticRangeCheck<Dst, Src>::value>
+ DstSignId DstSign = numeric_limits<Dst>::is_signed ?
+ DST_SIGNED : DST_UNSIGNED,
+ SrcSignId SrcSign = numeric_limits<Src>::is_signed ?
+ SRC_SIGNED : SRC_UNSIGNED,
+ DstRangeId DstRange = StaticRangeCheck<Dst, Src>::value>
struct RangeCheckImpl {};
// The following templates are for ranges that must be verified at runtime. We
@@ -105,9 +106,9 @@
// compiler warnings on signed an unsigned comparisons.
// Dst range always contains the result: nothing to check.
-template <typename Dst, typename Src, DstSign IsDstSigned, SrcSign IsSrcSigned>
-struct RangeCheckImpl<Dst, Src, IsDstSigned, IsSrcSigned, CONTAINS_RANGE> {
- static RangeCheckResult Check(Src value) {
+template <typename Dst, typename Src, DstSignId DstSign, SrcSignId SrcSign>
+struct RangeCheckImpl<Dst, Src, DstSign, SrcSign, CONTAINS_RANGE> {
+ static RangeCheckId Check(Src value) {
return TYPE_VALID;
}
};
@@ -115,64 +116,53 @@
// Signed to signed narrowing.
template <typename Dst, typename Src>
struct RangeCheckImpl<Dst, Src, DST_SIGNED, SRC_SIGNED, OVERLAPS_RANGE> {
- static RangeCheckResult Check(Src value) {
- typedef std::numeric_limits<Dst> DstLimits;
- return DstLimits::is_iec559 ?
+ static RangeCheckId Check(Src value) {
+ return numeric_limits<Dst>::is_iec559 ?
BASE_NUMERIC_RANGE_CHECK_RESULT(
- value <= static_cast<Src>(DstLimits::max()),
- value >= static_cast<Src>(DstLimits::max() * -1)) :
+ value <= numeric_limits<Dst>::max(),
+ value >= -numeric_limits<Dst>::max()) :
BASE_NUMERIC_RANGE_CHECK_RESULT(
- value <= static_cast<Src>(DstLimits::max()),
- value >= static_cast<Src>(DstLimits::min()));
+ value <= numeric_limits<Dst>::max(),
+ value >= numeric_limits<Dst>::min());
}
};
// Unsigned to unsigned narrowing.
template <typename Dst, typename Src>
struct RangeCheckImpl<Dst, Src, DST_UNSIGNED, SRC_UNSIGNED, OVERLAPS_RANGE> {
- static RangeCheckResult Check(Src value) {
- typedef std::numeric_limits<Dst> DstLimits;
+ static RangeCheckId Check(Src value) {
return BASE_NUMERIC_RANGE_CHECK_RESULT(
- value <= static_cast<Src>(DstLimits::max()), true);
+ value <= numeric_limits<Dst>::max(), true);
}
};
// Unsigned to signed.
template <typename Dst, typename Src>
struct RangeCheckImpl<Dst, Src, DST_SIGNED, SRC_UNSIGNED, OVERLAPS_RANGE> {
- static RangeCheckResult Check(Src value) {
- typedef std::numeric_limits<Dst> DstLimits;
+ static RangeCheckId Check(Src value) {
return sizeof(Dst) > sizeof(Src) ? TYPE_VALID :
BASE_NUMERIC_RANGE_CHECK_RESULT(
- value <= static_cast<Src>(DstLimits::max()), true);
+ value <= static_cast<Src>(numeric_limits<Dst>::max()),
+ true);
}
};
// Signed to unsigned.
template <typename Dst, typename Src>
struct RangeCheckImpl<Dst, Src, DST_UNSIGNED, SRC_SIGNED, OVERLAPS_RANGE> {
- static RangeCheckResult Check(Src value) {
- typedef std::numeric_limits<Dst> DstLimits;
- typedef std::numeric_limits<Src> SrcLimits;
- // Compare based on max_exponent, which we must compute for integrals.
- static const size_t kDstMaxExponent = sizeof(Dst) * 8;
- static const size_t kSrcMaxExponent = SrcLimits::is_iec559 ?
- SrcLimits::max_exponent :
- (sizeof(Src) * 8 - 1);
- return (kDstMaxExponent >= kSrcMaxExponent) ?
+ static RangeCheckId Check(Src value) {
+ return (MaxExponent<Dst>::value >= MaxExponent<Src>::value) ?
BASE_NUMERIC_RANGE_CHECK_RESULT(true, value >= static_cast<Src>(0)) :
BASE_NUMERIC_RANGE_CHECK_RESULT(
- value <= static_cast<Src>(DstLimits::max()),
+ value <= static_cast<Src>(numeric_limits<Dst>::max()),
value >= static_cast<Src>(0));
}
};
template <typename Dst, typename Src>
-inline RangeCheckResult RangeCheck(Src value) {
- COMPILE_ASSERT(std::numeric_limits<Src>::is_specialized,
- argument_must_be_numeric);
- COMPILE_ASSERT(std::numeric_limits<Dst>::is_specialized,
- result_must_be_numeric);
+inline RangeCheckId RangeCheck(Src value) {
+ COMPILE_ASSERT(numeric_limits<Src>::is_specialized, argument_must_be_numeric);
+ COMPILE_ASSERT(numeric_limits<Dst>::is_specialized, result_must_be_numeric);
return RangeCheckImpl<Dst, Src>::Check(value);
}
« no previous file with comments | « base/base.gypi ('k') | base/numerics/safe_math.h » ('j') | base/numerics/safe_math_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698