AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[turbofan] Restrict the broker's kRetired mode.

Browse Source 
Once the broker retired, only allow retrieval of a reference's
handle. That's all we need for now.

Bug: v8:7790
Change-Id: Ib75887ed4a68e19ad7fad4c6046e340502542850
Reviewed-on: https://chromium-review.googlesource.com/1251086
Reviewed-by: Maya Lekova <mslekova@chromium.org>
Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
Commit-Queue: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#56308}
This commit is contained in:
Georg Neis 2018-09-28 15:44:29 +02:00 committed by Commit Bot
parent 56b6b6a8fa
commit ac972c586e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/js-heap-broker.cc
View File

@ -1379,6 +1379,7 @@ void JSHeapBroker::SetNativeContextRef() {
void JSHeapBroker::SerializeStandardObjects() { void JSHeapBroker::SerializeStandardObjects() {
if (mode() == kDisabled) return; if (mode() == kDisabled) return;
CHECK_EQ(mode(), kSerializing);
TraceScope tracer(this, "JSHeapBroker::SerializeStandardObjects"); TraceScope tracer(this, "JSHeapBroker::SerializeStandardObjects");
@ -1574,7 +1575,7 @@ base::Optional<MapRef> MapRef::AsElementsKind(ElementsKind kind) const {
AllowHandleDereference allow_handle_dereference; AllowHandleDereference allow_handle_dereference;
return MapRef(broker(), Map::AsElementsKind(broker()->isolate(), return MapRef(broker(), Map::AsElementsKind(broker()->isolate(),
object<Map>(), kind)); object<Map>(), kind));
} else { }
if (kind == elements_kind()) return *this; if (kind == elements_kind()) return *this;
const ZoneVector<MapData*>& elements_kind_generalizations = const ZoneVector<MapData*>& elements_kind_generalizations =
data()->AsMap()->elements_kind_generalizations(); data()->AsMap()->elements_kind_generalizations();
@ -1583,7 +1584,6 @@ base::Optional<MapRef> MapRef::AsElementsKind(ElementsKind kind) const {
if (map.elements_kind() == kind) return map; if (map.elements_kind() == kind) return map;
} }
return base::Optional<MapRef>(); return base::Optional<MapRef>();
}
} }
int JSFunctionRef::InitialMapInstanceSizeWithMinSlack() const { int JSFunctionRef::InitialMapInstanceSizeWithMinSlack() const {
@ -2207,7 +2207,7 @@ ObjectRef JSRegExpRef::source() const {
return ObjectRef(broker(), ObjectRef::data()->AsJSRegExp()->source()); return ObjectRef(broker(), ObjectRef::data()->AsJSRegExp()->source());
} }
Handle<Object> ObjectRef::object() const { return data()->object(); } Handle<Object> ObjectRef::object() const { return data_->object(); }
JSHeapBroker* ObjectRef::broker() const { return broker_; } JSHeapBroker* ObjectRef::broker() const { return broker_; }
@ -2221,7 +2221,7 @@ ObjectData* ObjectRef::data() const {
CHECK_NE(data_->kind(), kUnserializedHeapObject); CHECK_NE(data_->kind(), kUnserializedHeapObject);
return data_; return data_;
case JSHeapBroker::kRetired: case JSHeapBroker::kRetired:
return data_; UNREACHABLE();
} }
} }