Commit 2bcf535
src: simplify IsolateData shortcut accesses
PR-URL: #32407
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matheus Marchini <mat@mmarchini.me>1 parent 2fe351f commit 2bcf535
3 files changed
Lines changed: 6 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1243,9 +1243,8 @@ int64_t Environment::base_object_count() const { | |||
| 1243 | 1243 | #define VS(PropertyName, StringValue) V(v8::String, PropertyName) | |
| 1244 | 1244 | #define V(TypeName, PropertyName) \ | |
| 1245 | 1245 | inline \ | |
| 1246 | - v8::Local<TypeName> IsolateData::PropertyName(v8::Isolate* isolate) const { \ | ||
| 1247 | - /* Strings are immutable so casting away const-ness here is okay. */ \ | ||
| 1248 | - return const_cast<IsolateData*>(this)->PropertyName ## _.Get(isolate); \ | ||
| 1246 | + v8::Local<TypeName> IsolateData::PropertyName() const { \ | ||
| 1247 | + return PropertyName ## _ .Get(isolate_); \ | ||
| 1249 | 1248 | } | |
| 1250 | 1249 | PER_ISOLATE_PRIVATE_SYMBOL_PROPERTIES(VP) | |
| 1251 | 1250 | PER_ISOLATE_SYMBOL_PROPERTIES(VY) | |
@@ -1260,7 +1259,7 @@ int64_t Environment::base_object_count() const { | |||
| 1260 | 1259 | #define VS(PropertyName, StringValue) V(v8::String, PropertyName) | |
| 1261 | 1260 | #define V(TypeName, PropertyName) \ | |
| 1262 | 1261 | inline v8::Local<TypeName> Environment::PropertyName() const { \ | |
| 1263 | - return isolate_data()->PropertyName(isolate()); \ | ||
| 1262 | + return isolate_data()->PropertyName(); \ | ||
| 1264 | 1263 | } | |
| 1265 | 1264 | PER_ISOLATE_PRIVATE_SYMBOL_PROPERTIES(VP) | |
| 1266 | 1265 | PER_ISOLATE_SYMBOL_PROPERTIES(VY) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -181,12 +181,12 @@ IsolateData::IsolateData(Isolate* isolate, | |||
| 181 | 181 | ||
| 182 | 182 | void IsolateData::MemoryInfo(MemoryTracker* tracker) const { | |
| 183 | 183 | #define V(PropertyName, StringValue) \ | |
| 184 | - tracker->TrackField(#PropertyName, PropertyName(isolate())); | ||
| 184 | + tracker->TrackField(#PropertyName, PropertyName()); | ||
| 185 | 185 | PER_ISOLATE_SYMBOL_PROPERTIES(V) | |
| 186 | 186 | #undef V | |
| 187 | 187 | ||
| 188 | 188 | #define V(PropertyName, StringValue) \ | |
| 189 | - tracker->TrackField(#PropertyName, PropertyName(isolate())); | ||
| 189 | + tracker->TrackField(#PropertyName, PropertyName()); | ||
| 190 | 190 | PER_ISOLATE_STRING_PROPERTIES(V) | |
| 191 | 191 | #undef V | |
| 192 | 192 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -500,7 +500,7 @@ class IsolateData : public MemoryRetainer { | |||
| 500 | 500 | #define VY(PropertyName, StringValue) V(v8::Symbol, PropertyName) | |
| 501 | 501 | #define VS(PropertyName, StringValue) V(v8::String, PropertyName) | |
| 502 | 502 | #define V(TypeName, PropertyName) \ | |
| 503 | - inline v8::Local<TypeName> PropertyName(v8::Isolate* isolate) const; | ||
| 503 | + inline v8::Local<TypeName> PropertyName() const; | ||
| 504 | 504 | PER_ISOLATE_PRIVATE_SYMBOL_PROPERTIES(VP) | |
| 505 | 505 | PER_ISOLATE_SYMBOL_PROPERTIES(VY) | |
| 506 | 506 | PER_ISOLATE_STRING_PROPERTIES(VS) | |
0 commit comments