Revision: 23260
Author: [email protected]
Date: Thu Aug 21 08:16:06 2014 UTC
Log: Get rid of the NONEXISTENT PropertyType
BUG=
Review URL: https://codereview.chromium.org/492433005
http://code.google.com/p/v8/source/detail?r=23260
Modified:
/branches/bleeding_edge/src/bootstrapper.cc
/branches/bleeding_edge/src/heap-snapshot-generator.cc
/branches/bleeding_edge/src/ic.cc
/branches/bleeding_edge/src/lookup.cc
/branches/bleeding_edge/src/lookup.h
/branches/bleeding_edge/src/mirror-debugger.js
/branches/bleeding_edge/src/objects-printer.cc
/branches/bleeding_edge/src/objects.cc
/branches/bleeding_edge/src/property-details.h
/branches/bleeding_edge/src/property.cc
/branches/bleeding_edge/src/property.h
=======================================
--- /branches/bleeding_edge/src/bootstrapper.cc Wed Aug 20 15:08:20 2014 UTC
+++ /branches/bleeding_edge/src/bootstrapper.cc Thu Aug 21 08:16:06 2014 UTC
@@ -2464,7 +2464,6 @@
// Do not occur since the from object has fast properties.
case HANDLER:
case INTERCEPTOR:
- case NONEXISTENT:
// No element in instance descriptors have proxy or interceptor
type.
UNREACHABLE();
break;
=======================================
--- /branches/bleeding_edge/src/heap-snapshot-generator.cc Wed Aug 20
10:37:23 2014 UTC
+++ /branches/bleeding_edge/src/heap-snapshot-generator.cc Thu Aug 21
08:16:06 2014 UTC
@@ -1700,9 +1700,6 @@
case HANDLER: // only in lookup results, not in descriptors
case INTERCEPTOR: // only in lookup results, not in descriptors
break;
- case NONEXISTENT:
- UNREACHABLE();
- break;
}
}
} else {
=======================================
--- /branches/bleeding_edge/src/ic.cc Wed Aug 20 15:08:20 2014 UTC
+++ /branches/bleeding_edge/src/ic.cc Thu Aug 21 08:16:06 2014 UTC
@@ -1597,7 +1597,6 @@
}
case CONSTANT:
break;
- case NONEXISTENT:
case HANDLER:
UNREACHABLE();
break;
=======================================
--- /branches/bleeding_edge/src/lookup.cc Tue Aug 19 17:02:04 2014 UTC
+++ /branches/bleeding_edge/src/lookup.cc Thu Aug 21 08:16:06 2014 UTC
@@ -100,7 +100,6 @@
property_kind_ = ACCESSOR;
break;
case v8::internal::HANDLER:
- case v8::internal::NONEXISTENT:
case v8::internal::INTERCEPTOR:
UNREACHABLE();
}
=======================================
--- /branches/bleeding_edge/src/lookup.h Wed Aug 20 16:25:40 2014 UTC
+++ /branches/bleeding_edge/src/lookup.h Thu Aug 21 08:16:06 2014 UTC
@@ -70,7 +70,7 @@
state_(NOT_FOUND),
property_kind_(DATA),
property_encoding_(DESCRIPTOR),
- property_details_(NONE, NONEXISTENT, Representation::None()),
+ property_details_(NONE, NORMAL, Representation::None()),
isolate_(name->GetIsolate()),
name_(name),
maybe_receiver_(receiver),
@@ -88,7 +88,7 @@
state_(NOT_FOUND),
property_kind_(DATA),
property_encoding_(DESCRIPTOR),
- property_details_(NONE, NONEXISTENT, Representation::None()),
+ property_details_(NONE, NORMAL, Representation::None()),
isolate_(name->GetIsolate()),
name_(name),
holder_map_(holder->map()),
=======================================
--- /branches/bleeding_edge/src/mirror-debugger.js Thu Aug 7 08:36:38 2014
UTC
+++ /branches/bleeding_edge/src/mirror-debugger.js Thu Aug 21 08:16:06 2014
UTC
@@ -179,7 +179,6 @@
PropertyType.Callbacks = 3;
PropertyType.Handler = 4;
PropertyType.Interceptor = 5;
-PropertyType.Nonexistent = 6;
// Different attributes for a property.
=======================================
--- /branches/bleeding_edge/src/objects-printer.cc Tue Aug 12 15:28:20 2014
UTC
+++ /branches/bleeding_edge/src/objects-printer.cc Thu Aug 21 08:16:06 2014
UTC
@@ -242,8 +242,6 @@
case NORMAL: // only in slow mode
case HANDLER: // only in lookup results, not in descriptors
case INTERCEPTOR: // only in lookup results, not in descriptors
- // There are no transitions in the descriptor array.
- case NONEXISTENT:
UNREACHABLE();
break;
}
@@ -377,7 +375,6 @@
case NORMAL:
case HANDLER:
case INTERCEPTOR:
- case NONEXISTENT:
UNREACHABLE();
break;
}
@@ -1107,7 +1104,6 @@
case NORMAL:
case HANDLER:
case INTERCEPTOR:
- case NONEXISTENT:
UNREACHABLE();
break;
}
=======================================
--- /branches/bleeding_edge/src/objects.cc Wed Aug 20 15:25:13 2014 UTC
+++ /branches/bleeding_edge/src/objects.cc Thu Aug 21 08:16:06 2014 UTC
@@ -2774,7 +2774,6 @@
case NORMAL:
case HANDLER:
case INTERCEPTOR:
- case NONEXISTENT:
UNREACHABLE();
}
}
@@ -4264,7 +4263,6 @@
break;
case HANDLER:
case NORMAL:
- case NONEXISTENT:
UNREACHABLE();
break;
}
@@ -6823,7 +6821,6 @@
case NORMAL:
case INTERCEPTOR:
case HANDLER:
- case NONEXISTENT:
break;
}
=======================================
--- /branches/bleeding_edge/src/property-details.h Mon Aug 4 11:34:54 2014
UTC
+++ /branches/bleeding_edge/src/property-details.h Thu Aug 21 08:16:06 2014
UTC
@@ -46,16 +46,14 @@
// A copy of this is in mirror-debugger.js.
enum PropertyType {
// Only in slow mode.
- NORMAL = 0,
+ NORMAL = 0,
// Only in fast mode.
- FIELD = 1,
- CONSTANT = 2,
- CALLBACKS = 3,
+ FIELD = 1,
+ CONSTANT = 2,
+ CALLBACKS = 3,
// Only in lookup results, not in descriptors.
- HANDLER = 4,
- INTERCEPTOR = 5,
- // Only used as a marker in LookupResult.
- NONEXISTENT = 6
+ HANDLER = 4,
+ INTERCEPTOR = 5
};
=======================================
--- /branches/bleeding_edge/src/property.cc Wed Aug 20 10:37:23 2014 UTC
+++ /branches/bleeding_edge/src/property.cc Thu Aug 21 08:16:06 2014 UTC
@@ -47,9 +47,6 @@
return os << " -type = lookup proxy\n";
case INTERCEPTOR:
return os << " -type = lookup interceptor\n";
- case NONEXISTENT:
- UNREACHABLE();
- break;
}
return os;
}
=======================================
--- /branches/bleeding_edge/src/property.h Wed Aug 20 10:37:23 2014 UTC
+++ /branches/bleeding_edge/src/property.h Thu Aug 21 08:16:06 2014 UTC
@@ -120,7 +120,7 @@
holder_(NULL),
transition_(NULL),
cacheable_(true),
- details_(NONE, NONEXISTENT, Representation::None()) {
+ details_(NONE, NORMAL, Representation::None()) {
isolate->set_top_lookup_result(this);
}
@@ -158,8 +158,6 @@
case HANDLER:
case INTERCEPTOR:
return true;
- case NONEXISTENT:
- UNREACHABLE();
}
UNREACHABLE();
return true;
@@ -198,7 +196,7 @@
void NotFound() {
lookup_type_ = NOT_FOUND;
- details_ = PropertyDetails(NONE, NONEXISTENT, Representation::None());
+ details_ = PropertyDetails(NONE, NORMAL, Representation::None());
holder_ = NULL;
transition_ = NULL;
}
@@ -220,13 +218,11 @@
Representation representation() const {
DCHECK(IsFound());
- DCHECK(details_.type() != NONEXISTENT);
return details_.representation();
}
PropertyAttributes GetAttributes() const {
DCHECK(IsFound());
- DCHECK(details_.type() != NONEXISTENT);
return details_.attributes();
}
@@ -247,7 +243,6 @@
bool IsReadOnly() const {
DCHECK(IsFound());
- DCHECK(details_.type() != NONEXISTENT);
return details_.IsReadOnly();
}
--
--
v8-dev mailing list
[email protected]
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 [email protected].
For more options, visit https://groups.google.com/d/optout.
