Commit b3d09001 authored by Santiago Aboy Solanes's avatar Santiago Aboy Solanes Committed by Commit Bot

[objects] Remove uncached internal external string type

We shouldn't be creating those anymore since they are not thread-safe.

Bug: v8:7790
Change-Id: I4546d995fa32eb076c8dfe9d95301fad719c9e07
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2615347Reviewed-by: 's avatarRoss McIlroy <rmcilroy@chromium.org>
Reviewed-by: 's avatarLeszek Swirski <leszeks@chromium.org>
Commit-Queue: Santiago Aboy Solanes <solanes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72006}
parent bfab4808
...@@ -153,8 +153,6 @@ Type::bitset BitsetType::Lub(const MapRefLike& map) { ...@@ -153,8 +153,6 @@ Type::bitset BitsetType::Lub(const MapRefLike& map) {
return kString; return kString;
case EXTERNAL_INTERNALIZED_STRING_TYPE: case EXTERNAL_INTERNALIZED_STRING_TYPE:
case EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE: case EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE:
case UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE:
case UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE:
case INTERNALIZED_STRING_TYPE: case INTERNALIZED_STRING_TYPE:
case ONE_BYTE_INTERNALIZED_STRING_TYPE: case ONE_BYTE_INTERNALIZED_STRING_TYPE:
return kInternalizedString; return kInternalizedString;
......
...@@ -232,8 +232,6 @@ void HeapObject::HeapObjectPrint(std::ostream& os) { // NOLINT ...@@ -232,8 +232,6 @@ void HeapObject::HeapObjectPrint(std::ostream& os) { // NOLINT
case EXTERNAL_INTERNALIZED_STRING_TYPE: case EXTERNAL_INTERNALIZED_STRING_TYPE:
case ONE_BYTE_INTERNALIZED_STRING_TYPE: case ONE_BYTE_INTERNALIZED_STRING_TYPE:
case EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE: case EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE:
case UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE:
case UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE:
case STRING_TYPE: case STRING_TYPE:
case CONS_STRING_TYPE: case CONS_STRING_TYPE:
case EXTERNAL_STRING_TYPE: case EXTERNAL_STRING_TYPE:
......
...@@ -87,12 +87,6 @@ enum InstanceType : uint16_t { ...@@ -87,12 +87,6 @@ enum InstanceType : uint16_t {
kTwoByteStringTag | kExternalStringTag | kInternalizedTag, kTwoByteStringTag | kExternalStringTag | kInternalizedTag,
EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE = EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE =
kOneByteStringTag | kExternalStringTag | kInternalizedTag, kOneByteStringTag | kExternalStringTag | kInternalizedTag,
UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE =
EXTERNAL_INTERNALIZED_STRING_TYPE | kUncachedExternalStringTag |
kInternalizedTag,
UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE =
EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE | kUncachedExternalStringTag |
kInternalizedTag,
STRING_TYPE = INTERNALIZED_STRING_TYPE | kNotInternalizedTag, STRING_TYPE = INTERNALIZED_STRING_TYPE | kNotInternalizedTag,
ONE_BYTE_STRING_TYPE = ONE_BYTE_STRING_TYPE =
ONE_BYTE_INTERNALIZED_STRING_TYPE | kNotInternalizedTag, ONE_BYTE_INTERNALIZED_STRING_TYPE | kNotInternalizedTag,
...@@ -107,10 +101,12 @@ enum InstanceType : uint16_t { ...@@ -107,10 +101,12 @@ enum InstanceType : uint16_t {
EXTERNAL_INTERNALIZED_STRING_TYPE | kNotInternalizedTag, EXTERNAL_INTERNALIZED_STRING_TYPE | kNotInternalizedTag,
EXTERNAL_ONE_BYTE_STRING_TYPE = EXTERNAL_ONE_BYTE_STRING_TYPE =
EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE | kNotInternalizedTag, EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE | kNotInternalizedTag,
UNCACHED_EXTERNAL_STRING_TYPE = UNCACHED_EXTERNAL_STRING_TYPE = kTwoByteStringTag | kExternalStringTag |
UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE | kNotInternalizedTag, kUncachedExternalStringTag |
kNotInternalizedTag,
UNCACHED_EXTERNAL_ONE_BYTE_STRING_TYPE = UNCACHED_EXTERNAL_ONE_BYTE_STRING_TYPE =
UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE | kNotInternalizedTag, kOneByteStringTag | kExternalStringTag | kUncachedExternalStringTag |
kNotInternalizedTag,
THIN_STRING_TYPE = kTwoByteStringTag | kThinStringTag | kNotInternalizedTag, THIN_STRING_TYPE = kTwoByteStringTag | kThinStringTag | kNotInternalizedTag,
THIN_ONE_BYTE_STRING_TYPE = THIN_ONE_BYTE_STRING_TYPE =
kOneByteStringTag | kThinStringTag | kNotInternalizedTag, kOneByteStringTag | kThinStringTag | kNotInternalizedTag,
......
...@@ -36,8 +36,6 @@ namespace internal { ...@@ -36,8 +36,6 @@ namespace internal {
V(EXTERNAL_INTERNALIZED_STRING_TYPE) \ V(EXTERNAL_INTERNALIZED_STRING_TYPE) \
V(ONE_BYTE_INTERNALIZED_STRING_TYPE) \ V(ONE_BYTE_INTERNALIZED_STRING_TYPE) \
V(EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE) \ V(EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE) \
V(UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE) \
V(UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE) \
V(STRING_TYPE) \ V(STRING_TYPE) \
V(CONS_STRING_TYPE) \ V(CONS_STRING_TYPE) \
V(EXTERNAL_STRING_TYPE) \ V(EXTERNAL_STRING_TYPE) \
...@@ -85,13 +83,6 @@ namespace internal { ...@@ -85,13 +83,6 @@ namespace internal {
external_internalized_string, ExternalInternalizedString) \ external_internalized_string, ExternalInternalizedString) \
V(EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE, ExternalOneByteString::kSize, \ V(EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE, ExternalOneByteString::kSize, \
external_one_byte_internalized_string, ExternalOneByteInternalizedString) \ external_one_byte_internalized_string, ExternalOneByteInternalizedString) \
V(UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE, \
ExternalTwoByteString::kUncachedSize, \
uncached_external_internalized_string, UncachedExternalInternalizedString) \
V(UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE, \
ExternalOneByteString::kUncachedSize, \
uncached_external_one_byte_internalized_string, \
UncachedExternalOneByteInternalizedString) \
V(THIN_STRING_TYPE, ThinString::kSize, thin_string, ThinString) \ V(THIN_STRING_TYPE, ThinString::kSize, thin_string, ThinString) \
V(THIN_ONE_BYTE_STRING_TYPE, ThinString::kSize, thin_one_byte_string, \ V(THIN_ONE_BYTE_STRING_TYPE, ThinString::kSize, thin_one_byte_string, \
ThinOneByteString) ThinOneByteString)
......
...@@ -129,10 +129,6 @@ class Symbol; ...@@ -129,10 +129,6 @@ class Symbol;
V(Map, external_internalized_string_map, ExternalInternalizedStringMap) \ V(Map, external_internalized_string_map, ExternalInternalizedStringMap) \
V(Map, external_one_byte_internalized_string_map, \ V(Map, external_one_byte_internalized_string_map, \
ExternalOneByteInternalizedStringMap) \ ExternalOneByteInternalizedStringMap) \
V(Map, uncached_external_internalized_string_map, \
UncachedExternalInternalizedStringMap) \
V(Map, uncached_external_one_byte_internalized_string_map, \
UncachedExternalOneByteInternalizedStringMap) \
V(Map, uncached_external_one_byte_string_map, \ V(Map, uncached_external_one_byte_string_map, \
UncachedExternalOneByteStringMap) \ UncachedExternalOneByteStringMap) \
/* Oddball maps */ \ /* Oddball maps */ \
......
...@@ -2142,7 +2142,6 @@ TEST(InternalizeExternalStringUncachedWithCopyTwoByte) { ...@@ -2142,7 +2142,6 @@ TEST(InternalizeExternalStringUncachedWithCopyTwoByte) {
CHECK(external->is_uncached()); CHECK(external->is_uncached());
// Internalize succesfully, with a copy. // Internalize succesfully, with a copy.
CHECK(!external->IsInternalizedString());
Handle<String> internal = factory->InternalizeString(external); Handle<String> internal = factory->InternalizeString(external);
CHECK(!external->IsInternalizedString()); CHECK(!external->IsInternalizedString());
CHECK(internal->IsInternalizedString()); CHECK(internal->IsInternalizedString());
......
...@@ -94,8 +94,6 @@ export const CATEGORIES = new Map([ ...@@ -94,8 +94,6 @@ export const CATEGORIES = new Map([
'SYMBOL_TYPE', 'SYMBOL_TYPE',
'THIN_ONE_BYTE_STRING_TYPE', 'THIN_ONE_BYTE_STRING_TYPE',
'THIN_STRING_TYPE', 'THIN_STRING_TYPE',
'UNCACHED_EXTERNAL_INTERNALIZED_STRING_TYPE',
'UNCACHED_EXTERNAL_ONE_BYTE_INTERNALIZED_STRING_TYPE',
'UNCACHED_EXTERNAL_ONE_BYTE_STRING_TYPE', 'UNCACHED_EXTERNAL_ONE_BYTE_STRING_TYPE',
'UNCACHED_EXTERNAL_STRING_TYPE', 'UNCACHED_EXTERNAL_STRING_TYPE',
'WASM_INSTANCE_OBJECT_TYPE', 'WASM_INSTANCE_OBJECT_TYPE',
......
This diff is collapsed.
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