Revision: 20915
Author: ish...@chromium.org
Date: Wed Apr 23 15:43:39 2014 UTC
Log: StringTable::LookupKey() and all callers handlified.
R=yang...@chromium.org
Review URL: https://codereview.chromium.org/249103002
http://code.google.com/p/v8/source/detail?r=20915
Modified:
/branches/bleeding_edge/src/factory.cc
/branches/bleeding_edge/src/factory.h
/branches/bleeding_edge/src/heap.cc
/branches/bleeding_edge/src/heap.h
/branches/bleeding_edge/src/mark-compact.cc
/branches/bleeding_edge/src/objects-inl.h
/branches/bleeding_edge/src/objects.cc
/branches/bleeding_edge/src/objects.h
/branches/bleeding_edge/src/parser.cc
/branches/bleeding_edge/test/cctest/test-api.cc
/branches/bleeding_edge/test/cctest/test-heap.cc
=======================================
--- /branches/bleeding_edge/src/factory.cc Wed Apr 23 07:07:54 2014 UTC
+++ /branches/bleeding_edge/src/factory.cc Wed Apr 23 15:43:39 2014 UTC
@@ -242,9 +242,8 @@
// Internalized strings are created in the old generation (data space).
Handle<String> Factory::InternalizeString(Handle<String> string) {
- CALL_HEAP_FUNCTION(isolate(),
- isolate()->heap()->InternalizeString(*string),
- String);
+ if (string->IsInternalizedString()) return string;
+ return StringTable::LookupString(isolate(), string);
}
@@ -269,9 +268,7 @@
template<class StringTableKey>
Handle<String> Factory::InternalizeStringWithKey(StringTableKey* key) {
- CALL_HEAP_FUNCTION(isolate(),
- isolate()->heap()->InternalizeStringWithKey(key),
- String);
+ return StringTable::LookupKey(isolate(), key);
}
@@ -350,11 +347,27 @@
}
-Handle<String> Factory::LookupSingleCharacterStringFromCode(uint32_t
index) {
- CALL_HEAP_FUNCTION(
- isolate(),
- isolate()->heap()->LookupSingleCharacterStringFromCode(index),
- String);
+Handle<String> Factory::LookupSingleCharacterStringFromCode(uint32_t code)
{
+ if (code <= String::kMaxOneByteCharCodeU) {
+ {
+ DisallowHeapAllocation no_allocation;
+ Object* value = single_character_string_cache()->get(code);
+ if (value != *undefined_value()) {
+ return handle(String::cast(value), isolate());
+ }
+ }
+ uint8_t buffer[1];
+ buffer[0] = static_cast<uint8_t>(code);
+ Handle<String> result =
+ InternalizeOneByteString(Vector<const uint8_t>(buffer, 1));
+ single_character_string_cache()->set(code, *result);
+ return result;
+ }
+ ASSERT(code <= String::kMaxUtf16CodeUnitU);
+
+ Handle<SeqTwoByteString> result =
NewRawTwoByteString(1).ToHandleChecked();
+ result->SeqTwoByteStringSet(0, static_cast<uint16_t>(code));
+ return result;
}
=======================================
--- /branches/bleeding_edge/src/factory.h Tue Apr 22 08:30:09 2014 UTC
+++ /branches/bleeding_edge/src/factory.h Wed Apr 23 15:43:39 2014 UTC
@@ -81,6 +81,8 @@
// Create an empty TypeFeedbackInfo.
Handle<TypeFeedbackInfo> NewTypeFeedbackInfo();
+ // Finds the internalized copy for string in the string table.
+ // If not found, a new string is added to the table and returned.
Handle<String> InternalizeUtf8String(Vector<const char> str);
Handle<String> InternalizeUtf8String(const char* str) {
return InternalizeUtf8String(CStrVector(str));
@@ -165,7 +167,9 @@
int length,
PretenureFlag pretenure = NOT_TENURED);
- Handle<String> LookupSingleCharacterStringFromCode(uint32_t index);
+ // Creates a single character string where the character has given code.
+ // A cache is used for ASCII codes.
+ Handle<String> LookupSingleCharacterStringFromCode(uint32_t code);
// Create a new cons string object which consists of a pair of strings.
MUST_USE_RESULT MaybeHandle<String> NewConsString(Handle<String> left,
@@ -575,6 +579,10 @@
INTERNALIZED_STRING_LIST(STRING_ACCESSOR)
#undef STRING_ACCESSOR
+ inline void set_string_table(Handle<StringTable> table) {
+ isolate()->heap()->set_string_table(*table);
+ }
+
Handle<String> hidden_string() {
return Handle<String>(&isolate()->heap()->hidden_string_);
}
=======================================
--- /branches/bleeding_edge/src/heap.cc Wed Apr 23 15:08:03 2014 UTC
+++ /branches/bleeding_edge/src/heap.cc Wed Apr 23 15:43:39 2014 UTC
@@ -3385,31 +3385,6 @@
result->set_foreign_address(address);
return result;
}
-
-
-MaybeObject* Heap::LookupSingleCharacterStringFromCode(uint16_t code) {
- if (code <= String::kMaxOneByteCharCode) {
- Object* value = single_character_string_cache()->get(code);
- if (value != undefined_value()) return value;
-
- uint8_t buffer[1];
- buffer[0] = static_cast<uint8_t>(code);
- Object* result;
- OneByteStringKey key(Vector<const uint8_t>(buffer, 1), HashSeed());
- MaybeObject* maybe_result = InternalizeStringWithKey(&key);
-
- if (!maybe_result->ToObject(&result)) return maybe_result;
- single_character_string_cache()->set(code, result);
- return result;
- }
-
- SeqTwoByteString* result;
- { MaybeObject* maybe_result = AllocateRawTwoByteString(1, NOT_TENURED);
- if (!maybe_result->To<SeqTwoByteString>(&result)) return maybe_result;
- }
- result->SeqTwoByteStringSet(0, code);
- return result;
-}
MaybeObject* Heap::AllocateByteArray(int length, PretenureFlag pretenure) {
@@ -4875,28 +4850,6 @@
#endif
-MaybeObject* Heap::InternalizeUtf8String(Vector<const char> string) {
- Utf8StringKey key(string, HashSeed());
- return InternalizeStringWithKey(&key);
-}
-
-
-MaybeObject* Heap::InternalizeString(String* string) {
- if (string->IsInternalizedString()) return string;
- Object* result = NULL;
- Object* new_table;
- { MaybeObject* maybe_new_table =
- string_table()->LookupString(string, &result);
- if (!maybe_new_table->ToObject(&new_table)) return maybe_new_table;
- }
- // Can't use set_string_table because StringTable::cast knows that
- // StringTable is a singleton and checks for identity.
- roots_[kStringTableRootIndex] = new_table;
- ASSERT(result != NULL);
- return result;
-}
-
-
bool Heap::InternalizeStringIfExists(String* string, String** result) {
if (string->IsInternalizedString()) {
*result = string;
@@ -4904,21 +4857,6 @@
}
return string_table()->LookupStringIfExists(string, result);
}
-
-
-MaybeObject* Heap::InternalizeStringWithKey(HashTableKey* key) {
- Object* result = NULL;
- Object* new_table;
- { MaybeObject* maybe_new_table =
- string_table()->LookupKey(key, &result);
- if (!maybe_new_table->ToObject(&new_table)) return maybe_new_table;
- }
- // Can't use set_string_table because StringTable::cast knows that
- // StringTable is a singleton and checks for identity.
- roots_[kStringTableRootIndex] = new_table;
- ASSERT(result != NULL);
- return result;
-}
void Heap::ZapFromSpace() {
=======================================
--- /branches/bleeding_edge/src/heap.h Tue Apr 22 07:33:20 2014 UTC
+++ /branches/bleeding_edge/src/heap.h Wed Apr 23 15:43:39 2014 UTC
@@ -828,13 +828,6 @@
MUST_USE_RESULT MaybeObject* AllocateInternalizedStringImpl(
T t, int chars, uint32_t hash_field);
- // Computes a single character string where the character has code.
- // A cache is used for ASCII codes.
- // Returns Failure::RetryAfterGC(requested_bytes, space) if the
allocation
- // failed. Please note this does not perform a garbage collection.
- MUST_USE_RESULT MaybeObject* LookupSingleCharacterStringFromCode(
- uint16_t code);
-
// Allocate a byte array of the specified length
// Returns Failure::RetryAfterGC(requested_bytes, space) if the
allocation
// failed.
@@ -1005,12 +998,6 @@
// Returns Failure::RetryAfterGC(requested_bytes, space) if allocation
// failed.
// Please note this function does not perform a garbage collection.
- MUST_USE_RESULT MaybeObject* InternalizeUtf8String(const char* str) {
- return InternalizeUtf8String(CStrVector(str));
- }
- MUST_USE_RESULT MaybeObject* InternalizeUtf8String(Vector<const char>
str);
-
- MUST_USE_RESULT MaybeObject* InternalizeString(String* str);
MUST_USE_RESULT MaybeObject* InternalizeStringWithKey(HashTableKey* key);
bool InternalizeStringIfExists(String* str, String** result);
=======================================
--- /branches/bleeding_edge/src/mark-compact.cc Fri Apr 11 10:36:09 2014 UTC
+++ /branches/bleeding_edge/src/mark-compact.cc Wed Apr 23 15:43:39 2014 UTC
@@ -2146,7 +2146,10 @@
StringTable* string_table = heap()->string_table();
// Mark the string table itself.
MarkBit string_table_mark = Marking::MarkBitFrom(string_table);
- SetMark(string_table, string_table_mark);
+ if (!string_table_mark.Get()) {
+ // String table could have already been marked by visiting the handles
list.
+ SetMark(string_table, string_table_mark);
+ }
// Explicitly mark the prefix.
string_table->IteratePrefix(visitor);
ProcessMarkingDeque();
=======================================
--- /branches/bleeding_edge/src/objects-inl.h Wed Apr 23 15:08:03 2014 UTC
+++ /branches/bleeding_edge/src/objects-inl.h Wed Apr 23 15:43:39 2014 UTC
@@ -468,6 +468,11 @@
return static_cast<const uc16*>(start_)[index];
}
}
+
+
+Handle<Object> HashTableKey::AsHandle(Isolate* isolate) {
+ CALL_HEAP_FUNCTION(isolate, AsObject(isolate->heap()), Object);
+}
template <typename Char>
@@ -476,7 +481,7 @@
explicit SequentialStringKey(Vector<const Char> string, uint32_t seed)
: string_(string), hash_field_(0), seed_(seed) { }
- virtual uint32_t Hash() {
+ virtual uint32_t Hash() V8_OVERRIDE {
hash_field_ = StringHasher::HashSequentialString<Char>(string_.start(),
string_.length(),
seed_);
@@ -487,7 +492,7 @@
}
- virtual uint32_t HashForObject(Object* other) {
+ virtual uint32_t HashForObject(Object* other) V8_OVERRIDE {
return String::cast(other)->Hash();
}
@@ -502,11 +507,11 @@
OneByteStringKey(Vector<const uint8_t> str, uint32_t seed)
: SequentialStringKey<uint8_t>(str, seed) { }
- virtual bool IsMatch(Object* string) {
+ virtual bool IsMatch(Object* string) V8_OVERRIDE {
return String::cast(string)->IsOneByteEqualTo(string_);
}
- virtual MaybeObject* AsObject(Heap* heap);
+ virtual MaybeObject* AsObject(Heap* heap) V8_OVERRIDE;
};
@@ -521,7 +526,7 @@
ASSERT(string_->IsSeqString() || string->IsExternalString());
}
- virtual uint32_t Hash() {
+ virtual uint32_t Hash() V8_OVERRIDE {
ASSERT(length_ >= 0);
ASSERT(from_ + length_ <= string_->length());
const Char* chars = GetChars() + from_;
@@ -532,12 +537,12 @@
return result;
}
- virtual uint32_t HashForObject(Object* other) {
+ virtual uint32_t HashForObject(Object* other) V8_OVERRIDE {
return String::cast(other)->Hash();
}
- virtual bool IsMatch(Object* string);
- virtual MaybeObject* AsObject(Heap* heap);
+ virtual bool IsMatch(Object* string) V8_OVERRIDE;
+ virtual MaybeObject* AsObject(Heap* heap) V8_OVERRIDE;
private:
const Char* GetChars();
@@ -562,11 +567,11 @@
explicit TwoByteStringKey(Vector<const uc16> str, uint32_t seed)
: SequentialStringKey<uc16>(str, seed) { }
- virtual bool IsMatch(Object* string) {
+ virtual bool IsMatch(Object* string) V8_OVERRIDE {
return String::cast(string)->IsTwoByteEqualTo(string_);
}
- virtual MaybeObject* AsObject(Heap* heap);
+ virtual MaybeObject* AsObject(Heap* heap) V8_OVERRIDE;
};
@@ -576,11 +581,11 @@
explicit Utf8StringKey(Vector<const char> string, uint32_t seed)
: string_(string), hash_field_(0), seed_(seed) { }
- virtual bool IsMatch(Object* string) {
+ virtual bool IsMatch(Object* string) V8_OVERRIDE {
return String::cast(string)->IsUtf8EqualTo(string_);
}
- virtual uint32_t Hash() {
+ virtual uint32_t Hash() V8_OVERRIDE {
if (hash_field_ != 0) return hash_field_ >> String::kHashShift;
hash_field_ = StringHasher::ComputeUtf8Hash(string_, seed_, &chars_);
uint32_t result = hash_field_ >> String::kHashShift;
@@ -588,11 +593,11 @@
return result;
}
- virtual uint32_t HashForObject(Object* other) {
+ virtual uint32_t HashForObject(Object* other) V8_OVERRIDE {
return String::cast(other)->Hash();
}
- virtual MaybeObject* AsObject(Heap* heap) {
+ virtual MaybeObject* AsObject(Heap* heap) V8_OVERRIDE {
if (hash_field_ == 0) Hash();
return heap->AllocateInternalizedStringFromUtf8(string_,
chars_,
=======================================
--- /branches/bleeding_edge/src/objects.cc Wed Apr 23 09:41:28 2014 UTC
+++ /branches/bleeding_edge/src/objects.cc Wed Apr 23 15:43:39 2014 UTC
@@ -14536,37 +14536,37 @@
// InternalizedStringKey carries a string/internalized-string object as
key.
class InternalizedStringKey : public HashTableKey {
public:
- explicit InternalizedStringKey(String* string)
+ explicit InternalizedStringKey(Handle<String> string)
: string_(string) { }
- bool IsMatch(Object* string) {
- return String::cast(string)->Equals(string_);
+ virtual bool IsMatch(Object* string) V8_OVERRIDE {
+ return String::cast(string)->Equals(*string_);
}
- uint32_t Hash() { return string_->Hash(); }
+ virtual uint32_t Hash() V8_OVERRIDE { return string_->Hash(); }
- uint32_t HashForObject(Object* other) {
+ virtual uint32_t HashForObject(Object* other) V8_OVERRIDE {
return String::cast(other)->Hash();
}
- MaybeObject* AsObject(Heap* heap) {
+ virtual MaybeObject* AsObject(Heap* heap) V8_OVERRIDE {
// Internalize the string if possible.
- Map* map = heap->InternalizedStringMapForString(string_);
+ Map* map = heap->InternalizedStringMapForString(*string_);
if (map != NULL) {
string_->set_map_no_write_barrier(map);
ASSERT(string_->IsInternalizedString());
- return string_;
+ return *string_;
}
// Otherwise allocate a new internalized string.
return heap->AllocateInternalizedStringImpl(
- string_, string_->length(), string_->hash_field());
+ *string_, string_->length(), string_->hash_field());
}
static uint32_t StringHash(Object* obj) {
return String::cast(obj)->Hash();
}
- String* string_;
+ Handle<String> string_;
};
@@ -15490,12 +15490,6 @@
return handle(PropertyCell::cast(value));
}
}
-
-
-MaybeObject* StringTable::LookupString(String* string, Object** s) {
- InternalizedStringKey key(string);
- return LookupKey(&key, s);
-}
// This class is used for looking up two character strings in the string
table.
@@ -15564,7 +15558,10 @@
bool StringTable::LookupStringIfExists(String* string, String** result) {
SLOW_ASSERT(this == HeapObject::cast(this)->GetHeap()->string_table());
- InternalizedStringKey key(string);
+ DisallowHeapAllocation no_alloc;
+ // TODO(ishell): Handlify all the callers and remove this scope.
+ HandleScope scope(GetIsolate());
+ InternalizedStringKey key(handle(string));
int entry = FindEntry(&key);
if (entry == kNotFound) {
return false;
@@ -15592,39 +15589,38 @@
}
-MaybeObject* StringTable::LookupKey(HashTableKey* key, Object** s) {
- SLOW_ASSERT(this == HeapObject::cast(this)->GetHeap()->string_table());
- int entry = FindEntry(key);
+Handle<String> StringTable::LookupString(Isolate* isolate,
+ Handle<String> string) {
+ InternalizedStringKey key(string);
+ return LookupKey(isolate, &key);
+}
+
+
+// TODO(ishell): Maybehandlify callers.
+Handle<String> StringTable::LookupKey(Isolate* isolate, HashTableKey* key)
{
+ Handle<StringTable> table = isolate->factory()->string_table();
+ int entry = table->FindEntry(key);
// String already in table.
if (entry != kNotFound) {
- *s = KeyAt(entry);
- return this;
+ return handle(String::cast(table->KeyAt(entry)), isolate);
}
// Adding new string. Grow table if needed.
- Object* obj;
- { MaybeObject* maybe_obj = EnsureCapacity(1, key);
- if (!maybe_obj->ToObject(&obj)) return maybe_obj;
- }
+ table = StringTable::EnsureCapacity(table, 1, key);
// Create string object.
- Object* string;
- { MaybeObject* maybe_string = key->AsObject(GetHeap());
- if (!maybe_string->ToObject(&string)) return maybe_string;
- }
-
- // If the string table grew as part of EnsureCapacity, obj is not
- // the current string table and therefore we cannot use
- // StringTable::cast here.
- StringTable* table = reinterpret_cast<StringTable*>(obj);
+ Handle<Object> string = key->AsHandle(isolate);
+ // TODO(ishell): Maybehandlify this.
+ if (string.is_null()) return Handle<String>();
// Add the new string and return it along with the string table.
entry = table->FindInsertionEntry(key->Hash());
- table->set(EntryToIndex(entry), string);
+ table->set(EntryToIndex(entry), *string);
table->ElementAdded();
- *s = string;
- return table;
+
+ isolate->factory()->set_string_table(table);
+ return Handle<String>::cast(string);
}
=======================================
--- /branches/bleeding_edge/src/objects.h Wed Apr 23 15:08:03 2014 UTC
+++ /branches/bleeding_edge/src/objects.h Wed Apr 23 15:43:39 2014 UTC
@@ -3881,6 +3881,8 @@
// Returns the key object for storing into the hash table.
// If allocations fails a failure object is returned.
MUST_USE_RESULT virtual MaybeObject* AsObject(Heap* heap) = 0;
+ // TODO(ishell): This should eventually replace AsObject().
+ inline Handle<Object> AsHandle(Isolate* isolate);
// Required.
virtual ~HashTableKey() {}
};
@@ -3918,12 +3920,10 @@
StringTableShape,
HashTableKey*> {
public:
- // Find string in the string table. If it is not there yet, it is
- // added. The return value is the string table which might have
- // been enlarged. If the return value is not a failure, the string
- // pointer *s is set to the string found.
- MUST_USE_RESULT MaybeObject* LookupString(String* key, Object** s);
- MUST_USE_RESULT MaybeObject* LookupKey(HashTableKey* key, Object** s);
+ // Find string in the string table. If it is not there yet, it is
+ // added. The return value is the string found.
+ static Handle<String> LookupString(Isolate* isolate, Handle<String> key);
+ static Handle<String> LookupKey(Isolate* isolate, HashTableKey* key);
// Looks up a string that is equal to the given string and returns
// true if it is found, assigning the string to the given output
@@ -9217,6 +9217,7 @@
static const int32_t kMaxOneByteCharCode = unibrow::Latin1::kMaxChar;
static const uint32_t kMaxOneByteCharCodeU = unibrow::Latin1::kMaxChar;
static const int kMaxUtf16CodeUnit = 0xffff;
+ static const uint32_t kMaxUtf16CodeUnitU = kMaxUtf16CodeUnit;
// Value of hash field containing computed hash equal to zero.
static const int kEmptyStringHash = kIsNotArrayIndexMask;
=======================================
--- /branches/bleeding_edge/src/parser.cc Thu Apr 17 13:27:02 2014 UTC
+++ /branches/bleeding_edge/src/parser.cc Wed Apr 23 15:43:39 2014 UTC
@@ -3842,8 +3842,7 @@
RegExpTree* RegExpParser::ReportError(Vector<const char> message) {
failed_ = true;
- *error_ = isolate()->factory()->NewStringFromAscii(
- message, NOT_TENURED).ToHandleChecked();
+ *error_ =
isolate()->factory()->NewStringFromAscii(message).ToHandleChecked();
// Zip to the end to make sure the no more input is read.
current_ = kEndMarker;
next_pos_ = in()->length();
=======================================
--- /branches/bleeding_edge/test/cctest/test-api.cc Wed Apr 23 13:05:38
2014 UTC
+++ /branches/bleeding_edge/test/cctest/test-api.cc Wed Apr 23 15:43:39
2014 UTC
@@ -17993,7 +17993,8 @@
CcTest::heap()->CollectAllAvailableGarbage(); // Tenure string.
// Turn into a symbol.
i::Handle<i::String> string3_i = v8::Utils::OpenHandle(*string3);
- CHECK(!CcTest::heap()->InternalizeString(*string3_i)->IsFailure());
+ CHECK(!CcTest::i_isolate()->factory()->InternalizeString(
+ string3_i).is_null());
CHECK(string3_i->IsInternalizedString());
// We need to add usages for string* to avoid warnings in GCC 4.7
=======================================
--- /branches/bleeding_edge/test/cctest/test-heap.cc Wed Apr 23 15:08:03
2014 UTC
+++ /branches/bleeding_edge/test/cctest/test-heap.cc Wed Apr 23 15:43:39
2014 UTC
@@ -595,17 +595,13 @@
static void CheckInternalizedStrings(const char** strings) {
+ Factory* factory = CcTest::i_isolate()->factory();
for (const char* string = *strings; *strings != 0; string = *strings++) {
- Object* a;
- MaybeObject* maybe_a = CcTest::heap()->InternalizeUtf8String(string);
- // InternalizeUtf8String may return a failure if a GC is needed.
- if (!maybe_a->ToObject(&a)) continue;
+ Handle<String> a = factory->InternalizeUtf8String(string);
CHECK(a->IsInternalizedString());
- Object* b;
- MaybeObject* maybe_b = CcTest::heap()->InternalizeUtf8String(string);
- if (!maybe_b->ToObject(&b)) continue;
- CHECK_EQ(b, a);
- CHECK(String::cast(b)->IsUtf8EqualTo(CStrVector(string)));
+ Handle<String> b = factory->InternalizeUtf8String(string);
+ CHECK_EQ(*b, *a);
+ CHECK(String::cast(*b)->IsUtf8EqualTo(CStrVector(string)));
}
}
@@ -613,6 +609,7 @@
TEST(StringTable) {
CcTest::InitializeVM();
+ v8::HandleScope sc(CcTest::isolate());
CheckInternalizedStrings(not_so_random_string_table);
CheckInternalizedStrings(not_so_random_string_table);
}
--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
