diff options
Diffstat (limited to 'chromium/v8/src/compiler/types.cc')
| -rw-r--r-- | chromium/v8/src/compiler/types.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/chromium/v8/src/compiler/types.cc b/chromium/v8/src/compiler/types.cc index 236cff3cc68..5c6a4f7db94 100644 --- a/chromium/v8/src/compiler/types.cc +++ b/chromium/v8/src/compiler/types.cc @@ -6,6 +6,7 @@ #include <iomanip> +#include "src/compiler/js-heap-broker.h" #include "src/handles/handles-inl.h" #include "src/objects/instance-type.h" #include "src/objects/objects-inl.h" @@ -837,7 +838,14 @@ Type Type::Constant(double value, Zone* zone) { } Type Type::Constant(JSHeapBroker* broker, Handle<i::Object> value, Zone* zone) { - ObjectRef ref(broker, value); + // TODO(jgruber,chromium:1209798): Using kAssumeMemoryFence works around + // the fact that the graph stores handles (and not refs). The assumption is + // that any handle inserted into the graph is safe to read; but we don't + // preserve the reason why it is safe to read. Thus we must over-approximate + // here and assume the existence of a memory fence. In the future, we should + // consider having the graph store ObjectRefs or ObjectData pointer instead, + // which would make new ref construction here unnecessary. + ObjectRef ref = MakeRefAssumeMemoryFence(broker, value); if (ref.IsSmi()) { return Constant(static_cast<double>(ref.AsSmi()), zone); } @@ -969,8 +977,7 @@ const char* BitsetType::Name(bitset bits) { } } -void BitsetType::Print(std::ostream& os, // NOLINT - bitset bits) { +void BitsetType::Print(std::ostream& os, bitset bits) { DisallowGarbageCollection no_gc; const char* name = Name(bits); if (name != nullptr) { |