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

Unified Diff: src/heap/scavenger.cc

Issue 2625073002: Revert of Internalize strings in-place (Closed)
Patch Set: Created 3 years, 11 months 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/heap/objects-visiting-inl.h ('k') | src/ia32/code-stubs-ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/heap/scavenger.cc
diff --git a/src/heap/scavenger.cc b/src/heap/scavenger.cc
index 1173bb60c6027dd59a25dd5efc13be71abf08eda..aea41dd552ae06151a6c21ddc3e23cbed346f72c 100644
--- a/src/heap/scavenger.cc
+++ b/src/heap/scavenger.cc
@@ -30,7 +30,6 @@
table_.Register(kVisitSeqOneByteString, &EvacuateSeqOneByteString);
table_.Register(kVisitSeqTwoByteString, &EvacuateSeqTwoByteString);
table_.Register(kVisitShortcutCandidate, &EvacuateShortcutCandidate);
- table_.Register(kVisitThinString, &EvacuateThinString);
table_.Register(kVisitByteArray, &EvacuateByteArray);
table_.Register(kVisitFixedArray, &EvacuateFixedArray);
table_.Register(kVisitFixedDoubleArray, &EvacuateFixedDoubleArray);
@@ -88,12 +87,6 @@
static VisitorDispatchTable<ScavengingCallback>* GetTable() {
return &table_;
- }
-
- static void EvacuateThinStringNoShortcut(Map* map, HeapObject** slot,
- HeapObject* object) {
- EvacuateObject<POINTER_OBJECT, kWordAligned>(map, slot, object,
- ThinString::kSize);
}
private:
@@ -342,22 +335,6 @@
object_size);
}
- static inline void EvacuateThinString(Map* map, HeapObject** slot,
- HeapObject* object) {
- if (marks_handling == IGNORE_MARKS) {
- HeapObject* actual = ThinString::cast(object)->actual();
- *slot = actual;
- // ThinStrings always refer to internalized strings, which are
- // always in old space.
- DCHECK(!map->GetHeap()->InNewSpace(actual));
- object->set_map_word(MapWord::FromForwardingAddress(actual));
- return;
- }
-
- EvacuateObject<POINTER_OBJECT, kWordAligned>(map, slot, object,
- ThinString::kSize);
- }
-
template <ObjectContents object_contents>
class ObjectEvacuationStrategy {
public:
@@ -442,10 +419,6 @@
StaticVisitorBase::kVisitShortcutCandidate,
scavenging_visitors_table_.GetVisitorById(
StaticVisitorBase::kVisitConsString));
- scavenging_visitors_table_.Register(
- StaticVisitorBase::kVisitThinString,
- &ScavengingVisitor<TRANSFER_MARKS, LOGGING_AND_PROFILING_DISABLED>::
- EvacuateThinStringNoShortcut);
}
}
}
« no previous file with comments | « src/heap/objects-visiting-inl.h ('k') | src/ia32/code-stubs-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698