Skip to content

V
V8
Commit c500efe1 authored by hpayer@chromium.org's avatar hpayer@chromium.org
Browse files
Options

Force inlining of object visiting functions. 

BUG=

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13489 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 1d124f0a
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
src/objects-visiting.h
View file @ c500efe1
...@@ -221,7 +221,7 @@ class BodyVisitorBase : public AllStatic { ...@@ -221,7 +221,7 @@ class BodyVisitorBase : public AllStatic {
template<typename StaticVisitor, typename BodyDescriptor, typename ReturnType> template<typename StaticVisitor, typename BodyDescriptor, typename ReturnType>
class FlexibleBodyVisitor : public BodyVisitorBase<StaticVisitor> { class FlexibleBodyVisitor : public BodyVisitorBase<StaticVisitor> {
public: public:
static inline ReturnType Visit(Map* map, HeapObject* object) { INLINE(static ReturnType Visit(Map* map, HeapObject* object)) {
int object_size = BodyDescriptor::SizeOf(map, object); int object_size = BodyDescriptor::SizeOf(map, object);
BodyVisitorBase<StaticVisitor>::IteratePointers( BodyVisitorBase<StaticVisitor>::IteratePointers(
map->GetHeap(), map->GetHeap(),
...@@ -247,7 +247,7 @@ class FlexibleBodyVisitor : public BodyVisitorBase<StaticVisitor> { ...@@ -247,7 +247,7 @@ class FlexibleBodyVisitor : public BodyVisitorBase<StaticVisitor> {
template<typename StaticVisitor, typename BodyDescriptor, typename ReturnType> template<typename StaticVisitor, typename BodyDescriptor, typename ReturnType>
class FixedBodyVisitor : public BodyVisitorBase<StaticVisitor> { class FixedBodyVisitor : public BodyVisitorBase<StaticVisitor> {
public: public:
static inline ReturnType Visit(Map* map, HeapObject* object) { INLINE(static ReturnType Visit(Map* map, HeapObject* object)) {
BodyVisitorBase<StaticVisitor>::IteratePointers( BodyVisitorBase<StaticVisitor>::IteratePointers(
map->GetHeap(), map->GetHeap(),
object, object,
...@@ -279,16 +279,16 @@ class StaticNewSpaceVisitor : public StaticVisitorBase { ...@@ -279,16 +279,16 @@ class StaticNewSpaceVisitor : public StaticVisitorBase {
public: public:
static void Initialize(); static void Initialize();
static inline int IterateBody(Map* map, HeapObject* obj) { INLINE(static int IterateBody(Map* map, HeapObject* obj)) {
return table_.GetVisitor(map)(map, obj); return table_.GetVisitor(map)(map, obj);
} }
static inline void VisitPointers(Heap* heap, Object** start, Object** end) { INLINE(static void VisitPointers(Heap* heap, Object** start, Object** end)) {
for (Object** p = start; p < end; p++) StaticVisitor::VisitPointer(heap, p); for (Object** p = start; p < end; p++) StaticVisitor::VisitPointer(heap, p);
} }
private: private:
static inline int VisitJSFunction(Map* map, HeapObject* object) { INLINE(static int VisitJSFunction(Map* map, HeapObject* object)) {
Heap* heap = map->GetHeap(); Heap* heap = map->GetHeap();
VisitPointers(heap, VisitPointers(heap,
HeapObject::RawField(object, JSFunction::kPropertiesOffset), HeapObject::RawField(object, JSFunction::kPropertiesOffset),
...@@ -305,30 +305,30 @@ class StaticNewSpaceVisitor : public StaticVisitorBase { ...@@ -305,30 +305,30 @@ class StaticNewSpaceVisitor : public StaticVisitorBase {
return JSFunction::kSize; return JSFunction::kSize;
} }
static inline int VisitByteArray(Map* map, HeapObject* object) { INLINE(static int VisitByteArray(Map* map, HeapObject* object)) {
return reinterpret_cast<ByteArray*>(object)->ByteArraySize(); return reinterpret_cast<ByteArray*>(object)->ByteArraySize();
} }
static inline int VisitFixedDoubleArray(Map* map, HeapObject* object) { INLINE(static int VisitFixedDoubleArray(Map* map, HeapObject* object)) {
int length = reinterpret_cast<FixedDoubleArray*>(object)->length(); int length = reinterpret_cast<FixedDoubleArray*>(object)->length();
return FixedDoubleArray::SizeFor(length); return FixedDoubleArray::SizeFor(length);
} }
static inline int VisitJSObject(Map* map, HeapObject* object) { INLINE(static int VisitJSObject(Map* map, HeapObject* object)) {
return JSObjectVisitor::Visit(map, object); return JSObjectVisitor::Visit(map, object);
} }
static inline int VisitSeqOneByteString(Map* map, HeapObject* object) { INLINE(static int VisitSeqOneByteString(Map* map, HeapObject* object)) {
return SeqOneByteString::cast(object)-> return SeqOneByteString::cast(object)->
SeqOneByteStringSize(map->instance_type()); SeqOneByteStringSize(map->instance_type());
} }
static inline int VisitSeqTwoByteString(Map* map, HeapObject* object) { INLINE(static int VisitSeqTwoByteString(Map* map, HeapObject* object)) {
return SeqTwoByteString::cast(object)-> return SeqTwoByteString::cast(object)->
SeqTwoByteStringSize(map->instance_type()); SeqTwoByteStringSize(map->instance_type());
} }
static inline int VisitFreeSpace(Map* map, HeapObject* object) { INLINE(static int VisitFreeSpace(Map* map, HeapObject* object)) {
return FreeSpace::cast(object)->Size(); return FreeSpace::cast(object)->Size();
} }
...@@ -339,7 +339,7 @@ class StaticNewSpaceVisitor : public StaticVisitorBase { ...@@ -339,7 +339,7 @@ class StaticNewSpaceVisitor : public StaticVisitorBase {
return object_size; return object_size;
} }
static inline int Visit(Map* map, HeapObject* object) { INLINE(static int Visit(Map* map, HeapObject* object)) {
return map->instance_size(); return map->instance_size();
} }
}; };
...@@ -382,18 +382,18 @@ class StaticMarkingVisitor : public StaticVisitorBase { ...@@ -382,18 +382,18 @@ class StaticMarkingVisitor : public StaticVisitorBase {
public: public:
static void Initialize(); static void Initialize();
static inline void IterateBody(Map* map, HeapObject* obj) { INLINE(static void IterateBody(Map* map, HeapObject* obj)) {
table_.GetVisitor(map)(map, obj); table_.GetVisitor(map)(map, obj);
} }
static inline void VisitCodeEntry(Heap* heap, Address entry_address); INLINE(static void VisitCodeEntry(Heap* heap, Address entry_address));
static inline void VisitEmbeddedPointer(Heap* heap, RelocInfo* rinfo); INLINE(static void VisitEmbeddedPointer(Heap* heap, RelocInfo* rinfo));
static inline void VisitGlobalPropertyCell(Heap* heap, RelocInfo* rinfo); INLINE(static void VisitGlobalPropertyCell(Heap* heap, RelocInfo* rinfo));
static inline void VisitDebugTarget(Heap* heap, RelocInfo* rinfo); INLINE(static void VisitDebugTarget(Heap* heap, RelocInfo* rinfo));
static inline void VisitCodeTarget(Heap* heap, RelocInfo* rinfo); INLINE(static void VisitCodeTarget(Heap* heap, RelocInfo* rinfo));
static inline void VisitCodeAgeSequence(Heap* heap, RelocInfo* rinfo); INLINE(static void VisitCodeAgeSequence(Heap* heap, RelocInfo* rinfo));
static inline void VisitExternalReference(RelocInfo* rinfo) { } INLINE(static void VisitExternalReference(RelocInfo* rinfo)) { }
static inline void VisitRuntimeEntry(RelocInfo* rinfo) { } INLINE(static void VisitRuntimeEntry(RelocInfo* rinfo)) { }
// TODO(mstarzinger): This should be made protected once refactoring is done. // TODO(mstarzinger): This should be made protected once refactoring is done.
// Mark non-optimize code for functions inlined into the given optimized // Mark non-optimize code for functions inlined into the given optimized
...@@ -401,12 +401,12 @@ class StaticMarkingVisitor : public StaticVisitorBase { ...@@ -401,12 +401,12 @@ class StaticMarkingVisitor : public StaticVisitorBase {
static void MarkInlinedFunctionsCode(Heap* heap, Code* code); static void MarkInlinedFunctionsCode(Heap* heap, Code* code);
protected: protected:
static inline void VisitMap(Map* map, HeapObject* object); INLINE(static void VisitMap(Map* map, HeapObject* object));
static inline void VisitCode(Map* map, HeapObject* object); INLINE(static void VisitCode(Map* map, HeapObject* object));
static inline void VisitSharedFunctionInfo(Map* map, HeapObject* object); INLINE(static void VisitSharedFunctionInfo(Map* map, HeapObject* object));
static inline void VisitJSFunction(Map* map, HeapObject* object); INLINE(static void VisitJSFunction(Map* map, HeapObject* object));
static inline void VisitJSRegExp(Map* map, HeapObject* object); INLINE(static void VisitJSRegExp(Map* map, HeapObject* object));
static inline void VisitNativeContext(Map* map, HeapObject* object); INLINE(static void VisitNativeContext(Map* map, HeapObject* object));
// Mark pointers in a Map and its TransitionArray together, possibly // Mark pointers in a Map and its TransitionArray together, possibly
// treating transitions or back pointers weak. // treating transitions or back pointers weak.
...@@ -414,8 +414,8 @@ class StaticMarkingVisitor : public StaticVisitorBase { ...@@ -414,8 +414,8 @@ class StaticMarkingVisitor : public StaticVisitorBase {
static void MarkTransitionArray(Heap* heap, TransitionArray* transitions); static void MarkTransitionArray(Heap* heap, TransitionArray* transitions);
// Code flushing support. // Code flushing support.
static inline bool IsFlushable(Heap* heap, JSFunction* function); INLINE(static bool IsFlushable(Heap* heap, JSFunction* function));
static inline bool IsFlushable(Heap* heap, SharedFunctionInfo* shared_info); INLINE(static bool IsFlushable(Heap* heap, SharedFunctionInfo* shared_info));
// Helpers used by code flushing support that visit pointer fields and treat // Helpers used by code flushing support that visit pointer fields and treat
// references to code objects either strongly or weakly. // references to code objects either strongly or weakly.
...@@ -430,7 +430,7 @@ class StaticMarkingVisitor : public StaticVisitorBase { ...@@ -430,7 +430,7 @@ class StaticMarkingVisitor : public StaticVisitorBase {
static inline void VisitSpecialized(Map* map, HeapObject* object) { static inline void VisitSpecialized(Map* map, HeapObject* object) {
} }
static inline void Visit(Map* map, HeapObject* object) { INLINE(static void Visit(Map* map, HeapObject* object)) {
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment