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

Unified Diff: src/objects-inl.h

Issue 699613004: Revert "In-object double fields unboxing (for 64-bit only)." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « src/objects-debug.cc ('k') | src/objects-printer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/objects-inl.h
diff --git a/src/objects-inl.h b/src/objects-inl.h
index f5498151b07a04851d44069d00742a97abc6c352..40ce81a9b7bbee62fe31f22d273c00b82062b045 100644
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -26,7 +26,6 @@
#include "src/heap/spaces.h"
#include "src/heap/store-buffer.h"
#include "src/isolate.h"
-#include "src/layout-descriptor-inl.h"
#include "src/lookup.h"
#include "src/objects.h"
#include "src/property.h"
@@ -57,14 +56,6 @@ PropertyDetails PropertyDetails::AsDeleted() const {
}
-int PropertyDetails::field_width_in_words() const {
- DCHECK(type() == FIELD);
- if (!FLAG_unbox_double_fields) return 1;
- if (kDoubleSize == kPointerSize) return 1;
- return representation().IsDouble() ? kDoubleSize / kPointerSize : 1;
-}
-
-
#define TYPE_CHECKER(type, instancetype) \
bool Object::Is##type() const { \
return Object::IsHeapObject() && \
@@ -713,11 +704,6 @@ bool Object::IsDescriptorArray() const {
}
-bool Object::IsLayoutDescriptor() const {
- return IsSmi() || IsFixedTypedArrayBase();
-}
-
-
bool Object::IsTransitionArray() const {
return IsFixedArray();
}
@@ -2084,24 +2070,10 @@ void JSObject::SetInternalField(int index, Smi* value) {
}
-bool JSObject::IsUnboxedDoubleField(FieldIndex index) {
- if (!FLAG_unbox_double_fields) return false;
- return map()->IsUnboxedDoubleField(index);
-}
-
-
-bool Map::IsUnboxedDoubleField(FieldIndex index) {
- if (!FLAG_unbox_double_fields) return false;
- if (index.is_hidden_field() || !index.is_inobject()) return false;
- return !layout_descriptor()->IsTagged(index.property_index());
-}
-
-
// Access fast-case object properties at index. The use of these routines
// is needed to correctly distinguish between properties stored in-object and
// properties stored in the properties array.
Object* JSObject::RawFastPropertyAt(FieldIndex index) {
- DCHECK(!IsUnboxedDoubleField(index));
if (index.is_inobject()) {
return READ_FIELD(this, index.offset());
} else {
@@ -2110,13 +2082,7 @@ Object* JSObject::RawFastPropertyAt(FieldIndex index) {
}
-double JSObject::RawFastDoublePropertyAt(FieldIndex index) {
- DCHECK(IsUnboxedDoubleField(index));
- return READ_DOUBLE_FIELD(this, index.offset());
-}
-
-
-void JSObject::RawFastPropertyAtPut(FieldIndex index, Object* value) {
+void JSObject::FastPropertyAtPut(FieldIndex index, Object* value) {
if (index.is_inobject()) {
int offset = index.offset();
WRITE_FIELD(this, offset, value);
@@ -2127,21 +2093,6 @@ void JSObject::RawFastPropertyAtPut(FieldIndex index, Object* value) {
}
-void JSObject::RawFastDoublePropertyAtPut(FieldIndex index, double value) {
- WRITE_DOUBLE_FIELD(this, index.offset(), value);
-}
-
-
-void JSObject::FastPropertyAtPut(FieldIndex index, Object* value) {
- if (IsUnboxedDoubleField(index)) {
- DCHECK(value->IsMutableHeapNumber());
- RawFastDoublePropertyAtPut(index, HeapNumber::cast(value)->value());
- } else {
- RawFastPropertyAtPut(index, value);
- }
-}
-
-
int JSObject::GetInObjectPropertyOffset(int index) {
return map()->GetInObjectPropertyOffset(index);
}
@@ -3160,7 +3111,8 @@ void DescriptorArray::Set(int descriptor_number,
NoIncrementalWriteBarrierSet(this,
ToValueIndex(descriptor_number),
*desc->GetValue());
- NoIncrementalWriteBarrierSet(this, ToDetailsIndex(descriptor_number),
+ NoIncrementalWriteBarrierSet(this,
+ ToDetailsIndex(descriptor_number),
desc->GetDetails().AsSmi());
}
@@ -3335,7 +3287,6 @@ CAST_ACCESSOR(JSTypedArray)
CAST_ACCESSOR(JSValue)
CAST_ACCESSOR(JSWeakMap)
CAST_ACCESSOR(JSWeakSet)
-CAST_ACCESSOR(LayoutDescriptor)
CAST_ACCESSOR(Map)
CAST_ACCESSOR(MapCache)
CAST_ACCESSOR(Name)
@@ -4378,14 +4329,6 @@ int Map::GetInObjectPropertyOffset(int index) {
}
-Handle<Map> Map::CopyInstallDescriptorsForTesting(
- Handle<Map> map, int new_descriptor, Handle<DescriptorArray> descriptors,
- Handle<LayoutDescriptor> layout_descriptor) {
- return CopyInstallDescriptors(map, new_descriptor, descriptors,
- layout_descriptor);
-}
-
-
int HeapObject::SizeFromMap(Map* map) {
int instance_size = map->instance_size();
if (instance_size != kVariableSizeSentinel) return instance_size;
@@ -5231,41 +5174,14 @@ static void EnsureHasTransitionArray(Handle<Map> map) {
}
-LayoutDescriptor* Map::layout_descriptor_gc_safe() {
- Object* layout_desc = READ_FIELD(this, kLayoutDecriptorOffset);
- return LayoutDescriptor::cast_gc_safe(layout_desc);
-}
-
-
-void Map::UpdateDescriptors(DescriptorArray* descriptors,
- LayoutDescriptor* layout_desc) {
- set_instance_descriptors(descriptors);
- if (FLAG_unbox_double_fields) {
- if (layout_descriptor()->IsSlowLayout()) {
- set_layout_descriptor(layout_desc);
- }
- SLOW_DCHECK(layout_descriptor()->IsConsistentWithMap(this));
- DCHECK(visitor_id() == StaticVisitorBase::GetVisitorId(this));
- }
-}
-
-
-void Map::InitializeDescriptors(DescriptorArray* descriptors,
- LayoutDescriptor* layout_desc) {
+void Map::InitializeDescriptors(DescriptorArray* descriptors) {
int len = descriptors->number_of_descriptors();
set_instance_descriptors(descriptors);
SetNumberOfOwnDescriptors(len);
-
- if (FLAG_unbox_double_fields) {
- set_layout_descriptor(layout_desc);
- SLOW_DCHECK(layout_descriptor()->IsConsistentWithMap(this));
- set_visitor_id(StaticVisitorBase::GetVisitorId(this));
- }
}
ACCESSORS(Map, instance_descriptors, DescriptorArray, kDescriptorsOffset)
-ACCESSORS(Map, layout_descriptor, LayoutDescriptor, kLayoutDecriptorOffset)
void Map::set_bit_field3(uint32_t bits) {
@@ -5281,27 +5197,12 @@ uint32_t Map::bit_field3() {
}
-Handle<LayoutDescriptor> Map::GetLayoutDescriptor() {
- LayoutDescriptor* layout_desc = FLAG_unbox_double_fields
- ? layout_descriptor()
- : LayoutDescriptor::FastPointerLayout();
- return handle(layout_desc, GetIsolate());
-}
-
-
void Map::AppendDescriptor(Descriptor* desc) {
DescriptorArray* descriptors = instance_descriptors();
int number_of_own_descriptors = NumberOfOwnDescriptors();
DCHECK(descriptors->number_of_descriptors() == number_of_own_descriptors);
descriptors->Append(desc);
SetNumberOfOwnDescriptors(number_of_own_descriptors + 1);
-
-// This function does not support appending double field descriptors and
-// it should never try to (otherwise, layout descriptor must be updated too).
-#ifdef DEBUG
- PropertyDetails details = desc->GetDetails();
- CHECK(details.type() != FIELD || !details.representation().IsDouble());
-#endif
}
@@ -7378,37 +7279,12 @@ void ExternalTwoByteString::ExternalTwoByteStringIterateBody() {
}
-static inline void IterateBodyUsingLayoutDescriptor(HeapObject* object,
- int start_offset,
- int end_offset,
- ObjectVisitor* v) {
- DCHECK(FLAG_unbox_double_fields);
- DCHECK(IsAligned(start_offset, kPointerSize) &&
- IsAligned(end_offset, kPointerSize));
-
- InobjectPropertiesHelper helper(object->map());
- DCHECK(!helper.all_fields_tagged());
-
- for (int offset = start_offset; offset < end_offset; offset += kPointerSize) {
- // Visit all tagged fields.
- if (helper.IsTagged(offset)) {
- v->VisitPointer(HeapObject::RawField(object, offset));
- }
- }
-}
-
-
template<int start_offset, int end_offset, int size>
void FixedBodyDescriptor<start_offset, end_offset, size>::IterateBody(
HeapObject* obj,
ObjectVisitor* v) {
- if (!FLAG_unbox_double_fields ||
- obj->map()->layout_descriptor()->IsFastPointerLayout()) {
v->VisitPointers(HeapObject::RawField(obj, start_offset),
HeapObject::RawField(obj, end_offset));
- } else {
- IterateBodyUsingLayoutDescriptor(obj, start_offset, end_offset, v);
- }
}
@@ -7416,13 +7292,8 @@ template<int start_offset>
void FlexibleBodyDescriptor<start_offset>::IterateBody(HeapObject* obj,
int object_size,
ObjectVisitor* v) {
- if (!FLAG_unbox_double_fields ||
- obj->map()->layout_descriptor()->IsFastPointerLayout()) {
- v->VisitPointers(HeapObject::RawField(obj, start_offset),
- HeapObject::RawField(obj, object_size));
- } else {
- IterateBodyUsingLayoutDescriptor(obj, start_offset, object_size, v);
- }
+ v->VisitPointers(HeapObject::RawField(obj, start_offset),
+ HeapObject::RawField(obj, object_size));
}
« no previous file with comments | « src/objects-debug.cc ('k') | src/objects-printer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698