| Index: src/objects.h
|
| diff --git a/src/objects.h b/src/objects.h
|
| index 526760afff9c1a04abc120f69fc8ed0e4a23204c..fff3a03a10527f9b48b7f19270d40b7a57883aae 100644
|
| --- a/src/objects.h
|
| +++ b/src/objects.h
|
| @@ -1396,17 +1396,8 @@ class Object {
|
| bool ToInt32(int32_t* value);
|
| bool ToUint32(uint32_t* value);
|
|
|
| - // Indicates whether OptimalRepresentation can do its work, or whether it
|
| - // always has to return Representation::Tagged().
|
| - enum ValueType {
|
| - OPTIMAL_REPRESENTATION,
|
| - FORCE_TAGGED
|
| - };
|
| -
|
| - inline Representation OptimalRepresentation(
|
| - ValueType type = OPTIMAL_REPRESENTATION) {
|
| + inline Representation OptimalRepresentation() {
|
| if (!FLAG_track_fields) return Representation::Tagged();
|
| - if (type == FORCE_TAGGED) return Representation::Tagged();
|
| if (IsSmi()) {
|
| return Representation::Smi();
|
| } else if (FLAG_track_double_fields && IsHeapNumber()) {
|
| @@ -2147,7 +2138,6 @@ class JSObject: public JSReceiver {
|
| Handle<Name> key,
|
| Handle<Object> value,
|
| PropertyAttributes attributes,
|
| - ValueType value_type = OPTIMAL_REPRESENTATION,
|
| StoreMode mode = ALLOW_AS_CONSTANT,
|
| ExtensibilityCheck extensibility_check = PERFORM_EXTENSIBILITY_CHECK,
|
| StoreFromKeyed store_mode = MAY_BE_STORE_FROM_KEYED,
|
| @@ -2157,7 +2147,6 @@ class JSObject: public JSReceiver {
|
| Handle<Name> key,
|
| Handle<Object> value,
|
| PropertyAttributes attributes,
|
| - ValueType value_type = OPTIMAL_REPRESENTATION,
|
| StoreMode mode = ALLOW_AS_CONSTANT);
|
|
|
| // Extend the receiver with a single fast property appeared first in the
|
| @@ -2499,7 +2488,7 @@ class JSObject: public JSReceiver {
|
| // Copy object.
|
| enum DeepCopyHints {
|
| kNoHints = 0,
|
| - kObjectIsShallowArray = 1
|
| + kObjectIsShallow = 1
|
| };
|
|
|
| static Handle<JSObject> Copy(Handle<JSObject> object);
|
| @@ -2765,7 +2754,6 @@ class JSObject: public JSReceiver {
|
| StrictMode strict_mode,
|
| StoreFromKeyed store_mode = MAY_BE_STORE_FROM_KEYED,
|
| ExtensibilityCheck extensibility_check = PERFORM_EXTENSIBILITY_CHECK,
|
| - ValueType value_type = OPTIMAL_REPRESENTATION,
|
| StoreMode mode = ALLOW_AS_CONSTANT,
|
| TransitionFlag flag = INSERT_TRANSITION);
|
|
|
| @@ -2775,7 +2763,6 @@ class JSObject: public JSReceiver {
|
| Handle<Object> value,
|
| PropertyAttributes attributes,
|
| StoreFromKeyed store_mode,
|
| - ValueType value_type,
|
| TransitionFlag flag);
|
|
|
| // Add a property to a slow-case object.
|
|
|