Skip to content

V
V8
Commit 33ad9568 authored by Yang Guo's avatar Yang Guo Committed by Commit Bot
Browse files
Options

Remove padding instance types. 

This also makes sure 6.0 and 6.1 have the same constants exposed
in v8.h.

Bug: v8:6592

R=bmeurer@chromium.org

Cq-Include-Trybots: master.tryserver.chromium.linux:linux_chromium_rel_ng
Change-Id: I3afc0e5e4495594c76229555aab148ac78388f80
Reviewed-on: https://chromium-review.googlesource.com/569618
Commit-Queue: Yang Guo <yangguo@chromium.org>
Reviewed-by: 's avatarBenedikt Meurer <bmeurer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46642}
parent 6ace4a50
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 94 deletions
include/v8.h
View file @ 33ad9568
...@@ -8930,8 +8930,8 @@ class Internals { ...@@ -8930,8 +8930,8 @@ class Internals {
static const int kNodeIsIndependentShift = 3; static const int kNodeIsIndependentShift = 3;
static const int kNodeIsActiveShift = 4; static const int kNodeIsActiveShift = 4;
static const int kJSApiObjectType = 0xbd; static const int kJSApiObjectType = 0xbb;
static const int kJSObjectType = 0xbe; static const int kJSObjectType = 0xbc;
static const int kFirstNonstringType = 0x80; static const int kFirstNonstringType = 0x80;
static const int kOddballType = 0x82; static const int kOddballType = 0x82;
static const int kForeignType = 0x86; static const int kForeignType = 0x86;
......
src/compiler/types.cc
View file @ 33ad9568
...@@ -336,8 +336,6 @@ Type::bitset BitsetType::Lub(i::Map* map) { ...@@ -336,8 +336,6 @@ Type::bitset BitsetType::Lub(i::Map* map) {
case CONTEXT_EXTENSION_TYPE: case CONTEXT_EXTENSION_TYPE:
case ASYNC_GENERATOR_REQUEST_TYPE: case ASYNC_GENERATOR_REQUEST_TYPE:
case PREPARSED_SCOPE_DATA_TYPE: case PREPARSED_SCOPE_DATA_TYPE:
case PADDING_TYPE_1:
case PADDING_TYPE_2:
UNREACHABLE(); UNREACHABLE();
} }
UNREACHABLE(); UNREACHABLE();
......
src/deoptimizer.cc
View file @ 33ad9568
...@@ -4015,8 +4015,6 @@ Handle<Object> TranslatedState::MaterializeCapturedObjectAt( ...@@ -4015,8 +4015,6 @@ Handle<Object> TranslatedState::MaterializeCapturedObjectAt(
case TUPLE3_TYPE: case TUPLE3_TYPE:
case ASYNC_GENERATOR_REQUEST_TYPE: case ASYNC_GENERATOR_REQUEST_TYPE:
case PREPARSED_SCOPE_DATA_TYPE: case PREPARSED_SCOPE_DATA_TYPE:
case PADDING_TYPE_1:
case PADDING_TYPE_2:
case WASM_MODULE_TYPE: case WASM_MODULE_TYPE:
case WASM_INSTANCE_TYPE: case WASM_INSTANCE_TYPE:
case WASM_MEMORY_TYPE: case WASM_MEMORY_TYPE:
......
src/objects.h
View file @ 33ad9568
...@@ -377,10 +377,6 @@ const int kStubMinorKeyBits = kSmiValueSize - kStubMajorKeyBits - 1; ...@@ -377,10 +377,6 @@ const int kStubMinorKeyBits = kSmiValueSize - kStubMajorKeyBits - 1;
V(PROPERTY_CELL_TYPE) \ V(PROPERTY_CELL_TYPE) \
V(SMALL_ORDERED_HASH_MAP_TYPE) \ V(SMALL_ORDERED_HASH_MAP_TYPE) \
V(SMALL_ORDERED_HASH_SET_TYPE) \ V(SMALL_ORDERED_HASH_SET_TYPE) \
/* TODO(yangguo): these padding types are for ABI stability. Remove after*/ \
/* version 6.0 branch, or replace them when there is demand for new types.*/ \
V(PADDING_TYPE_1) \
V(PADDING_TYPE_2) \
\ \
V(JS_PROXY_TYPE) \ V(JS_PROXY_TYPE) \
V(JS_GLOBAL_OBJECT_TYPE) \ V(JS_GLOBAL_OBJECT_TYPE) \
...@@ -730,11 +726,6 @@ enum InstanceType : uint8_t { ...@@ -730,11 +726,6 @@ enum InstanceType : uint8_t {
SMALL_ORDERED_HASH_MAP_TYPE, SMALL_ORDERED_HASH_MAP_TYPE,
SMALL_ORDERED_HASH_SET_TYPE, SMALL_ORDERED_HASH_SET_TYPE,
// TODO(yangguo): these padding types are for ABI stability. Remove after
// version 6.0 branch, or replace them when there is demand for new types.
PADDING_TYPE_1,
PADDING_TYPE_2,
// All the following types are subtypes of JSReceiver, which corresponds to // All the following types are subtypes of JSReceiver, which corresponds to
// objects in the JS sense. The first and the last type in this range are // objects in the JS sense. The first and the last type in this range are
// the two forms of function. This organization enables using the same // the two forms of function. This organization enables using the same
......
tools/v8heapconst.py
View file @ 33ad9568
...@@ -81,82 +81,80 @@ INSTANCE_TYPES = { ...@@ -81,82 +81,80 @@ INSTANCE_TYPES = {
177: "PROPERTY_CELL_TYPE", 177: "PROPERTY_CELL_TYPE",
178: "SMALL_ORDERED_HASH_MAP_TYPE", 178: "SMALL_ORDERED_HASH_MAP_TYPE",
179: "SMALL_ORDERED_HASH_SET_TYPE", 179: "SMALL_ORDERED_HASH_SET_TYPE",
180: "PADDING_TYPE_1", 180: "JS_PROXY_TYPE",
181: "PADDING_TYPE_2", 181: "JS_GLOBAL_OBJECT_TYPE",
182: "JS_PROXY_TYPE", 182: "JS_GLOBAL_PROXY_TYPE",
183: "JS_GLOBAL_OBJECT_TYPE", 183: "JS_SPECIAL_API_OBJECT_TYPE",
184: "JS_GLOBAL_PROXY_TYPE", 184: "JS_VALUE_TYPE",
185: "JS_SPECIAL_API_OBJECT_TYPE", 185: "JS_MESSAGE_OBJECT_TYPE",
186: "JS_VALUE_TYPE", 186: "JS_DATE_TYPE",
187: "JS_MESSAGE_OBJECT_TYPE", 187: "JS_API_OBJECT_TYPE",
188: "JS_DATE_TYPE", 188: "JS_OBJECT_TYPE",
189: "JS_API_OBJECT_TYPE", 189: "JS_ARGUMENTS_TYPE",
190: "JS_OBJECT_TYPE", 190: "JS_CONTEXT_EXTENSION_OBJECT_TYPE",
191: "JS_ARGUMENTS_TYPE", 191: "JS_GENERATOR_OBJECT_TYPE",
192: "JS_CONTEXT_EXTENSION_OBJECT_TYPE", 192: "JS_ASYNC_GENERATOR_OBJECT_TYPE",
193: "JS_GENERATOR_OBJECT_TYPE", 193: "JS_MODULE_NAMESPACE_TYPE",
194: "JS_ASYNC_GENERATOR_OBJECT_TYPE", 194: "JS_ARRAY_TYPE",
195: "JS_MODULE_NAMESPACE_TYPE", 195: "JS_ARRAY_BUFFER_TYPE",
196: "JS_ARRAY_TYPE", 196: "JS_TYPED_ARRAY_TYPE",
197: "JS_ARRAY_BUFFER_TYPE", 197: "JS_DATA_VIEW_TYPE",
198: "JS_TYPED_ARRAY_TYPE", 198: "JS_SET_TYPE",
199: "JS_DATA_VIEW_TYPE", 199: "JS_MAP_TYPE",
200: "JS_SET_TYPE", 200: "JS_SET_KEY_VALUE_ITERATOR_TYPE",
201: "JS_MAP_TYPE", 201: "JS_SET_VALUE_ITERATOR_TYPE",
202: "JS_SET_KEY_VALUE_ITERATOR_TYPE", 202: "JS_MAP_KEY_ITERATOR_TYPE",
203: "JS_SET_VALUE_ITERATOR_TYPE", 203: "JS_MAP_KEY_VALUE_ITERATOR_TYPE",
204: "JS_MAP_KEY_ITERATOR_TYPE", 204: "JS_MAP_VALUE_ITERATOR_TYPE",
205: "JS_MAP_KEY_VALUE_ITERATOR_TYPE", 205: "JS_WEAK_MAP_TYPE",
206: "JS_MAP_VALUE_ITERATOR_TYPE", 206: "JS_WEAK_SET_TYPE",
207: "JS_WEAK_MAP_TYPE", 207: "JS_PROMISE_CAPABILITY_TYPE",
208: "JS_WEAK_SET_TYPE", 208: "JS_PROMISE_TYPE",
209: "JS_PROMISE_CAPABILITY_TYPE", 209: "JS_REGEXP_TYPE",
210: "JS_PROMISE_TYPE", 210: "JS_ERROR_TYPE",
211: "JS_REGEXP_TYPE", 211: "JS_ASYNC_FROM_SYNC_ITERATOR_TYPE",
212: "JS_ERROR_TYPE", 212: "JS_STRING_ITERATOR_TYPE",
213: "JS_ASYNC_FROM_SYNC_ITERATOR_TYPE", 213: "JS_TYPED_ARRAY_KEY_ITERATOR_TYPE",
214: "JS_STRING_ITERATOR_TYPE", 214: "JS_FAST_ARRAY_KEY_ITERATOR_TYPE",
215: "JS_TYPED_ARRAY_KEY_ITERATOR_TYPE", 215: "JS_GENERIC_ARRAY_KEY_ITERATOR_TYPE",
216: "JS_FAST_ARRAY_KEY_ITERATOR_TYPE", 216: "JS_UINT8_ARRAY_KEY_VALUE_ITERATOR_TYPE",
217: "JS_GENERIC_ARRAY_KEY_ITERATOR_TYPE", 217: "JS_INT8_ARRAY_KEY_VALUE_ITERATOR_TYPE",
218: "JS_UINT8_ARRAY_KEY_VALUE_ITERATOR_TYPE", 218: "JS_UINT16_ARRAY_KEY_VALUE_ITERATOR_TYPE",
219: "JS_INT8_ARRAY_KEY_VALUE_ITERATOR_TYPE", 219: "JS_INT16_ARRAY_KEY_VALUE_ITERATOR_TYPE",
220: "JS_UINT16_ARRAY_KEY_VALUE_ITERATOR_TYPE", 220: "JS_UINT32_ARRAY_KEY_VALUE_ITERATOR_TYPE",
221: "JS_INT16_ARRAY_KEY_VALUE_ITERATOR_TYPE", 221: "JS_INT32_ARRAY_KEY_VALUE_ITERATOR_TYPE",
222: "JS_UINT32_ARRAY_KEY_VALUE_ITERATOR_TYPE", 222: "JS_FLOAT32_ARRAY_KEY_VALUE_ITERATOR_TYPE",
223: "JS_INT32_ARRAY_KEY_VALUE_ITERATOR_TYPE", 223: "JS_FLOAT64_ARRAY_KEY_VALUE_ITERATOR_TYPE",
224: "JS_FLOAT32_ARRAY_KEY_VALUE_ITERATOR_TYPE", 224: "JS_UINT8_CLAMPED_ARRAY_KEY_VALUE_ITERATOR_TYPE",
225: "JS_FLOAT64_ARRAY_KEY_VALUE_ITERATOR_TYPE", 225: "JS_FAST_SMI_ARRAY_KEY_VALUE_ITERATOR_TYPE",
226: "JS_UINT8_CLAMPED_ARRAY_KEY_VALUE_ITERATOR_TYPE", 226: "JS_FAST_HOLEY_SMI_ARRAY_KEY_VALUE_ITERATOR_TYPE",
227: "JS_FAST_SMI_ARRAY_KEY_VALUE_ITERATOR_TYPE", 227: "JS_FAST_ARRAY_KEY_VALUE_ITERATOR_TYPE",
228: "JS_FAST_HOLEY_SMI_ARRAY_KEY_VALUE_ITERATOR_TYPE", 228: "JS_FAST_HOLEY_ARRAY_KEY_VALUE_ITERATOR_TYPE",
229: "JS_FAST_ARRAY_KEY_VALUE_ITERATOR_TYPE", 229: "JS_FAST_DOUBLE_ARRAY_KEY_VALUE_ITERATOR_TYPE",
230: "JS_FAST_HOLEY_ARRAY_KEY_VALUE_ITERATOR_TYPE", 230: "JS_FAST_HOLEY_DOUBLE_ARRAY_KEY_VALUE_ITERATOR_TYPE",
231: "JS_FAST_DOUBLE_ARRAY_KEY_VALUE_ITERATOR_TYPE", 231: "JS_GENERIC_ARRAY_KEY_VALUE_ITERATOR_TYPE",
232: "JS_FAST_HOLEY_DOUBLE_ARRAY_KEY_VALUE_ITERATOR_TYPE", 232: "JS_UINT8_ARRAY_VALUE_ITERATOR_TYPE",
233: "JS_GENERIC_ARRAY_KEY_VALUE_ITERATOR_TYPE", 233: "JS_INT8_ARRAY_VALUE_ITERATOR_TYPE",
234: "JS_UINT8_ARRAY_VALUE_ITERATOR_TYPE", 234: "JS_UINT16_ARRAY_VALUE_ITERATOR_TYPE",
235: "JS_INT8_ARRAY_VALUE_ITERATOR_TYPE", 235: "JS_INT16_ARRAY_VALUE_ITERATOR_TYPE",
236: "JS_UINT16_ARRAY_VALUE_ITERATOR_TYPE", 236: "JS_UINT32_ARRAY_VALUE_ITERATOR_TYPE",
237: "JS_INT16_ARRAY_VALUE_ITERATOR_TYPE", 237: "JS_INT32_ARRAY_VALUE_ITERATOR_TYPE",
238: "JS_UINT32_ARRAY_VALUE_ITERATOR_TYPE", 238: "JS_FLOAT32_ARRAY_VALUE_ITERATOR_TYPE",
239: "JS_INT32_ARRAY_VALUE_ITERATOR_TYPE", 239: "JS_FLOAT64_ARRAY_VALUE_ITERATOR_TYPE",
240: "JS_FLOAT32_ARRAY_VALUE_ITERATOR_TYPE", 240: "JS_UINT8_CLAMPED_ARRAY_VALUE_ITERATOR_TYPE",
241: "JS_FLOAT64_ARRAY_VALUE_ITERATOR_TYPE", 241: "JS_FAST_SMI_ARRAY_VALUE_ITERATOR_TYPE",
242: "JS_UINT8_CLAMPED_ARRAY_VALUE_ITERATOR_TYPE", 242: "JS_FAST_HOLEY_SMI_ARRAY_VALUE_ITERATOR_TYPE",
243: "JS_FAST_SMI_ARRAY_VALUE_ITERATOR_TYPE", 243: "JS_FAST_ARRAY_VALUE_ITERATOR_TYPE",
244: "JS_FAST_HOLEY_SMI_ARRAY_VALUE_ITERATOR_TYPE", 244: "JS_FAST_HOLEY_ARRAY_VALUE_ITERATOR_TYPE",
245: "JS_FAST_ARRAY_VALUE_ITERATOR_TYPE", 245: "JS_FAST_DOUBLE_ARRAY_VALUE_ITERATOR_TYPE",
246: "JS_FAST_HOLEY_ARRAY_VALUE_ITERATOR_TYPE", 246: "JS_FAST_HOLEY_DOUBLE_ARRAY_VALUE_ITERATOR_TYPE",
247: "JS_FAST_DOUBLE_ARRAY_VALUE_ITERATOR_TYPE", 247: "JS_GENERIC_ARRAY_VALUE_ITERATOR_TYPE",
248: "JS_FAST_HOLEY_DOUBLE_ARRAY_VALUE_ITERATOR_TYPE", 248: "WASM_INSTANCE_TYPE",
249: "JS_GENERIC_ARRAY_VALUE_ITERATOR_TYPE", 249: "WASM_MEMORY_TYPE",
250: "WASM_INSTANCE_TYPE", 250: "WASM_MODULE_TYPE",
251: "WASM_MEMORY_TYPE", 251: "WASM_TABLE_TYPE",
252: "WASM_MODULE_TYPE", 252: "JS_BOUND_FUNCTION_TYPE",
253: "WASM_TABLE_TYPE", 253: "JS_FUNCTION_TYPE",
254: "JS_BOUND_FUNCTION_TYPE",
255: "JS_FUNCTION_TYPE",
} }
# List of known V8 maps. # List of known V8 maps.
...@@ -205,7 +203,7 @@ KNOWN_MAPS = { ...@@ -205,7 +203,7 @@ KNOWN_MAPS = {
0x03019: (171, "SloppyArgumentsElementsMap"), 0x03019: (171, "SloppyArgumentsElementsMap"),
0x03071: (178, "SmallOrderedHashMapMap"), 0x03071: (178, "SmallOrderedHashMapMap"),
0x030c9: (179, "SmallOrderedHashSetMap"), 0x030c9: (179, "SmallOrderedHashSetMap"),
0x03121: (187, "JSMessageObjectMap"), 0x03121: (185, "JSMessageObjectMap"),
0x03179: (136, "BytecodeArrayMap"), 0x03179: (136, "BytecodeArrayMap"),
0x031d1: (171, "ModuleInfoMap"), 0x031d1: (171, "ModuleInfoMap"),
0x03229: (175, "NoClosuresCellMap"), 0x03229: (175, "NoClosuresCellMap"),
...@@ -246,10 +244,10 @@ KNOWN_MAPS = { ...@@ -246,10 +244,10 @@ KNOWN_MAPS = {
0x03e31: (171, "DebugEvaluateContextMap"), 0x03e31: (171, "DebugEvaluateContextMap"),
0x03e89: (171, "ScriptContextTableMap"), 0x03e89: (171, "ScriptContextTableMap"),
0x03ee1: (171, "UnseededNumberDictionaryMap"), 0x03ee1: (171, "UnseededNumberDictionaryMap"),
0x03f39: (190, "ExternalMap"), 0x03f39: (188, "ExternalMap"),
0x03f91: (106, "NativeSourceStringMap"), 0x03f91: (106, "NativeSourceStringMap"),
0x03fe9: (152, "InterceptorInfoMap"), 0x03fe9: (152, "InterceptorInfoMap"),
0x04041: (209, "JSPromiseCapabilityMap"), 0x04041: (207, "JSPromiseCapabilityMap"),
0x04099: (149, "AccessorInfoMap"), 0x04099: (149, "AccessorInfoMap"),
0x040f1: (150, "AccessorPairMap"), 0x040f1: (150, "AccessorPairMap"),
0x04149: (151, "AccessCheckInfoMap"), 0x04149: (151, "AccessCheckInfoMap"),
......
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