From 9136dd8088a95484b059a0301b25235510fc2882 Mon Sep 17 00:00:00 2001 From: Dan Elphick Date: Fri, 28 Sep 2018 15:17:10 +0100 Subject: [PATCH] Put back deleted V8_DEPRECATE_SOON methods This partially reverts https://chromium-review.googlesource.com/c/v8/v8/+/1177861, which deleted many V8_DEPRECATE_SOON methods rather than moving them to V8_DEPRECATED first. This puts them back and marks them V8_DEPRECATED. Note V8_DEPRECATED that were deleted in the same CL stay deleted. NOTRY=true NOPRESUBMIT=true NOTREECHECKS=true Bug: v8:7786, v8:8240 Cq-Include-Trybots: luci.chromium.try:linux_chromium_rel_ng Change-Id: I00330036d957f98dab403465b25e30d8382aac22 Reviewed-on: https://chromium-review.googlesource.com/1251422 Commit-Queue: Dan Elphick Reviewed-by: Yang Guo Reviewed-by: Michael Hablich Cr-Commit-Position: refs/branch-heads/7.0@{#49} Cr-Branched-From: 6e2adae6f7f8e891cfd01f3280482b20590427a6-refs/heads/7.0.276@{#1} Cr-Branched-From: bc08a8624cbbea7a2d30071472bc73ad9544eadf-refs/heads/master@{#55424} --- include/v8.h | 55 +++++++++++++++++++++++ src/api.cc | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+) diff --git a/include/v8.h b/include/v8.h index 63edc67edfd9..a83305560c2e 100644 --- a/include/v8.h +++ b/include/v8.h @@ -1125,6 +1125,10 @@ class V8_EXPORT PrimitiveArray { int Length() const; void Set(Isolate* isolate, int index, Local item); Local Get(Isolate* isolate, int index); + + V8_DEPRECATED("Use Isolate version", + void Set(int index, Local item)); + V8_DEPRECATED("Use Isolate version", Local Get(int index)); }; /** @@ -1829,6 +1833,8 @@ class V8_EXPORT StackTrace { /** * Returns a StackFrame at a particular index. */ + V8_DEPRECATED("Use Isolate version", + Local GetFrame(uint32_t index) const); Local GetFrame(Isolate* isolate, uint32_t index) const; /** @@ -2537,6 +2543,11 @@ class V8_EXPORT Value : public Data { V8_DEPRECATE_SOON("Use maybe version", Local ToInt32(Isolate* isolate) const); + inline V8_DEPRECATED("Use maybe version", Local ToBoolean() const); + inline V8_DEPRECATED("Use maybe version", Local ToString() const); + inline V8_DEPRECATED("Use maybe version", Local ToObject() const); + inline V8_DEPRECATED("Use maybe version", Local ToInteger() const); + /** * Attempts to convert a string to an array index. * Returns an empty handle if the conversion fails. @@ -2552,7 +2563,14 @@ class V8_EXPORT Value : public Data { Local context) const; V8_WARN_UNUSED_RESULT Maybe Int32Value(Local context) const; + V8_DEPRECATED("Use maybe version", bool BooleanValue() const); + V8_DEPRECATED("Use maybe version", double NumberValue() const); + V8_DEPRECATED("Use maybe version", int64_t IntegerValue() const); + V8_DEPRECATED("Use maybe version", uint32_t Uint32Value() const); + V8_DEPRECATED("Use maybe version", int32_t Int32Value() const); + /** JS == */ + V8_DEPRECATED("Use maybe version", bool Equals(Local that) const); V8_WARN_UNUSED_RESULT Maybe Equals(Local context, Local that) const; bool StrictEquals(Local that) const; @@ -2659,6 +2677,8 @@ class V8_EXPORT String : public Name { * Returns the number of bytes in the UTF-8 encoded * representation of this string. */ + V8_DEPRECATED("Use Isolate version instead", int Utf8Length() const); + int Utf8Length(Isolate* isolate) const; /** @@ -2715,12 +2735,23 @@ class V8_EXPORT String : public Name { // 16-bit character codes. int Write(Isolate* isolate, uint16_t* buffer, int start = 0, int length = -1, int options = NO_OPTIONS) const; + V8_DEPRECATED("Use Isolate* version", + int Write(uint16_t* buffer, int start = 0, int length = -1, + int options = NO_OPTIONS) const); // One byte characters. int WriteOneByte(Isolate* isolate, uint8_t* buffer, int start = 0, int length = -1, int options = NO_OPTIONS) const; + V8_DEPRECATED("Use Isolate* version", + int WriteOneByte(uint8_t* buffer, int start = 0, + int length = -1, int options = NO_OPTIONS) + const); // UTF-8 encoded characters. int WriteUtf8(Isolate* isolate, char* buffer, int length = -1, int* nchars_ref = NULL, int options = NO_OPTIONS) const; + V8_DEPRECATED("Use Isolate* version", + int WriteUtf8(char* buffer, int length = -1, + int* nchars_ref = NULL, int options = NO_OPTIONS) + const); /** * A zero length string. @@ -2884,6 +2915,9 @@ class V8_EXPORT String : public Name { */ static Local Concat(Isolate* isolate, Local left, Local right); + static V8_DEPRECATED("Use Isolate* version", + Local Concat(Local left, + Local right)); /** * Creates a new external string using the data defined in the given @@ -5217,6 +5251,8 @@ class V8_EXPORT BooleanObject : public Object { class V8_EXPORT StringObject : public Object { public: static Local New(Isolate* isolate, Local value); + static V8_DEPRECATED("Use Isolate* version", + Local New(Local value)); Local ValueOf() const; @@ -10215,6 +10251,25 @@ template Value* Value::Cast(T* value) { return static_cast(value); } +Local Value::ToBoolean() const { + return ToBoolean(Isolate::GetCurrent()->GetCurrentContext()) + .FromMaybe(Local()); +} + +Local Value::ToString() const { + return ToString(Isolate::GetCurrent()->GetCurrentContext()) + .FromMaybe(Local()); +} + +Local Value::ToObject() const { + return ToObject(Isolate::GetCurrent()->GetCurrentContext()) + .FromMaybe(Local()); +} + +Local Value::ToInteger() const { + return ToInteger(Isolate::GetCurrent()->GetCurrentContext()) + .FromMaybe(Local()); +} Boolean* Boolean::Cast(v8::Value* value) { #ifdef V8_ENABLE_CHECKS diff --git a/src/api.cc b/src/api.cc index d141496c5749..4eb31a447c3d 100644 --- a/src/api.cc +++ b/src/api.cc @@ -219,6 +219,28 @@ Local ContextFromNeverReadOnlySpaceObject( return reinterpret_cast(obj->GetIsolate())->GetCurrentContext(); } +// TODO(delphick): Remove this completely when the deprecated functions that use +// it are removed. +// DO NOT USE THIS IN NEW CODE! +i::Isolate* UnsafeIsolateFromHeapObject(i::Handle obj) { + // Use MemoryChunk directly instead of Isolate::FromWritableHeapObject to + // temporarily allow isolate access from read-only space objects. + i::MemoryChunk* chunk = i::MemoryChunk::FromHeapObject(*obj); + return chunk->heap()->isolate(); +} + +// TODO(delphick): Remove this completely when the deprecated functions that use +// it are removed. +// DO NOT USE THIS IN NEW CODE! +Local UnsafeContextFromHeapObject(i::Handle obj) { + // Use MemoryChunk directly instead of Isolate::FromWritableHeapObject to + // temporarily allow isolate access from read-only space objects. + i::MemoryChunk* chunk = + i::MemoryChunk::FromHeapObject(i::HeapObject::cast(*obj)); + return reinterpret_cast(chunk->heap()->isolate()) + ->GetCurrentContext(); +} + class InternalEscapableScope : public v8::EscapableHandleScope { public: explicit inline InternalEscapableScope(i::Isolate* isolate) @@ -2170,6 +2192,12 @@ void PrimitiveArray::Set(Isolate* v8_isolate, int index, array->set(index, *i_item); } +void PrimitiveArray::Set(int index, Local item) { + i::Handle array = Utils::OpenHandle(this); + i::Isolate* isolate = UnsafeIsolateFromHeapObject(array); + Set(reinterpret_cast(isolate), index, item); +} + Local PrimitiveArray::Get(Isolate* v8_isolate, int index) { i::Isolate* isolate = reinterpret_cast(v8_isolate); i::Handle array = Utils::OpenHandle(this); @@ -2182,6 +2210,12 @@ Local PrimitiveArray::Get(Isolate* v8_isolate, int index) { return ToApiHandle(i_item); } +Local PrimitiveArray::Get(int index) { + i::Handle array = Utils::OpenHandle(this); + i::Isolate* isolate = UnsafeIsolateFromHeapObject(array); + return Get(reinterpret_cast(isolate), index); +} + Module::Status Module::GetStatus() const { i::Handle self = Utils::OpenHandle(this); switch (self->status()) { @@ -2910,6 +2944,11 @@ Local StackTrace::GetFrame(Isolate* v8_isolate, return scope.Escape(Utils::StackFrameToLocal(info)); } +Local StackTrace::GetFrame(uint32_t index) const { + i::Isolate* isolate = UnsafeIsolateFromHeapObject(Utils::OpenHandle(this)); + return GetFrame(reinterpret_cast(isolate), index); +} + int StackTrace::GetFrameCount() const { return Utils::OpenHandle(this)->length(); } @@ -3881,6 +3920,14 @@ Maybe Value::BooleanValue(Local context) const { return Just(Utils::OpenHandle(this)->BooleanValue(isolate)); } +bool Value::BooleanValue() const { + auto obj = Utils::OpenHandle(this); + if (obj->IsSmi()) return *obj != i::Smi::kZero; + DCHECK(obj->IsHeapObject()); + i::Isolate* isolate = + UnsafeIsolateFromHeapObject(i::Handle::cast(obj)); + return obj->BooleanValue(isolate); +} Maybe Value::NumberValue(Local context) const { auto obj = Utils::OpenHandle(this); @@ -3894,6 +3941,12 @@ Maybe Value::NumberValue(Local context) const { return Just(num->Number()); } +double Value::NumberValue() const { + auto obj = Utils::OpenHandle(this); + if (obj->IsNumber()) return obj->Number(); + return NumberValue(UnsafeContextFromHeapObject(obj)) + .FromMaybe(std::numeric_limits::quiet_NaN()); +} Maybe Value::IntegerValue(Local context) const { auto obj = Utils::OpenHandle(this); @@ -3909,6 +3962,17 @@ Maybe Value::IntegerValue(Local context) const { return Just(NumberToInt64(*num)); } +int64_t Value::IntegerValue() const { + auto obj = Utils::OpenHandle(this); + if (obj->IsNumber()) { + if (obj->IsSmi()) { + return i::Smi::ToInt(*obj); + } else { + return static_cast(obj->Number()); + } + } + return IntegerValue(UnsafeContextFromHeapObject(obj)).FromMaybe(0); +} Maybe Value::Int32Value(Local context) const { auto obj = Utils::OpenHandle(this); @@ -3923,6 +3987,11 @@ Maybe Value::Int32Value(Local context) const { : static_cast(num->Number())); } +int32_t Value::Int32Value() const { + auto obj = Utils::OpenHandle(this); + if (obj->IsNumber()) return NumberToInt32(*obj); + return Int32Value(UnsafeContextFromHeapObject(obj)).FromMaybe(0); +} Maybe Value::Uint32Value(Local context) const { auto obj = Utils::OpenHandle(this); @@ -3937,6 +4006,11 @@ Maybe Value::Uint32Value(Local context) const { : static_cast(num->Number())); } +uint32_t Value::Uint32Value() const { + auto obj = Utils::OpenHandle(this); + if (obj->IsNumber()) return NumberToUint32(*obj); + return Uint32Value(UnsafeContextFromHeapObject(obj)).FromMaybe(0); +} MaybeLocal Value::ToArrayIndex(Local context) const { auto self = Utils::OpenHandle(this); @@ -3971,6 +4045,19 @@ Maybe Value::Equals(Local context, Local that) const { return i::Object::Equals(isolate, self, other); } +bool Value::Equals(Local that) const { + auto self = Utils::OpenHandle(this); + auto other = Utils::OpenHandle(*that); + if (self->IsSmi() && other->IsSmi()) { + return self->Number() == other->Number(); + } + if (self->IsJSObject() && other->IsJSObject()) { + return *self == *other; + } + auto heap_object = self->IsSmi() ? other : self; + auto context = UnsafeContextFromHeapObject(heap_object); + return Equals(context, that).FromMaybe(false); +} bool Value::StrictEquals(Local that) const { auto self = Utils::OpenHandle(this); @@ -5295,6 +5382,11 @@ bool String::ContainsOnlyOneByte() const { return helper.Check(*str); } +int String::Utf8Length() const { + i::Isolate* isolate = UnsafeIsolateFromHeapObject(Utils::OpenHandle(this)); + return Utf8Length(reinterpret_cast(isolate)); +} + int String::Utf8Length(Isolate* isolate) const { i::Handle str = Utils::OpenHandle(this); str = i::String::Flatten(reinterpret_cast(isolate), str); @@ -5563,6 +5655,14 @@ int String::WriteUtf8(Isolate* v8_isolate, char* buffer, int capacity, return writer.CompleteWrite(write_null, nchars_ref); } +int String::WriteUtf8(char* buffer, int capacity, int* nchars_ref, + int options) const { + i::Handle str = Utils::OpenHandle(this); + i::Isolate* isolate = UnsafeIsolateFromHeapObject(str); + return WriteUtf8(reinterpret_cast(isolate), buffer, capacity, + nchars_ref, options); +} + template static inline int WriteHelper(i::Isolate* isolate, const String* string, CharType* buffer, int start, int length, @@ -5584,6 +5684,11 @@ static inline int WriteHelper(i::Isolate* isolate, const String* string, return end - start; } +int String::WriteOneByte(uint8_t* buffer, int start, int length, + int options) const { + i::Isolate* isolate = UnsafeIsolateFromHeapObject(Utils::OpenHandle(this)); + return WriteHelper(isolate, this, buffer, start, length, options); +} int String::WriteOneByte(Isolate* isolate, uint8_t* buffer, int start, int length, int options) const { @@ -5591,6 +5696,10 @@ int String::WriteOneByte(Isolate* isolate, uint8_t* buffer, int start, start, length, options); } +int String::Write(uint16_t* buffer, int start, int length, int options) const { + i::Isolate* isolate = UnsafeIsolateFromHeapObject(Utils::OpenHandle(this)); + return WriteHelper(isolate, this, buffer, start, length, options); +} int String::Write(Isolate* isolate, uint16_t* buffer, int start, int length, int options) const { @@ -6549,6 +6658,12 @@ Local v8::String::Concat(Isolate* v8_isolate, Local left, return Utils::ToLocal(result); } +Local v8::String::Concat(Local left, Local right) { + i::Handle left_string = Utils::OpenHandle(*left); + i::Isolate* isolate = UnsafeIsolateFromHeapObject(left_string); + return Concat(reinterpret_cast(isolate), left, right); +} + MaybeLocal v8::String::NewExternalTwoByte( Isolate* isolate, v8::String::ExternalStringResource* resource) { CHECK(resource && resource->data()); @@ -6757,6 +6872,11 @@ bool v8::BooleanObject::ValueOf() const { return jsvalue->value()->IsTrue(isolate); } +Local v8::StringObject::New(Local value) { + i::Handle string = Utils::OpenHandle(*value); + i::Isolate* isolate = UnsafeIsolateFromHeapObject(string); + return New(reinterpret_cast(isolate), value); +} Local v8::StringObject::New(Isolate* v8_isolate, Local value) {