Reviewers: rossberg,
Description:
Get rid of code duplication by computing int Lub using range Lub.
[email protected]
BUG=
Please review this at https://codereview.chromium.org/616563002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+6, -35 lines):
M src/types.h
M src/types.cc
Index: src/types.cc
diff --git a/src/types.cc b/src/types.cc
index
c3184c684498ab634f186d0b350e274bc2736af3..70ee43db4a5c843dfa82c2527b088b044c40da18
100644
--- a/src/types.cc
+++ b/src/types.cc
@@ -274,37 +274,11 @@ TypeImpl<Config>::BitsetType::Lub(double value) {
DisallowHeapAllocation no_allocation;
if (i::IsMinusZero(value)) return kMinusZero;
if (std::isnan(value)) return kNaN;
- if (IsUint32Double(value)) return Lub(FastD2UI(value));
- if (IsInt32Double(value)) return Lub(FastD2I(value));
+ if (IsUint32Double(value) || IsInt32Double(value)) return Lub(value,
value);
return kOtherNumber;
}
-template<class Config>
-typename TypeImpl<Config>::bitset
-TypeImpl<Config>::BitsetType::Lub(int32_t value) {
- DisallowHeapAllocation no_allocation;
- if (value >= 0x40000000) {
- return i::SmiValuesAre31Bits() ? kOtherUnsigned31 : kUnsignedSmall;
- }
- if (value >= 0) return kUnsignedSmall;
- if (value >= -0x40000000) return kOtherSignedSmall;
- return i::SmiValuesAre31Bits() ? kOtherSigned32 : kOtherSignedSmall;
-}
-
-
-template<class Config>
-typename TypeImpl<Config>::bitset
-TypeImpl<Config>::BitsetType::Lub(uint32_t value) {
- DisallowHeapAllocation no_allocation;
- if (value >= 0x80000000u) return kOtherUnsigned32;
- if (value >= 0x40000000u) {
- return i::SmiValuesAre31Bits() ? kOtherUnsigned31 : kUnsignedSmall;
- }
- return kUnsignedSmall;
-}
-
-
// Minimum values of regular numeric bitsets when SmiValuesAre31Bits.
template<class Config>
const typename TypeImpl<Config>::BitsetType::BitsetMin
@@ -334,10 +308,8 @@ TypeImpl<Config>::BitsetType::BitsetMins32[] = {
template<class Config>
typename TypeImpl<Config>::bitset
-TypeImpl<Config>::BitsetType::Lub(Limits lim) {
+TypeImpl<Config>::BitsetType::Lub(double min, double max) {
DisallowHeapAllocation no_allocation;
- double min = lim.min->Number();
- double max = lim.max->Number();
int lub = kNone;
const BitsetMin* mins = BitsetMins();
Index: src/types.h
diff --git a/src/types.h b/src/types.h
index
e7815ed316f29d420096619aaccdfb2cdf19c9f1..b43249fab859c5e01ea94c8e8ab61c37659f3fee
100644
--- a/src/types.h
+++ b/src/types.h
@@ -598,12 +598,10 @@ class TypeImpl<Config>::BitsetType : public
TypeImpl<Config> {
static bitset Glb(TypeImpl* type); // greatest lower bound that's a
bitset
static bitset Lub(TypeImpl* type); // least upper bound that's a bitset
+ static bitset Lub(i::Map* map);
static bitset Lub(i::Object* value);
static bitset Lub(double value);
- static bitset Lub(int32_t value);
- static bitset Lub(uint32_t value);
- static bitset Lub(i::Map* map);
- static bitset Lub(Limits lim);
+ static bitset Lub(double min, double max);
static const char* Name(bitset);
static void Print(OStream& os, bitset); // NOLINT
@@ -781,7 +779,8 @@ class TypeImpl<Config>::RangeType : public
StructuralType {
DCHECK(min->Number() <= max->Number());
RangeHandle type = Config::template cast<RangeType>(
StructuralType::New(StructuralType::kRangeTag, 3, region));
- type->Set(0, BitsetType::New(BitsetType::Lub(Limits(min, max)),
region));
+ type->Set(0, BitsetType::New(
+ BitsetType::Lub(min->Number(), max->Number()), region));
type->SetValue(1, min);
type->SetValue(2, max);
return type;
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
