From 2bcf535a0531d1fb3dd67c4fb9796d05a6075857 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sat, 21 Mar 2020 11:51:26 +0100 Subject: [PATCH] src: simplify IsolateData shortcut accesses PR-URL: https://github.com/nodejs/node/pull/32407 Reviewed-By: Colin Ihrig Reviewed-By: Ben Noordhuis Reviewed-By: David Carlier Reviewed-By: James M Snell Reviewed-By: Matheus Marchini --- src/env-inl.h | 7 +++---- src/env.cc | 4 ++-- src/env.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/env-inl.h b/src/env-inl.h index 558e257c72ec5a..237ab8e438597b 100644 --- a/src/env-inl.h +++ b/src/env-inl.h @@ -1243,9 +1243,8 @@ int64_t Environment::base_object_count() const { #define VS(PropertyName, StringValue) V(v8::String, PropertyName) #define V(TypeName, PropertyName) \ inline \ - v8::Local IsolateData::PropertyName(v8::Isolate* isolate) const { \ - /* Strings are immutable so casting away const-ness here is okay. */ \ - return const_cast(this)->PropertyName ## _.Get(isolate); \ + v8::Local IsolateData::PropertyName() const { \ + return PropertyName ## _ .Get(isolate_); \ } PER_ISOLATE_PRIVATE_SYMBOL_PROPERTIES(VP) PER_ISOLATE_SYMBOL_PROPERTIES(VY) @@ -1260,7 +1259,7 @@ int64_t Environment::base_object_count() const { #define VS(PropertyName, StringValue) V(v8::String, PropertyName) #define V(TypeName, PropertyName) \ inline v8::Local Environment::PropertyName() const { \ - return isolate_data()->PropertyName(isolate()); \ + return isolate_data()->PropertyName(); \ } PER_ISOLATE_PRIVATE_SYMBOL_PROPERTIES(VP) PER_ISOLATE_SYMBOL_PROPERTIES(VY) diff --git a/src/env.cc b/src/env.cc index 850b96d6857fa2..9b5c2776b1399a 100644 --- a/src/env.cc +++ b/src/env.cc @@ -181,12 +181,12 @@ IsolateData::IsolateData(Isolate* isolate, void IsolateData::MemoryInfo(MemoryTracker* tracker) const { #define V(PropertyName, StringValue) \ - tracker->TrackField(#PropertyName, PropertyName(isolate())); + tracker->TrackField(#PropertyName, PropertyName()); PER_ISOLATE_SYMBOL_PROPERTIES(V) #undef V #define V(PropertyName, StringValue) \ - tracker->TrackField(#PropertyName, PropertyName(isolate())); + tracker->TrackField(#PropertyName, PropertyName()); PER_ISOLATE_STRING_PROPERTIES(V) #undef V diff --git a/src/env.h b/src/env.h index 0351af5dea0491..e3d651daac1c07 100644 --- a/src/env.h +++ b/src/env.h @@ -500,7 +500,7 @@ class IsolateData : public MemoryRetainer { #define VY(PropertyName, StringValue) V(v8::Symbol, PropertyName) #define VS(PropertyName, StringValue) V(v8::String, PropertyName) #define V(TypeName, PropertyName) \ - inline v8::Local PropertyName(v8::Isolate* isolate) const; + inline v8::Local PropertyName() const; PER_ISOLATE_PRIVATE_SYMBOL_PROPERTIES(VP) PER_ISOLATE_SYMBOL_PROPERTIES(VY) PER_ISOLATE_STRING_PROPERTIES(VS)