AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Replace unsafe uses of Add<> with AddUncasted<>.

Browse Source 
R=svenpanne@chromium.org

Review URL: https://codereview.chromium.org/78213002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17913 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
bmeurer@chromium.org 2013-11-20 11:57:49 +00:00
parent da6d5586f9
commit 6826b74708
1 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/hydrogen.cc
View File

@ -1315,7 +1315,7 @@ HValue* HGraphBuilder::BuildCheckForCapacityGrow(HValue* object,
capacity_checker.Then(); capacity_checker.Then();
HValue* max_gap = Add<HConstant>(static_cast<int32_t>(JSObject::kMaxGap)); HValue* max_gap = Add<HConstant>(static_cast<int32_t>(JSObject::kMaxGap));
HValue* max_capacity = Add<HAdd>(current_capacity, max_gap); HValue* max_capacity = AddUncasted<HAdd>(current_capacity, max_gap);
IfBuilder key_checker(this); IfBuilder key_checker(this);
key_checker.If<HCompareNumericAndBranch>(key, max_capacity, Token::LT); key_checker.If<HCompareNumericAndBranch>(key, max_capacity, Token::LT);
key_checker.Then(); key_checker.Then();
@ -1432,14 +1432,14 @@ HValue* HGraphBuilder::BuildUncheckedDictionaryElementLoadHelper(
int32_t offset = SeededNumberDictionary::GetProbeOffset(current_probe); int32_t offset = SeededNumberDictionary::GetProbeOffset(current_probe);
HValue* raw_index = (current_probe == 0) HValue* raw_index = (current_probe == 0)
? hash ? hash
: Add<HAdd>(hash, Add<HConstant>(offset)); : AddUncasted<HAdd>(hash, Add<HConstant>(offset));
raw_index = Add<HBitwise>(Token::BIT_AND, raw_index, mask); raw_index = AddUncasted<HBitwise>(Token::BIT_AND, raw_index, mask);
int32_t entry_size = SeededNumberDictionary::kEntrySize; int32_t entry_size = SeededNumberDictionary::kEntrySize;
raw_index = Add<HMul>(raw_index, Add<HConstant>(entry_size)); raw_index = AddUncasted<HMul>(raw_index, Add<HConstant>(entry_size));
raw_index->ClearFlag(HValue::kCanOverflow); raw_index->ClearFlag(HValue::kCanOverflow);
int32_t base_offset = SeededNumberDictionary::kElementsStartIndex; int32_t base_offset = SeededNumberDictionary::kElementsStartIndex;
HValue* key_index = Add<HAdd>(raw_index, Add<HConstant>(base_offset)); HValue* key_index = AddUncasted<HAdd>(raw_index, Add<HConstant>(base_offset));
key_index->ClearFlag(HValue::kCanOverflow); key_index->ClearFlag(HValue::kCanOverflow);
HValue* candidate_key = Add<HLoadKeyed>(elements, key_index, HValue* candidate_key = Add<HLoadKeyed>(elements, key_index,
@ -1464,8 +1464,8 @@ HValue* HGraphBuilder::BuildUncheckedDictionaryElementLoadHelper(
{ {
// Key at current probe matches. Details must be zero, otherwise the // Key at current probe matches. Details must be zero, otherwise the
// dictionary element requires special handling. // dictionary element requires special handling.
HValue* details_index = Add<HAdd>(raw_index, HValue* details_index = AddUncasted<HAdd>(
Add<HConstant>(base_offset + 2)); raw_index, Add<HConstant>(base_offset + 2));
details_index->ClearFlag(HValue::kCanOverflow); details_index->ClearFlag(HValue::kCanOverflow);
HValue* details = Add<HLoadKeyed>(elements, details_index, HValue* details = Add<HLoadKeyed>(elements, details_index,
@ -1481,8 +1481,8 @@ HValue* HGraphBuilder::BuildUncheckedDictionaryElementLoadHelper(
{ {
// Key matches and details are zero --> fast case. Load and return the // Key matches and details are zero --> fast case. Load and return the
// value. // value.
HValue* result_index = Add<HAdd>(raw_index, HValue* result_index = AddUncasted<HAdd>(
Add<HConstant>(base_offset + 1)); raw_index, Add<HConstant>(base_offset + 1));
result_index->ClearFlag(HValue::kCanOverflow); result_index->ClearFlag(HValue::kCanOverflow);
Push(Add<HLoadKeyed>(elements, result_index, Push(Add<HLoadKeyed>(elements, result_index,
@ -1500,33 +1500,33 @@ HValue* HGraphBuilder::BuildUncheckedDictionaryElementLoadHelper(
HValue* HGraphBuilder::BuildElementIndexHash(HValue* index) { HValue* HGraphBuilder::BuildElementIndexHash(HValue* index) {
int32_t seed_value = static_cast<uint32_t>(isolate()->heap()->HashSeed()); int32_t seed_value = static_cast<uint32_t>(isolate()->heap()->HashSeed());
HValue* seed = Add<HConstant>(seed_value); HValue* seed = Add<HConstant>(seed_value);
HValue* hash = Add<HBitwise>(Token::BIT_XOR, index, seed); HValue* hash = AddUncasted<HBitwise>(Token::BIT_XOR, index, seed);
// hash = ~hash + (hash << 15); // hash = ~hash + (hash << 15);
HValue* shifted_hash = Add<HShl>(hash, Add<HConstant>(15)); HValue* shifted_hash = AddUncasted<HShl>(hash, Add<HConstant>(15));
HValue* not_hash = Add<HBitwise>(Token::BIT_XOR, hash, HValue* not_hash = AddUncasted<HBitwise>(Token::BIT_XOR, hash,
graph()->GetConstantMinus1()); graph()->GetConstantMinus1());
hash = Add<HAdd>(shifted_hash, not_hash); hash = AddUncasted<HAdd>(shifted_hash, not_hash);
// hash = hash ^ (hash >> 12); // hash = hash ^ (hash >> 12);
shifted_hash = Add<HShr>(hash, Add<HConstant>(12)); shifted_hash = AddUncasted<HShr>(hash, Add<HConstant>(12));
hash = Add<HBitwise>(Token::BIT_XOR, hash, shifted_hash); hash = AddUncasted<HBitwise>(Token::BIT_XOR, hash, shifted_hash);
// hash = hash + (hash << 2); // hash = hash + (hash << 2);
shifted_hash = Add<HShl>(hash, Add<HConstant>(2)); shifted_hash = AddUncasted<HShl>(hash, Add<HConstant>(2));
hash = Add<HAdd>(hash, shifted_hash); hash = AddUncasted<HAdd>(hash, shifted_hash);
// hash = hash ^ (hash >> 4); // hash = hash ^ (hash >> 4);
shifted_hash = Add<HShr>(hash, Add<HConstant>(4)); shifted_hash = AddUncasted<HShr>(hash, Add<HConstant>(4));
hash = Add<HBitwise>(Token::BIT_XOR, hash, shifted_hash); hash = AddUncasted<HBitwise>(Token::BIT_XOR, hash, shifted_hash);
// hash = hash * 2057; // hash = hash * 2057;
hash = Add<HMul>(hash, Add<HConstant>(2057)); hash = AddUncasted<HMul>(hash, Add<HConstant>(2057));
hash->ClearFlag(HValue::kCanOverflow); hash->ClearFlag(HValue::kCanOverflow);
// hash = hash ^ (hash >> 16); // hash = hash ^ (hash >> 16);
shifted_hash = Add<HShr>(hash, Add<HConstant>(16)); shifted_hash = AddUncasted<HShr>(hash, Add<HConstant>(16));
return Add<HBitwise>(Token::BIT_XOR, hash, shifted_hash); return AddUncasted<HBitwise>(Token::BIT_XOR, hash, shifted_hash);
} }
@ -1576,10 +1576,10 @@ HValue* HGraphBuilder::BuildNumberToString(HValue* object,
if_objectissmi.Then(); if_objectissmi.Then();
{ {
// Compute hash for smi similar to smi_get_hash(). // Compute hash for smi similar to smi_get_hash().
HValue* hash = Add<HBitwise>(Token::BIT_AND, object, mask); HValue* hash = AddUncasted<HBitwise>(Token::BIT_AND, object, mask);
// Load the key. // Load the key.
HValue* key_index = Add<HShl>(hash, graph()->GetConstant1()); HValue* key_index = AddUncasted<HShl>(hash, graph()->GetConstant1());
HValue* key = Add<HLoadKeyed>(number_string_cache, key_index, HValue* key = Add<HLoadKeyed>(number_string_cache, key_index,
static_cast<HValue*>(NULL), static_cast<HValue*>(NULL),
FAST_ELEMENTS, ALLOW_RETURN_HOLE); FAST_ELEMENTS, ALLOW_RETURN_HOLE);
@ -1610,11 +1610,11 @@ HValue* HGraphBuilder::BuildNumberToString(HValue* object,
object, HObjectAccess::ForHeapNumberValueLowestBits()); object, HObjectAccess::ForHeapNumberValueLowestBits());
HValue* high = Add<HLoadNamedField>( HValue* high = Add<HLoadNamedField>(
object, HObjectAccess::ForHeapNumberValueHighestBits()); object, HObjectAccess::ForHeapNumberValueHighestBits());
HValue* hash = Add<HBitwise>(Token::BIT_XOR, low, high); HValue* hash = AddUncasted<HBitwise>(Token::BIT_XOR, low, high);
hash = Add<HBitwise>(Token::BIT_AND, hash, mask); hash = AddUncasted<HBitwise>(Token::BIT_AND, hash, mask);
// Load the key. // Load the key.
HValue* key_index = Add<HShl>(hash, graph()->GetConstant1()); HValue* key_index = AddUncasted<HShl>(hash, graph()->GetConstant1());
HValue* key = Add<HLoadKeyed>(number_string_cache, key_index, HValue* key = Add<HLoadKeyed>(number_string_cache, key_index,
static_cast<HValue*>(NULL), static_cast<HValue*>(NULL),
FAST_ELEMENTS, ALLOW_RETURN_HOLE); FAST_ELEMENTS, ALLOW_RETURN_HOLE);
@ -1660,7 +1660,7 @@ HValue* HGraphBuilder::BuildNumberToString(HValue* object,
// Load the value in case of cache hit. // Load the value in case of cache hit.
HValue* key_index = Pop(); HValue* key_index = Pop();
HValue* value_index = Add<HAdd>(key_index, graph()->GetConstant1()); HValue* value_index = AddUncasted<HAdd>(key_index, graph()->GetConstant1());
Push(Add<HLoadKeyed>(number_string_cache, value_index, Push(Add<HLoadKeyed>(number_string_cache, value_index,
static_cast<HValue*>(NULL), static_cast<HValue*>(NULL),
FAST_ELEMENTS, ALLOW_RETURN_HOLE)); FAST_ELEMENTS, ALLOW_RETURN_HOLE));
@ -1685,14 +1685,14 @@ HValue* HGraphBuilder::BuildSeqStringSizeFor(HValue* length,
STATIC_ASSERT((SeqString::kHeaderSize & kObjectAlignmentMask) == 0); STATIC_ASSERT((SeqString::kHeaderSize & kObjectAlignmentMask) == 0);
HValue* size = length; HValue* size = length;
if (encoding == String::TWO_BYTE_ENCODING) { if (encoding == String::TWO_BYTE_ENCODING) {
size = Add<HShl>(length, graph()->GetConstant1()); size = AddUncasted<HShl>(length, graph()->GetConstant1());
size->ClearFlag(HValue::kCanOverflow); size->ClearFlag(HValue::kCanOverflow);
size->SetFlag(HValue::kUint32); size->SetFlag(HValue::kUint32);
} }
size = Add<HAdd>(size, Add<HConstant>(static_cast<int32_t>( size = AddUncasted<HAdd>(size, Add<HConstant>(static_cast<int32_t>(
SeqString::kHeaderSize + kObjectAlignmentMask))); SeqString::kHeaderSize + kObjectAlignmentMask)));
size->ClearFlag(HValue::kCanOverflow); size->ClearFlag(HValue::kCanOverflow);
size = Add<HBitwise>( size = AddUncasted<HBitwise>(
Token::BIT_AND, size, Add<HConstant>(static_cast<int32_t>( Token::BIT_AND, size, Add<HConstant>(static_cast<int32_t>(
~kObjectAlignmentMask))); ~kObjectAlignmentMask)));
return size; return size;
@ -1711,9 +1711,9 @@ void HGraphBuilder::BuildCopySeqStringChars(HValue* src,
LoopBuilder loop(this, context(), LoopBuilder::kPostIncrement); LoopBuilder loop(this, context(), LoopBuilder::kPostIncrement);
HValue* index = loop.BeginBody(graph()->GetConstant0(), length, Token::LT); HValue* index = loop.BeginBody(graph()->GetConstant0(), length, Token::LT);
{ {
HValue* src_index = Add<HAdd>(src_offset, index); HValue* src_index = AddUncasted<HAdd>(src_offset, index);
HValue* value = Add<HSeqStringGetChar>(src_encoding, src, src_index); HValue* value = Add<HSeqStringGetChar>(src_encoding, src, src_index);
HValue* dst_index = Add<HAdd>(dst_offset, index); HValue* dst_index = AddUncasted<HAdd>(dst_offset, index);
Add<HSeqStringSetChar>(dst_encoding, dst, dst_index, value); Add<HSeqStringSetChar>(dst_encoding, dst, dst_index, value);
} }
loop.EndBody(); loop.EndBody();
@ -1758,11 +1758,11 @@ HValue* HGraphBuilder::BuildUncheckedStringAdd(HValue* left,
HObjectAccess::ForMapInstanceType()); HObjectAccess::ForMapInstanceType());
// Compute difference of instance types. // Compute difference of instance types.
HValue* xored_instance_types = Add<HBitwise>( HValue* xored_instance_types = AddUncasted<HBitwise>(
Token::BIT_XOR, left_instance_type, right_instance_type); Token::BIT_XOR, left_instance_type, right_instance_type);
// Compute the length of the resulting string. // Compute the length of the resulting string.
HValue* length = Add<HAdd>(left_length, right_length); HValue* length = AddUncasted<HAdd>(left_length, right_length);
// Check if we should create a cons string. // Check if we should create a cons string.
IfBuilder if_createcons(this); IfBuilder if_createcons(this);
@ -1779,7 +1779,7 @@ HValue* HGraphBuilder::BuildUncheckedStringAdd(HValue* left,
CONS_STRING_TYPE); CONS_STRING_TYPE);
// Compute the intersection of instance types. // Compute the intersection of instance types.
HValue* anded_instance_types = Add<HBitwise>( HValue* anded_instance_types = AddUncasted<HBitwise>(
Token::BIT_AND, left_instance_type, right_instance_type); Token::BIT_AND, left_instance_type, right_instance_type);
// We create a one-byte cons string if // We create a one-byte cons string if
@ -1795,7 +1795,7 @@ HValue* HGraphBuilder::BuildUncheckedStringAdd(HValue* left,
STATIC_ASSERT(kOneByteStringTag != 0); STATIC_ASSERT(kOneByteStringTag != 0);
STATIC_ASSERT(kOneByteDataHintMask != 0); STATIC_ASSERT(kOneByteDataHintMask != 0);
if_onebyte.If<HCompareNumericAndBranch>( if_onebyte.If<HCompareNumericAndBranch>(
Add<HBitwise>( AddUncasted<HBitwise>(
Token::BIT_AND, anded_instance_types, Token::BIT_AND, anded_instance_types,
Add<HConstant>(static_cast<int32_t>( Add<HConstant>(static_cast<int32_t>(
kStringEncodingMask | kOneByteDataHintMask))), kStringEncodingMask | kOneByteDataHintMask))),
@ -1805,7 +1805,7 @@ HValue* HGraphBuilder::BuildUncheckedStringAdd(HValue* left,
kOneByteDataHintTag != 0 && kOneByteDataHintTag != 0 &&
kOneByteDataHintTag != kOneByteStringTag); kOneByteDataHintTag != kOneByteStringTag);
if_onebyte.If<HCompareNumericAndBranch>( if_onebyte.If<HCompareNumericAndBranch>(
Add<HBitwise>( AddUncasted<HBitwise>(
Token::BIT_AND, xored_instance_types, Token::BIT_AND, xored_instance_types,
Add<HConstant>(static_cast<int32_t>( Add<HConstant>(static_cast<int32_t>(
kOneByteStringTag | kOneByteDataHintTag))), kOneByteStringTag | kOneByteDataHintTag))),
@ -1839,21 +1839,21 @@ HValue* HGraphBuilder::BuildUncheckedStringAdd(HValue* left,
if_createcons.Else(); if_createcons.Else();
{ {
// Compute union of instance types. // Compute union of instance types.
HValue* ored_instance_types = Add<HBitwise>( HValue* ored_instance_types = AddUncasted<HBitwise>(
Token::BIT_OR, left_instance_type, right_instance_type); Token::BIT_OR, left_instance_type, right_instance_type);
// Check if both strings have the same encoding and both are // Check if both strings have the same encoding and both are
// sequential. // sequential.
IfBuilder if_sameencodingandsequential(this); IfBuilder if_sameencodingandsequential(this);
if_sameencodingandsequential.If<HCompareNumericAndBranch>( if_sameencodingandsequential.If<HCompareNumericAndBranch>(
Add<HBitwise>( AddUncasted<HBitwise>(
Token::BIT_AND, xored_instance_types, Token::BIT_AND, xored_instance_types,
Add<HConstant>(static_cast<int32_t>(kStringEncodingMask))), Add<HConstant>(static_cast<int32_t>(kStringEncodingMask))),
graph()->GetConstant0(), Token::EQ); graph()->GetConstant0(), Token::EQ);
if_sameencodingandsequential.And(); if_sameencodingandsequential.And();
STATIC_ASSERT(kSeqStringTag == 0); STATIC_ASSERT(kSeqStringTag == 0);
if_sameencodingandsequential.If<HCompareNumericAndBranch>( if_sameencodingandsequential.If<HCompareNumericAndBranch>(
Add<HBitwise>( AddUncasted<HBitwise>(
Token::BIT_AND, ored_instance_types, Token::BIT_AND, ored_instance_types,
Add<HConstant>(static_cast<int32_t>(kStringRepresentationMask))), Add<HConstant>(static_cast<int32_t>(kStringRepresentationMask))),
graph()->GetConstant0(), Token::EQ); graph()->GetConstant0(), Token::EQ);
@ -1863,7 +1863,7 @@ HValue* HGraphBuilder::BuildUncheckedStringAdd(HValue* left,
IfBuilder if_onebyte(this); IfBuilder if_onebyte(this);
STATIC_ASSERT(kOneByteStringTag != 0); STATIC_ASSERT(kOneByteStringTag != 0);
if_onebyte.If<HCompareNumericAndBranch>( if_onebyte.If<HCompareNumericAndBranch>(
Add<HBitwise>( AddUncasted<HBitwise>(
Token::BIT_AND, ored_instance_types, Token::BIT_AND, ored_instance_types,
Add<HConstant>(static_cast<int32_t>(kStringEncodingMask))), Add<HConstant>(static_cast<int32_t>(kStringEncodingMask))),
graph()->GetConstant0(), Token::NE); graph()->GetConstant0(), Token::NE);
@ -2186,11 +2186,11 @@ HValue* HGraphBuilder::BuildAllocateElements(ElementsKind kind,
} }
HConstant* elements_size_value = Add<HConstant>(elements_size); HConstant* elements_size_value = Add<HConstant>(elements_size);
HValue* mul = Add<HMul>(capacity, elements_size_value); HValue* mul = AddUncasted<HMul>(capacity, elements_size_value);
mul->ClearFlag(HValue::kCanOverflow); mul->ClearFlag(HValue::kCanOverflow);
HConstant* header_size = Add<HConstant>(FixedArray::kHeaderSize); HConstant* header_size = Add<HConstant>(FixedArray::kHeaderSize);
HValue* total_size = Add<HAdd>(mul, header_size); HValue* total_size = AddUncasted<HAdd>(mul, header_size);
total_size->ClearFlag(HValue::kCanOverflow); total_size->ClearFlag(HValue::kCanOverflow);
return Add<HAllocate>(total_size, HType::JSArray(), return Add<HAllocate>(total_size, HType::JSArray(),
@ -4518,7 +4518,7 @@ void HOptimizedGraphBuilder::VisitForInStatement(ForInStatement* stmt) {
set_current_block(body_exit); set_current_block(body_exit);
HValue* current_index = Pop(); HValue* current_index = Pop();
Push(Add<HAdd>(current_index, graph()->GetConstant1())); Push(AddUncasted<HAdd>(current_index, graph()->GetConstant1()));
body_exit = current_block(); body_exit = current_block();
} }