Index: src/objects.h |
diff --git a/src/objects.h b/src/objects.h |
index 262a3960db722071c81841f3ee49a76e03a5a365..269fb8af2a2847f4ab300b44ce0417adea130a09 100644 |
--- a/src/objects.h |
+++ b/src/objects.h |
@@ -491,7 +491,7 @@ const int kStubMinorKeyBits = kBitsPerInt - kSmiTagSize - kStubMajorKeyBits; |
ExternalAsciiString) \ |
V(EXTERNAL_STRING_WITH_ONE_BYTE_DATA_TYPE, \ |
ExternalTwoByteString::kSize, \ |
- external_string_with_one_bytei_data, \ |
+ external_string_with_one_byte_data, \ |
ExternalStringWithOneByteData) \ |
V(SHORT_EXTERNAL_STRING_TYPE, \ |
ExternalTwoByteString::kShortSize, \ |
@@ -1209,8 +1209,6 @@ class MaybeObject BASE_EMBEDDED { |
"Inlined runtime function: GetFromCache") \ |
V(kInlinedRuntimeFunctionIsNonNegativeSmi, \ |
"Inlined runtime function: IsNonNegativeSmi") \ |
- V(kInlinedRuntimeFunctionIsRegExpEquivalent, \ |
- "Inlined runtime function: IsRegExpEquivalent") \ |
V(kInlinedRuntimeFunctionIsStringWrapperSafeForDefaultValueOf, \ |
"Inlined runtime function: IsStringWrapperSafeForDefaultValueOf") \ |
V(kInliningBailedOut, "Inlining bailed out") \ |
@@ -4938,8 +4936,12 @@ class FixedTypedArray: public FixedTypedArrayBase { |
// Casting: |
static inline FixedTypedArray<Traits>* cast(Object* obj); |
+ static inline int ElementOffset(int index) { |
+ return kDataOffset + index * sizeof(ElementType); |
+ } |
+ |
static inline int SizeFor(int length) { |
- return kDataOffset + length * sizeof(ElementType); |
+ return ElementOffset(length); |
} |
inline ElementType get_scalar(int index); |
@@ -5174,8 +5176,6 @@ class Code: public HeapObject { |
#define IC_KIND_LIST(V) \ |
V(LOAD_IC) \ |
V(KEYED_LOAD_IC) \ |
- V(CALL_IC) \ |
- V(KEYED_CALL_IC) \ |
V(STORE_IC) \ |
V(KEYED_STORE_IC) \ |
V(BINARY_OP_IC) \ |
@@ -5300,8 +5300,6 @@ class Code: public HeapObject { |
inline bool is_keyed_load_stub() { return kind() == KEYED_LOAD_IC; } |
inline bool is_store_stub() { return kind() == STORE_IC; } |
inline bool is_keyed_store_stub() { return kind() == KEYED_STORE_IC; } |
- inline bool is_call_stub() { return kind() == CALL_IC; } |
- inline bool is_keyed_call_stub() { return kind() == KEYED_CALL_IC; } |
inline bool is_binary_op_stub() { return kind() == BINARY_OP_IC; } |
inline bool is_compare_ic_stub() { return kind() == COMPARE_IC; } |
inline bool is_compare_nil_ic_stub() { return kind() == COMPARE_NIL_IC; } |
@@ -5370,11 +5368,6 @@ class Code: public HeapObject { |
inline bool back_edges_patched_for_osr(); |
inline void set_back_edges_patched_for_osr(bool value); |
- // [check type]: For kind CALL_IC, tells how to check if the |
- // receiver is valid for the given call. |
- inline CheckType check_type(); |
- inline void set_check_type(CheckType value); |
- |
// [to_boolean_foo]: For kind TO_BOOLEAN_IC tells what state the stub is in. |
inline byte to_boolean_state(); |
@@ -5601,7 +5594,6 @@ class Code: public HeapObject { |
// Byte offsets within kKindSpecificFlags1Offset. |
static const int kOptimizableOffset = kKindSpecificFlags1Offset; |
- static const int kCheckTypeOffset = kKindSpecificFlags1Offset; |
static const int kFullCodeFlags = kOptimizableOffset + 1; |
class FullCodeFlagsHasDeoptimizationSupportField: |