Skip to content

let PointerValue::invalidate() be noexcept #47354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yfeldblum wants to merge 2 commits into from
Closed

let PointerValue::invalidate() be noexcept #47354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6b2b28
let Pointer be nothrow-move-constructible (#47331)
yfeldblum Nov 5, 2024
a8160ec
let PointerValue::invalidate() be noexcept (#47354)
yfeldblum Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/react-native/ReactCommon/jsc/JSCRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class JSCRuntime : public jsi::Runtime {
const std::atomic<bool>& ctxInvalid,
JSValueRef sym);
#endif
void invalidate() override;
void invalidate() noexcept override;

JSGlobalContextRef ctx_;
const std::atomic<bool>& ctxInvalid_;
Expand All @@ -114,7 +114,7 @@ class JSCRuntime : public jsi::Runtime {
#else
JSCStringValue(JSStringRef str);
#endif
void invalidate() override;
void invalidate() noexcept override;

JSStringRef str_;
#ifndef NDEBUG
Expand All @@ -135,7 +135,7 @@ class JSCRuntime : public jsi::Runtime {
#endif
);

void invalidate() override;
void invalidate() noexcept override;

JSGlobalContextRef ctx_;
const std::atomic<bool>& ctxInvalid_;
Expand Down Expand Up @@ -506,7 +506,7 @@ JSCRuntime::JSCSymbolValue::JSCSymbolValue(
#endif
}

void JSCRuntime::JSCSymbolValue::invalidate() {
void JSCRuntime::JSCSymbolValue::invalidate() noexcept {
#ifndef NDEBUG
counter_ -= 1;
#endif
Expand All @@ -531,7 +531,7 @@ JSCRuntime::JSCStringValue::JSCStringValue(JSStringRef str)
: str_(JSStringRetain(str)) {}
#endif

void JSCRuntime::JSCStringValue::invalidate() {
void JSCRuntime::JSCStringValue::invalidate() noexcept {
// These JSC{String,Object}Value objects are implicitly owned by the
// {String,Object} objects, thus when a String/Object is destructed
// the JSC{String,Object}Value should be released.
Expand Down Expand Up @@ -566,7 +566,7 @@ JSCRuntime::JSCObjectValue::JSCObjectValue(
#endif
}

void JSCRuntime::JSCObjectValue::invalidate() {
void JSCRuntime::JSCObjectValue::invalidate() noexcept {
#ifndef NDEBUG
counter_ -= 1;
#endif
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/jsi/jsi/jsi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ std::u16string Runtime::utf16(const String& str) {
return convertUTF8ToUTF16(utf8Str);
}

Pointer& Pointer::operator=(Pointer&& other) {
Pointer& Pointer::operator=(Pointer&& other) noexcept {
if (ptr_) {
ptr_->invalidate();
}
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native/ReactCommon/jsi/jsi/jsi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ class JSI_EXPORT Runtime {
// rvalue arguments/methods would also reduce the number of clones.

struct PointerValue {
virtual void invalidate() = 0;
virtual void invalidate() noexcept = 0;

protected:
virtual ~PointerValue() = default;
Expand Down Expand Up @@ -418,7 +418,7 @@ class JSI_EXPORT Runtime {
// Base class for pointer-storing types.
class JSI_EXPORT Pointer {
protected:
explicit Pointer(Pointer&& other) : ptr_(other.ptr_) {
explicit Pointer(Pointer&& other) noexcept : ptr_(other.ptr_) {
other.ptr_ = nullptr;
}

Expand All @@ -428,7 +428,7 @@ class JSI_EXPORT Pointer {
}
}

Pointer& operator=(Pointer&& other);
Pointer& operator=(Pointer&& other) noexcept;

friend class Runtime;
friend class Value;
Expand Down