Commit 82a54b38 authored by ishell's avatar ishell Committed by Commit bot

Using override keyword in ObjectVisitor class hierarchy.

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

Cr-Commit-Position: refs/heads/master@{#31819}
parent ca49355a
......@@ -7616,10 +7616,10 @@ class VisitorAdapter : public i::ObjectVisitor {
public:
explicit VisitorAdapter(PersistentHandleVisitor* visitor)
: visitor_(visitor) {}
virtual void VisitPointers(i::Object** start, i::Object** end) {
void VisitPointers(i::Object** start, i::Object** end) override {
UNREACHABLE();
}
virtual void VisitEmbedderReference(i::Object** p, uint16_t class_id) {
void VisitEmbedderReference(i::Object** p, uint16_t class_id) override {
Value* value = ToApi<Value>(i::Handle<i::Object>(p));
visitor_->VisitPersistentHandle(
reinterpret_cast<Persistent<Value>*>(&value), class_id);
......
......@@ -19,7 +19,7 @@ class ContextMeasure : public ObjectVisitor {
int Size() { return size_; }
int Count() { return count_; }
void VisitPointers(Object** start, Object** end);
void VisitPointers(Object** start, Object** end) override;
private:
void MeasureObject(HeapObject* object);
......
......@@ -910,7 +910,7 @@ class ReplacingVisitor : public ObjectVisitor {
: original_(original), substitution_(substitution) {
}
virtual void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** p = start; p < end; p++) {
if (*p == original_) {
*p = substitution_;
......@@ -918,14 +918,14 @@ class ReplacingVisitor : public ObjectVisitor {
}
}
virtual void VisitCodeEntry(Address entry) {
void VisitCodeEntry(Address entry) override {
if (Code::GetObjectFromEntryAddress(entry) == original_) {
Address substitution_entry = substitution_->instruction_start();
Memory::Address_at(entry) = substitution_entry;
}
}
virtual void VisitCodeTarget(RelocInfo* rinfo) {
void VisitCodeTarget(RelocInfo* rinfo) override {
if (RelocInfo::IsCodeTarget(rinfo->rmode()) &&
Code::GetCodeFromTargetAddress(rinfo->target_address()) == original_) {
Address substitution_entry = substitution_->instruction_start();
......@@ -933,9 +933,7 @@ class ReplacingVisitor : public ObjectVisitor {
}
}
virtual void VisitDebugTarget(RelocInfo* rinfo) {
VisitCodeTarget(rinfo);
}
void VisitDebugTarget(RelocInfo* rinfo) override { VisitCodeTarget(rinfo); }
private:
Code* original_;
......
......@@ -1105,7 +1105,7 @@ void Heap::MoveElements(FixedArray* array, int dst_index, int src_index,
// Helper class for verifying the string table.
class StringTableVerifier : public ObjectVisitor {
public:
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
// Visit all HeapObject pointers in [start, end).
for (Object** p = start; p < end; p++) {
if ((*p)->IsHeapObject()) {
......@@ -1465,7 +1465,8 @@ void Heap::MarkCompactPrologue() {
class VerifyNonPointerSpacePointersVisitor : public ObjectVisitor {
public:
explicit VerifyNonPointerSpacePointersVisitor(Heap* heap) : heap_(heap) {}
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** current = start; current < end; current++) {
if ((*current)->IsHeapObject()) {
CHECK(!heap_->InNewSpace(HeapObject::cast(*current)));
......@@ -5408,7 +5409,7 @@ void Heap::FatalProcessOutOfMemory(const char* location, bool take_snapshot) {
class PrintHandleVisitor : public ObjectVisitor {
public:
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** p = start; p < end; p++)
PrintF(" handle %p to %p\n", reinterpret_cast<void*>(p),
reinterpret_cast<void*>(*p));
......@@ -5427,10 +5428,10 @@ void Heap::PrintHandles() {
class CheckHandleCountVisitor : public ObjectVisitor {
public:
CheckHandleCountVisitor() : handle_count_(0) {}
~CheckHandleCountVisitor() {
~CheckHandleCountVisitor() override {
CHECK(handle_count_ < HandleScope::kCheckHandleThreshold);
}
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
handle_count_ += end - start;
}
......@@ -5577,7 +5578,7 @@ class UnreachableObjectsFilter : public HeapObjectsFilter {
public:
MarkingVisitor() : marking_stack_(10) {}
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** p = start; p < end; p++) {
if (!(*p)->IsHeapObject()) continue;
HeapObject* obj = HeapObject::cast(*p);
......@@ -5686,7 +5687,8 @@ Object* const PathTracer::kAnyGlobalObject = NULL;
class PathTracer::MarkVisitor : public ObjectVisitor {
public:
explicit MarkVisitor(PathTracer* tracer) : tracer_(tracer) {}
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
// Scan all HeapObject pointers in [start, end)
for (Object** p = start; !tracer_->found() && (p < end); p++) {
if ((*p)->IsHeapObject()) tracer_->MarkRecursively(p, this);
......@@ -5701,7 +5703,8 @@ class PathTracer::MarkVisitor : public ObjectVisitor {
class PathTracer::UnmarkVisitor : public ObjectVisitor {
public:
explicit UnmarkVisitor(PathTracer* tracer) : tracer_(tracer) {}
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
// Scan all HeapObject pointers in [start, end)
for (Object** p = start; p < end; p++) {
if ((*p)->IsHeapObject()) tracer_->UnmarkRecursively(p, this);
......
......@@ -2428,14 +2428,14 @@ class AlwaysAllocateScope {
// objects in a heap space but above the allocation pointer.
class VerifyPointersVisitor : public ObjectVisitor {
public:
inline void VisitPointers(Object** start, Object** end);
inline void VisitPointers(Object** start, Object** end) override;
};
// Verify that all objects are Smis.
class VerifySmisVisitor : public ObjectVisitor {
public:
inline void VisitPointers(Object** start, Object** end);
inline void VisitPointers(Object** start, Object** end) override;
};
......@@ -2696,7 +2696,7 @@ class PathTracer : public ObjectVisitor {
object_stack_(20),
no_allocation() {}
virtual void VisitPointers(Object** start, Object** end);
void VisitPointers(Object** start, Object** end) override;
void Reset();
void TracePathFrom(Object** root);
......
......@@ -349,9 +349,9 @@ class IncrementalMarkingRootMarkingVisitor : public ObjectVisitor {
IncrementalMarking* incremental_marking)
: heap_(incremental_marking->heap()) {}
void VisitPointer(Object** p) { MarkObjectByPointer(p); }
void VisitPointer(Object** p) override { MarkObjectByPointer(p); }
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** p = start; p < end; p++) MarkObjectByPointer(p);
}
......
......@@ -74,7 +74,7 @@ class VerifyMarkingVisitor : public ObjectVisitor {
public:
explicit VerifyMarkingVisitor(Heap* heap) : heap_(heap) {}
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** current = start; current < end; current++) {
if ((*current)->IsHeapObject()) {
HeapObject* object = HeapObject::cast(*current);
......@@ -83,7 +83,7 @@ class VerifyMarkingVisitor : public ObjectVisitor {
}
}
void VisitEmbeddedPointer(RelocInfo* rinfo) {
void VisitEmbeddedPointer(RelocInfo* rinfo) override {
DCHECK(rinfo->rmode() == RelocInfo::EMBEDDED_OBJECT);
if (!rinfo->host()->IsWeakObject(rinfo->target_object())) {
Object* p = rinfo->target_object();
......@@ -91,7 +91,7 @@ class VerifyMarkingVisitor : public ObjectVisitor {
}
}
void VisitCell(RelocInfo* rinfo) {
void VisitCell(RelocInfo* rinfo) override {
Code* code = rinfo->host();
DCHECK(rinfo->rmode() == RelocInfo::CELL);
if (!code->IsWeakObject(rinfo->target_cell())) {
......@@ -168,7 +168,7 @@ static void VerifyMarking(Heap* heap) {
class VerifyEvacuationVisitor : public ObjectVisitor {
public:
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** current = start; current < end; current++) {
if ((*current)->IsHeapObject()) {
HeapObject* object = HeapObject::cast(*current);
......@@ -1428,11 +1428,11 @@ class SharedFunctionInfoMarkingVisitor : public ObjectVisitor {
explicit SharedFunctionInfoMarkingVisitor(MarkCompactCollector* collector)
: collector_(collector) {}
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** p = start; p < end; p++) VisitPointer(p);
}
void VisitPointer(Object** slot) {
void VisitPointer(Object** slot) override {
Object* obj = *slot;
if (obj->IsSharedFunctionInfo()) {
SharedFunctionInfo* shared = reinterpret_cast<SharedFunctionInfo*>(obj);
......@@ -1502,15 +1502,15 @@ class RootMarkingVisitor : public ObjectVisitor {
explicit RootMarkingVisitor(Heap* heap)
: collector_(heap->mark_compact_collector()) {}
void VisitPointer(Object** p) { MarkObjectByPointer(p); }
void VisitPointer(Object** p) override { MarkObjectByPointer(p); }
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** p = start; p < end; p++) MarkObjectByPointer(p);
}
// Skip the weak next code link in a code object, which is visited in
// ProcessTopOptimizedFrame.
void VisitNextCodeLink(Object** p) {}
void VisitNextCodeLink(Object** p) override {}
private:
void MarkObjectByPointer(Object** p) {
......@@ -1545,7 +1545,7 @@ class StringTableCleaner : public ObjectVisitor {
public:
explicit StringTableCleaner(Heap* heap) : heap_(heap), pointers_removed_(0) {}
virtual void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
// Visit all HeapObject pointers in [start, end).
for (Object** p = start; p < end; p++) {
Object* o = *p;
......@@ -2873,13 +2873,13 @@ class PointersUpdatingVisitor : public ObjectVisitor {
public:
explicit PointersUpdatingVisitor(Heap* heap) : heap_(heap) {}
void VisitPointer(Object** p) { UpdatePointer(p); }
void VisitPointer(Object** p) override { UpdatePointer(p); }
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** p = start; p < end; p++) UpdatePointer(p);
}
void VisitCell(RelocInfo* rinfo) {
void VisitCell(RelocInfo* rinfo) override {
DCHECK(rinfo->rmode() == RelocInfo::CELL);
Object* cell = rinfo->target_cell();
Object* old_cell = cell;
......@@ -2889,7 +2889,7 @@ class PointersUpdatingVisitor : public ObjectVisitor {
}
}
void VisitEmbeddedPointer(RelocInfo* rinfo) {
void VisitEmbeddedPointer(RelocInfo* rinfo) override {
DCHECK(rinfo->rmode() == RelocInfo::EMBEDDED_OBJECT);
Object* target = rinfo->target_object();
Object* old_target = target;
......@@ -2901,7 +2901,7 @@ class PointersUpdatingVisitor : public ObjectVisitor {
}
}
void VisitCodeTarget(RelocInfo* rinfo) {
void VisitCodeTarget(RelocInfo* rinfo) override {
DCHECK(RelocInfo::IsCodeTarget(rinfo->rmode()));
Object* target = Code::GetCodeFromTargetAddress(rinfo->target_address());
Object* old_target = target;
......@@ -2911,7 +2911,7 @@ class PointersUpdatingVisitor : public ObjectVisitor {
}
}
void VisitCodeAgeSequence(RelocInfo* rinfo) {
void VisitCodeAgeSequence(RelocInfo* rinfo) override {
DCHECK(RelocInfo::IsCodeAgeSequence(rinfo->rmode()));
Object* stub = rinfo->code_age_stub();
DCHECK(stub != NULL);
......@@ -2921,7 +2921,7 @@ class PointersUpdatingVisitor : public ObjectVisitor {
}
}
void VisitDebugTarget(RelocInfo* rinfo) {
void VisitDebugTarget(RelocInfo* rinfo) override {
DCHECK(RelocInfo::IsDebugBreakSlot(rinfo->rmode()) &&
rinfo->IsPatchedDebugBreakSlotSequence());
Object* target =
......
......@@ -48,8 +48,8 @@ class ScavengeVisitor : public ObjectVisitor {
public:
explicit ScavengeVisitor(Heap* heap) : heap_(heap) {}
void VisitPointer(Object** p);
void VisitPointers(Object** start, Object** end);
void VisitPointer(Object** p) override;
void VisitPointers(Object** start, Object** end) override;
private:
inline void ScavengePointer(Object** p);
......
......@@ -995,12 +995,12 @@ class IndexedReferencesExtractor : public ObjectVisitor {
parent_(parent),
next_index_(0) {
}
void VisitCodeEntry(Address entry_address) {
void VisitCodeEntry(Address entry_address) override {
Code* code = Code::cast(Code::GetObjectFromEntryAddress(entry_address));
generator_->SetInternalReference(parent_obj_, parent_, "code", code);
generator_->TagCodeObject(code);
}
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** p = start; p < end; p++) {
++next_index_;
if (CheckVisitedAndUnmark(p)) continue;
......@@ -1769,7 +1769,7 @@ class RootsReferencesExtractor : public ObjectVisitor {
heap_(heap) {
}
void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
if (collecting_all_references_) {
for (Object** p = start; p < end; p++) all_references_.Add(*p);
} else {
......@@ -1802,7 +1802,7 @@ class RootsReferencesExtractor : public ObjectVisitor {
}
}
void Synchronize(VisitorSynchronization::SyncTag tag) {
void Synchronize(VisitorSynchronization::SyncTag tag) override {
if (collecting_all_references_ &&
previous_reference_count_ != all_references_.length()) {
previous_reference_count_ = all_references_.length();
......@@ -2188,7 +2188,7 @@ void V8HeapExplorer::MarkAsWeakContainer(Object* object) {
class GlobalObjectsEnumerator : public ObjectVisitor {
public:
virtual void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** p = start; p < end; p++) {
if ((*p)->IsNativeContext()) {
Context* context = Context::cast(*p);
......@@ -2241,11 +2241,9 @@ class GlobalHandlesExtractor : public ObjectVisitor {
public:
explicit GlobalHandlesExtractor(NativeObjectsExplorer* explorer)
: explorer_(explorer) {}
virtual ~GlobalHandlesExtractor() {}
virtual void VisitPointers(Object** start, Object** end) {
UNREACHABLE();
}
virtual void VisitEmbedderReference(Object** p, uint16_t class_id) {
~GlobalHandlesExtractor() override {}
void VisitPointers(Object** start, Object** end) override { UNREACHABLE(); }
void VisitEmbedderReference(Object** p, uint16_t class_id) override {
explorer_->VisitSubtreeWrapper(p, class_id);
}
private:
......
......@@ -1367,21 +1367,21 @@ class Serializer::ObjectSerializer : public ObjectVisitor {
code_has_been_output_(false) {}
void Serialize();
void SerializeDeferred();
void VisitPointers(Object** start, Object** end);
void VisitEmbeddedPointer(RelocInfo* target);
void VisitExternalReference(Address* p);
void VisitExternalReference(RelocInfo* rinfo);
void VisitInternalReference(RelocInfo* rinfo);
void VisitCodeTarget(RelocInfo* target);
void VisitCodeEntry(Address entry_address);
void VisitCell(RelocInfo* rinfo);
void VisitRuntimeEntry(RelocInfo* reloc);
void VisitPointers(Object** start, Object** end) override;
void VisitEmbeddedPointer(RelocInfo* target) override;
void VisitExternalReference(Address* p) override;
void VisitExternalReference(RelocInfo* rinfo) override;
void VisitInternalReference(RelocInfo* rinfo) override;
void VisitCodeTarget(RelocInfo* target) override;
void VisitCodeEntry(Address entry_address) override;
void VisitCell(RelocInfo* rinfo) override;
void VisitRuntimeEntry(RelocInfo* reloc) override;
// Used for seralizing the external strings that hold the natives source.
void VisitExternalOneByteString(
v8::String::ExternalOneByteStringResource** resource);
v8::String::ExternalOneByteStringResource** resource) override;
// We can't serialize a heap with external two byte strings.
void VisitExternalTwoByteString(
v8::String::ExternalStringResource** resource) {
v8::String::ExternalStringResource** resource) override {
UNREACHABLE();
}
......
......@@ -75,7 +75,7 @@ class TestRetainedObjectInfo : public v8::RetainedObjectInfo {
class TestObjectVisitor : public ObjectVisitor {
public:
virtual void VisitPointers(Object** start, Object** end) {
void VisitPointers(Object** start, Object** end) override {
for (Object** o = start; o != end; ++o)
visited.Add(*o);
}
......
......@@ -4475,7 +4475,7 @@ TEST(LargeObjectSlotRecording) {
class DummyVisitor : public ObjectVisitor {
public:
void VisitPointers(Object** start, Object** end) { }
void VisitPointers(Object** start, Object** end) override {}
};
......
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