Skip to content

Commit 46c241e

Browse files
isheludkoV8 LUCI CQ
isheludko
authored and
V8 LUCI CQ
committed
[api][cleanup] Deprecate accessor callbacks with Local<String>
It's been a while since a more generic accessor callbacks accepting Local<Name> were introduced, so it's time to deprecate the old ones. This CL deprecates v8::Template::SetNativeDataProperty(v8::Local<v8::String>, ...); v8::ObjectTemplate::SetAccessor(v8::Local<v8::String>, ...); Bug: chromium:326505377 Change-Id: Ie2d10de0625d64d40ea526fa05e94dc8fdf5fe51 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5344409 Reviewed-by: Camillo Bruni <[email protected]> Commit-Queue: Igor Sheludko <[email protected]> Cr-Commit-Position: refs/heads/main@{#92668}
1 parent 5761762 commit 46c241e

18 files changed

Lines changed: 109 additions & 171 deletions

‎include/v8-template.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ class V8_EXPORT Template : public Data {
9494
PropertyAttribute attribute, AccessControl settings,
9595
SideEffectType getter_side_effect_type = SideEffectType::kHasSideEffect,
9696
SideEffectType setter_side_effect_type = SideEffectType::kHasSideEffect);
97+
V8_DEPRECATE_SOON("Use SetNativeDataProperty with Local<Name> instead")
9798
void SetNativeDataProperty(
9899
Local<String> name, AccessorGetterCallback getter,
99100
AccessorSetterCallback setter = nullptr,
@@ -611,7 +612,8 @@ enum class PropertyHandlerFlags {
611612
*/
612613
kNone = 0,
613614

614-
/** Will not call into interceptor for properties on the receiver or prototype
615+
/**
616+
* Will not call into interceptor for properties on the receiver or prototype
615617
* chain, i.e., only call into interceptor for properties that do not exist.
616618
* Currently only valid for named interceptors.
617619
*/
@@ -804,6 +806,7 @@ class V8_EXPORT ObjectTemplate : public Template {
804806
* \param attribute The attributes of the property for which an accessor
805807
* is added.
806808
*/
809+
V8_DEPRECATE_SOON("Use SetAccessor with Local<Name> instead")
807810
void SetAccessor(
808811
Local<String> name, AccessorGetterCallback getter,
809812
AccessorSetterCallback setter = nullptr,

‎samples/process.cc‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ class JsHttpRequestProcessor : public HttpRequestProcessor {
140140
static Local<ObjectTemplate> MakeMapTemplate(Isolate* isolate);
141141

142142
// Callbacks that access the individual fields of request objects.
143-
static void GetPath(Local<String> name,
143+
static void GetPath(Local<Name> name,
144144
const PropertyCallbackInfo<Value>& info);
145-
static void GetReferrer(Local<String> name,
145+
static void GetReferrer(Local<Name> name,
146146
const PropertyCallbackInfo<Value>& info);
147-
static void GetHost(Local<String> name,
147+
static void GetHost(Local<Name> name,
148148
const PropertyCallbackInfo<Value>& info);
149-
static void GetUserAgent(Local<String> name,
149+
static void GetUserAgent(Local<Name> name,
150150
const PropertyCallbackInfo<Value>& info);
151151

152152
// Callbacks that access maps
@@ -507,8 +507,7 @@ HttpRequest* JsHttpRequestProcessor::UnwrapRequest(Local<Object> obj) {
507507
return static_cast<HttpRequest*>(ptr);
508508
}
509509

510-
511-
void JsHttpRequestProcessor::GetPath(Local<String> name,
510+
void JsHttpRequestProcessor::GetPath(Local<Name> name,
512511
const PropertyCallbackInfo<Value>& info) {
513512
// Extract the C++ request object from the JavaScript wrapper.
514513
HttpRequest* request = UnwrapRequest(info.Holder());
@@ -523,10 +522,8 @@ void JsHttpRequestProcessor::GetPath(Local<String> name,
523522
static_cast<int>(path.length())).ToLocalChecked());
524523
}
525524

526-
527525
void JsHttpRequestProcessor::GetReferrer(
528-
Local<String> name,
529-
const PropertyCallbackInfo<Value>& info) {
526+
Local<Name> name, const PropertyCallbackInfo<Value>& info) {
530527
HttpRequest* request = UnwrapRequest(info.Holder());
531528
const string& path = request->Referrer();
532529
info.GetReturnValue().Set(
@@ -535,8 +532,7 @@ void JsHttpRequestProcessor::GetReferrer(
535532
static_cast<int>(path.length())).ToLocalChecked());
536533
}
537534

538-
539-
void JsHttpRequestProcessor::GetHost(Local<String> name,
535+
void JsHttpRequestProcessor::GetHost(Local<Name> name,
540536
const PropertyCallbackInfo<Value>& info) {
541537
HttpRequest* request = UnwrapRequest(info.Holder());
542538
const string& path = request->Host();
@@ -546,10 +542,8 @@ void JsHttpRequestProcessor::GetHost(Local<String> name,
546542
static_cast<int>(path.length())).ToLocalChecked());
547543
}
548544

549-
550545
void JsHttpRequestProcessor::GetUserAgent(
551-
Local<String> name,
552-
const PropertyCallbackInfo<Value>& info) {
546+
Local<Name> name, const PropertyCallbackInfo<Value>& info) {
553547
HttpRequest* request = UnwrapRequest(info.Holder());
554548
const string& path = request->UserAgent();
555549
info.GetReturnValue().Set(
@@ -558,7 +552,6 @@ void JsHttpRequestProcessor::GetUserAgent(
558552
static_cast<int>(path.length())).ToLocalChecked());
559553
}
560554

561-
562555
Local<ObjectTemplate> JsHttpRequestProcessor::MakeRequestTemplate(
563556
Isolate* isolate) {
564557
EscapableHandleScope handle_scope(isolate);

‎src/d8/d8.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2193,7 +2193,7 @@ void Shell::RealmEval(const v8::FunctionCallbackInfo<v8::Value>& info) {
21932193
}
21942194

21952195
// Realm.shared is an accessor for a single shared value across realms.
2196-
void Shell::RealmSharedGet(Local<String> property,
2196+
void Shell::RealmSharedGet(Local<Name> property,
21972197
const PropertyCallbackInfo<Value>& info) {
21982198
DCHECK(i::ValidateCallbackInfo(info));
21992199
Isolate* isolate = info.GetIsolate();
@@ -2202,7 +2202,7 @@ void Shell::RealmSharedGet(Local<String> property,
22022202
info.GetReturnValue().Set(data->realm_shared_);
22032203
}
22042204

2205-
void Shell::RealmSharedSet(Local<String> property, Local<Value> value,
2205+
void Shell::RealmSharedSet(Local<Name> property, Local<Value> value,
22062206
const PropertyCallbackInfo<void>& info) {
22072207
DCHECK(i::ValidateCallbackInfo(info));
22082208
Isolate* isolate = info.GetIsolate();

‎src/d8/d8.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,9 +554,9 @@ class Shell : public i::AllStatic {
554554
static void RealmDispose(const v8::FunctionCallbackInfo<v8::Value>& info);
555555
static void RealmSwitch(const v8::FunctionCallbackInfo<v8::Value>& info);
556556
static void RealmEval(const v8::FunctionCallbackInfo<v8::Value>& info);
557-
static void RealmSharedGet(Local<String> property,
557+
static void RealmSharedGet(Local<Name> property,
558558
const PropertyCallbackInfo<Value>& info);
559-
static void RealmSharedSet(Local<String> property, Local<Value> value,
559+
static void RealmSharedSet(Local<Name> property, Local<Value> value,
560560
const PropertyCallbackInfo<void>& info);
561561

562562
static void LogGetAndStop(const v8::FunctionCallbackInfo<v8::Value>& info);

‎test/cctest/test-accessors.cc‎

Lines changed: 19 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,18 @@ using ::v8::Script;
4444
using ::v8::Function;
4545
using ::v8::Extension;
4646

47-
static void handle_property(Local<String> name,
47+
static void handle_property(Local<Name> name,
4848
const v8::PropertyCallbackInfo<v8::Value>& info) {
4949
ApiTestFuzzer::Fuzz();
5050
info.GetReturnValue().Set(v8_num(900));
5151
}
5252

53-
static void handle_property_2(Local<String> name,
53+
static void handle_property_2(Local<Name> name,
5454
const v8::PropertyCallbackInfo<v8::Value>& info) {
5555
ApiTestFuzzer::Fuzz();
5656
info.GetReturnValue().Set(v8_num(902));
5757
}
5858

59-
6059
static void handle_property(const v8::FunctionCallbackInfo<v8::Value>& info) {
6160
ApiTestFuzzer::Fuzz();
6261
CHECK_EQ(0, info.Length());
@@ -145,17 +144,14 @@ THREADED_TEST(PropertyHandler) {
145144
}
146145
}
147146

148-
149-
static void GetIntValue(Local<String> property,
147+
static void GetIntValue(Local<Name> property,
150148
const v8::PropertyCallbackInfo<v8::Value>& info) {
151149
ApiTestFuzzer::Fuzz();
152150
int* value = static_cast<int*>(info.Data().As<v8::External>()->Value());
153151
info.GetReturnValue().Set(v8_num(*value));
154152
}
155153

156-
157-
static void SetIntValue(Local<String> property,
158-
Local<Value> value,
154+
static void SetIntValue(Local<Name> property, Local<Value> value,
159155
const v8::PropertyCallbackInfo<void>& info) {
160156
int* field = static_cast<int*>(info.Data().As<v8::External>()->Value());
161157
*field = value->Int32Value(info.GetIsolate()->GetCurrentContext()).FromJust();
@@ -200,8 +196,7 @@ static void XGetter(const Info& info, int offset) {
200196
info.GetReturnValue().Set(v8_num(x_register[offset]));
201197
}
202198

203-
204-
static void XGetter(Local<String> name,
199+
static void XGetter(Local<Name> name,
205200
const v8::PropertyCallbackInfo<v8::Value>& info) {
206201
v8::Isolate* isolate = info.GetIsolate();
207202
CHECK(x_holder_global.Get(isolate)
@@ -210,7 +205,6 @@ static void XGetter(Local<String> name,
210205
XGetter(info, 0);
211206
}
212207

213-
214208
static void XGetter(const v8::FunctionCallbackInfo<v8::Value>& info) {
215209
v8::Isolate* isolate = info.GetIsolate();
216210
CHECK(x_receiver_global.Get(isolate)
@@ -235,14 +229,11 @@ static void XSetter(Local<Value> value, const Info& info, int offset) {
235229
info.GetReturnValue().Set(v8_num(-1));
236230
}
237231

238-
239-
static void XSetter(Local<String> name,
240-
Local<Value> value,
232+
static void XSetter(Local<Name> name, Local<Value> value,
241233
const v8::PropertyCallbackInfo<void>& info) {
242234
XSetter(value, info, 0);
243235
}
244236

245-
246237
static void XSetter(const v8::FunctionCallbackInfo<v8::Value>& info) {
247238
CHECK_EQ(1, info.Length());
248239
XSetter(info[0], info, 1);
@@ -299,11 +290,9 @@ THREADED_TEST(AccessorIC) {
299290
x_receiver_global.Reset();
300291
}
301292

302-
303293
template <int C>
304294
static void HandleAllocatingGetter(
305-
Local<String> name,
306-
const v8::PropertyCallbackInfo<v8::Value>& info) {
295+
Local<Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
307296
ApiTestFuzzer::Fuzz();
308297
for (int i = 0; i < C; i++) {
309298
USE(v8::String::NewFromUtf8Literal(info.GetIsolate(), "foo"));
@@ -312,7 +301,6 @@ static void HandleAllocatingGetter(
312301
v8::String::NewFromUtf8Literal(info.GetIsolate(), "foo"));
313302
}
314303

315-
316304
THREADED_TEST(HandleScopePop) {
317305
LocalContext context;
318306
v8::Isolate* isolate = context->GetIsolate();
@@ -340,8 +328,7 @@ THREADED_TEST(HandleScopePop) {
340328
}
341329

342330
static void CheckAccessorArgsCorrect(
343-
Local<String> name,
344-
const v8::PropertyCallbackInfo<v8::Value>& info) {
331+
Local<Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
345332
CHECK(info.GetIsolate() == CcTest::isolate());
346333
CHECK(info.This() == info.Holder());
347334
CHECK(info.Data()
@@ -362,7 +349,6 @@ static void CheckAccessorArgsCorrect(
362349
info.GetReturnValue().Set(17);
363350
}
364351

365-
366352
THREADED_TEST(DirectCall) {
367353
LocalContext context;
368354
v8::Isolate* isolate = context->GetIsolate();
@@ -383,15 +369,14 @@ THREADED_TEST(DirectCall) {
383369
}
384370
}
385371

386-
static void EmptyGetter(Local<String> name,
372+
static void EmptyGetter(Local<Name> name,
387373
const v8::PropertyCallbackInfo<v8::Value>& info) {
388374
CheckAccessorArgsCorrect(name, info);
389375
ApiTestFuzzer::Fuzz();
390376
CheckAccessorArgsCorrect(name, info);
391377
info.GetReturnValue().Set(v8::Local<v8::Value>());
392378
}
393379

394-
395380
THREADED_TEST(EmptyResult) {
396381
LocalContext context;
397382
v8::Isolate* isolate = context->GetIsolate();
@@ -453,20 +438,16 @@ THREADED_TEST(NoReuseRegress) {
453438
}
454439

455440
static void ThrowingGetAccessor(
456-
Local<String> name,
457-
const v8::PropertyCallbackInfo<v8::Value>& info) {
441+
Local<Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
458442
ApiTestFuzzer::Fuzz();
459443
info.GetIsolate()->ThrowException(v8_str("g"));
460444
}
461445

462-
463-
static void ThrowingSetAccessor(Local<String> name,
464-
Local<Value> value,
446+
static void ThrowingSetAccessor(Local<Name> name, Local<Value> value,
465447
const v8::PropertyCallbackInfo<void>& info) {
466448
info.GetIsolate()->ThrowException(value);
467449
}
468450

469-
470451
THREADED_TEST(Regress1054726) {
471452
LocalContext env;
472453
v8::Isolate* isolate = env->GetIsolate();
@@ -507,14 +488,12 @@ THREADED_TEST(Regress1054726) {
507488
CHECK(v8_str("01234")->Equals(env.local(), result).FromJust());
508489
}
509490

510-
511-
static void AllocGetter(Local<String> name,
491+
static void AllocGetter(Local<Name> name,
512492
const v8::PropertyCallbackInfo<v8::Value>& info) {
513493
ApiTestFuzzer::Fuzz();
514494
info.GetReturnValue().Set(v8::Array::New(info.GetIsolate(), 1000));
515495
}
516496

517-
518497
THREADED_TEST(Gc) {
519498
LocalContext env;
520499
v8::Isolate* isolate = env->GetIsolate();
@@ -536,8 +515,7 @@ THREADED_TEST(Gc) {
536515
.ToLocalChecked();
537516
}
538517

539-
540-
static void StackCheck(Local<String> name,
518+
static void StackCheck(Local<Name> name,
541519
const v8::PropertyCallbackInfo<v8::Value>& info) {
542520
i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
543521
i::StackFrameIterator iter(isolate);
@@ -550,7 +528,6 @@ static void StackCheck(Local<String> name,
550528
}
551529
}
552530

553-
554531
THREADED_TEST(StackIteration) {
555532
LocalContext env;
556533
v8::Isolate* isolate = env->GetIsolate();
@@ -574,16 +551,14 @@ THREADED_TEST(StackIteration) {
574551
.ToLocalChecked();
575552
}
576553

577-
578-
static void AllocateHandles(Local<String> name,
554+
static void AllocateHandles(Local<Name> name,
579555
const v8::PropertyCallbackInfo<v8::Value>& info) {
580556
for (int i = 0; i < i::kHandleBlockSize + 1; i++) {
581557
v8::Local<v8::Value>::New(info.GetIsolate(), name);
582558
}
583559
info.GetReturnValue().Set(v8::Integer::New(info.GetIsolate(), 100));
584560
}
585561

586-
587562
THREADED_TEST(HandleScopeSegment) {
588563
// Check that we can return values past popping of handle scope
589564
// segments.
@@ -705,26 +680,23 @@ THREADED_TEST(GlobalObjectAccessor) {
705680
}
706681
}
707682

708-
709-
static void EmptyGetter(Local<Name> name,
710-
const v8::PropertyCallbackInfo<v8::Value>& info) {
683+
static void EmptyGenericGetter(
684+
Local<Name> name, const v8::PropertyCallbackInfo<v8::Value>& info) {
711685
// The request is not intercepted so don't call ApiTestFuzzer::Fuzz() here.
712686
}
713687

714-
715-
static void OneProperty(Local<String> name,
688+
static void OneProperty(Local<Name> name,
716689
const v8::PropertyCallbackInfo<v8::Value>& info) {
717690
ApiTestFuzzer::Fuzz();
718691
info.GetReturnValue().Set(v8_num(1));
719692
}
720693

721-
722694
THREADED_TEST(Regress433458) {
723695
LocalContext env;
724696
v8::Isolate* isolate = env->GetIsolate();
725697
v8::HandleScope scope(isolate);
726698
v8::Local<v8::ObjectTemplate> obj = ObjectTemplate::New(isolate);
727-
obj->SetHandler(v8::NamedPropertyHandlerConfiguration(EmptyGetter));
699+
obj->SetHandler(v8::NamedPropertyHandlerConfiguration(EmptyGenericGetter));
728700
obj->SetNativeDataProperty(v8_str("prop"), OneProperty);
729701
CHECK(env->Global()
730702
->Set(env.local(), v8_str("obj"),
@@ -828,7 +800,7 @@ TEST(PrototypeGetterAccessCheck) {
828800
}
829801
}
830802

831-
static void CheckReceiver(Local<String> name,
803+
static void CheckReceiver(Local<Name> name,
832804
const v8::PropertyCallbackInfo<v8::Value>& info) {
833805
CHECK(info.This()->IsObject());
834806
}

0 commit comments

Comments
 (0)