summaryrefslogtreecommitdiff
path: root/src/node_internals.h
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2018-05-01 18:34:52 +0200
committerAnna Henningsen <anna@addaleax.net>2018-05-04 00:57:39 +0200
commitbd201102862a194f3f5ce669e0a3c8143eafc900 (patch)
tree22c86fcd4bff3716704c981f14fa80c3a6dd0d6b /src/node_internals.h
parenta9b0d8235d5ae11a5ae0748f05c4d290a848f1b9 (diff)
downloadandroid-node-v8-bd201102862a194f3f5ce669e0a3c8143eafc900.tar.gz
android-node-v8-bd201102862a194f3f5ce669e0a3c8143eafc900.tar.bz2
android-node-v8-bd201102862a194f3f5ce669e0a3c8143eafc900.zip
src: refactor `BaseObject` internal field management
- Instead of storing a pointer whose type refers to the specific subclass of `BaseObject`, just store a `BaseObject*` directly. This means in particular that one can cast to classes along the way of the inheritance chain without issues, and that `BaseObject*` no longer needs to be the first superclass in the case of multiple inheritance. In particular, this renders hack-y solutions to this problem (like ddc19be6de1ba263d9c175b2760696e7b9918b25) obsolete and addresses a `TODO` comment of mine. - Move wrapping/unwrapping methods to the `BaseObject` class. We use these almost exclusively for `BaseObject`s, and I hope that this gives a better idea of how (and for what) these are used in our code. - Perform initialization/deinitialization of the internal field in the `BaseObject*` constructor/destructor. This makes the code a bit more obviously correct, avoids explicit calls for this in subclass constructors, and in particular allows us to avoid crash situations when we previously called `ClearWrap()` during GC. This also means that we enforce that the object passed to the `BaseObject` constructor needs to have an internal field. This is the only reason for the test change. - Change the signature of `MakeWeak()` to not require a pointer argument. Previously, this would always have been the same as `this`, and no other value made sense. Also, the parameter was something that I personally found somewhat confusing when becoming familiar with Node’s code. - Add a `TODO` comment that motivates switching to real inheritance for the JS types we expose from the native side. This patch brings us a lot closer to being able to do that. - Some less significant drive-by cleanup. Since we *effectively* already store the `BaseObject*` pointer anyway since ddc19be6de1ba263d9c175b2760696e7b9918b25, I do not think that this is going to have any impact on diagnostic tooling. Fixes: https://github.com/nodejs/node/issues/18897 PR-URL: https://github.com/nodejs/node/pull/20455 Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Diffstat (limited to 'src/node_internals.h')
-rw-r--r--src/node_internals.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/node_internals.h b/src/node_internals.h
index b8acfa63c2..e5ea575ebc 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -244,9 +244,10 @@ v8::Local<v8::Object> AddressToJS(
template <typename T, int (*F)(const typename T::HandleType*, sockaddr*, int*)>
void GetSockOrPeerName(const v8::FunctionCallbackInfo<v8::Value>& args) {
- T* const wrap = Unwrap<T>(args.Holder());
- if (wrap == nullptr)
- return args.GetReturnValue().Set(UV_EBADF);
+ T* wrap;
+ ASSIGN_OR_RETURN_UNWRAP(&wrap,
+ args.Holder(),
+ args.GetReturnValue().Set(UV_EBADF));
CHECK(args[0]->IsObject());
sockaddr_storage storage;
int addrlen = sizeof(storage);