Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/src/lookup.h b/src/lookup.h
index bb65639..f1a1b7c 100644
--- a/src/lookup.h
+++ b/src/lookup.h
@@ -176,6 +176,7 @@
Handle<Object> GetReceiver() const { return receiver_; }
Handle<JSObject> GetStoreTarget() const {
+ DCHECK(receiver_->IsJSObject());
if (receiver_->IsJSGlobalProxy()) {
Map* map = JSGlobalProxy::cast(*receiver_)->map();
if (map->has_hidden_prototype()) {
@@ -257,15 +258,15 @@
: GetInterceptor<false>(JSObject::cast(*holder_));
return handle(result, isolate_);
}
+ Handle<InterceptorInfo> GetInterceptorForFailedAccessCheck() const;
Handle<Object> GetDataValue() const;
void WriteDataValue(Handle<Object> value);
inline void UpdateProtector() {
if (IsElement()) return;
if (*name_ == heap()->is_concat_spreadable_symbol() ||
- (FLAG_harmony_species && (*name_ == heap()->constructor_string() ||
- *name_ == heap()->species_symbol())) ||
- (FLAG_harmony_instanceof &&
- (*name_ == heap()->has_instance_symbol()))) {
+ *name_ == heap()->constructor_string() ||
+ *name_ == heap()->species_symbol() ||
+ *name_ == heap()->has_instance_symbol()) {
InternalUpdateProtector();
}
}