summaryrefslogtreecommitdiff
path: root/deps/v8/src
diff options
context:
space:
mode:
authorMichaël Zasso <targos@protonmail.com>2018-11-05 20:02:39 +0100
committerMichaël Zasso <targos@protonmail.com>2018-11-09 12:11:30 +0100
commit9d434db6ef188b19333a716289b73731cd063cb6 (patch)
tree0bf8edb1c93aa81e33bf3f0447a7b03cd75ee392 /deps/v8/src
parent52c548b05d294765f0d2f0e39a9e5552fb007b2f (diff)
downloadandroid-node-v8-9d434db6ef188b19333a716289b73731cd063cb6.tar.gz
android-node-v8-9d434db6ef188b19333a716289b73731cd063cb6.tar.bz2
android-node-v8-9d434db6ef188b19333a716289b73731cd063cb6.zip
deps: patch V8 to 7.0.276.36
Refs: https://github.com/v8/v8/compare/7.0.276.35...7.0.276.36 PR-URL: https://github.com/nodejs/node/pull/24109 Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'deps/v8/src')
-rw-r--r--deps/v8/src/objects.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/deps/v8/src/objects.cc b/deps/v8/src/objects.cc
index d4af74b2bd..811656ad9a 100644
--- a/deps/v8/src/objects.cc
+++ b/deps/v8/src/objects.cc
@@ -10266,15 +10266,22 @@ Handle<DescriptorArray> DescriptorArray::CopyForFastObjectClone(
Name* key = src->GetKey(i);
PropertyDetails details = src->GetDetails(i);
- SLOW_DCHECK(!key->IsPrivateField() && details.IsEnumerable() &&
- details.kind() == kData);
+ DCHECK(!key->IsPrivateField());
+ DCHECK(details.IsEnumerable());
+ DCHECK_EQ(details.kind(), kData);
// Ensure the ObjectClone property details are NONE, and that all source
// details did not contain DONT_ENUM.
PropertyDetails new_details(kData, NONE, details.location(),
details.constness(), details.representation(),
details.field_index());
- descriptors->Set(i, key, src->GetValue(i), new_details);
+ // Do not propagate the field type of normal object fields from the
+ // original descriptors since FieldType changes don't create new maps.
+ MaybeObject* type = src->GetValue(i);
+ if (details.location() == PropertyLocation::kField) {
+ type = MaybeObject::FromObject(FieldType::Any());
+ }
+ descriptors->Set(i, key, type, new_details);
}
descriptors->Sort();