Index: src/objects-inl.h |
diff --git a/src/objects-inl.h b/src/objects-inl.h |
index 5ad593bfa6630d6fe0df69e71a15f6d8efe4a722..7b1a0904c704b4440f0199aaa58e9460dd6fb89e 100644 |
--- a/src/objects-inl.h |
+++ b/src/objects-inl.h |
@@ -2218,7 +2218,7 @@ int JSObject::GetHeaderSize(InstanceType type) { |
case JS_STRING_ITERATOR_TYPE: |
return JSStringIterator::kSize; |
case JS_MODULE_NAMESPACE_TYPE: |
- return JSModuleNamespace::kSize; |
+ return JSModuleNamespace::kHeaderSize; |
default: |
if (type >= FIRST_ARRAY_ITERATOR_TYPE && |
type <= LAST_ARRAY_ITERATOR_TYPE) { |
@@ -2337,7 +2337,7 @@ void JSObject::FastPropertyAtPut(FieldIndex index, Object* value) { |
void JSObject::WriteToField(int descriptor, PropertyDetails details, |
Object* value) { |
- DCHECK(details.type() == DATA); |
+ DCHECK(details.location() == kField); |
DisallowHeapAllocation no_gc; |
FieldIndex index = FieldIndex::ForDescriptor(map(), descriptor); |
if (details.representation().IsDouble()) { |
@@ -3208,14 +3208,6 @@ void DescriptorArray::SwapSortedKeys(int first, int second) { |
} |
-PropertyType DescriptorArray::Entry::type() { return descs_->GetType(index_); } |
- |
- |
-Object* DescriptorArray::Entry::GetCallbackObject() { |
- return descs_->GetValue(index_); |
-} |
- |
- |
int HashTableBase::NumberOfElements() { |
return Smi::cast(get(kNumberOfElementsIndex))->value(); |
} |
@@ -4921,7 +4913,9 @@ bool Map::CanBeDeprecated() { |
if (details.representation().IsSmi()) return true; |
if (details.representation().IsDouble()) return true; |
if (details.representation().IsHeapObject()) return true; |
- if (details.type() == DATA_CONSTANT) return true; |
+ if (details.kind() == kData && details.location() == kDescriptor) { |
+ return true; |
+ } |
} |
return false; |
} |
@@ -5645,7 +5639,7 @@ void Map::AppendDescriptor(Descriptor* desc) { |
// it should never try to (otherwise, layout descriptor must be updated too). |
#ifdef DEBUG |
PropertyDetails details = desc->GetDetails(); |
- CHECK(details.type() != DATA || !details.representation().IsDouble()); |
+ CHECK(details.location() != kField || !details.representation().IsDouble()); |
#endif |
} |