Skip to content

Fix JSCRuntime invalidate() specifier ordering (noexcept before JSI_DISABLE_ASAN) #2967

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
Saadnajmi wants to merge 1 commit into from
Closed

Fix JSCRuntime invalidate() specifier ordering (noexcept before JSI_DISABLE_ASAN) #2967

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 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 @@ -8,6 +8,12 @@
#include "JSCRuntime.h"

#include <JavaScriptCore/JavaScript.h>

#if __has_feature(address_sanitizer)
#define JSI_DISABLE_ASAN __attribute__((no_sanitize("address")))
#else
#define JSI_DISABLE_ASAN
#endif
#include <jsi/jsilib.h>
#include <array>
#include <atomic>
Expand Down Expand Up @@ -527,7 +533,7 @@ JSCRuntime::JSCSymbolValue::JSCSymbolValue(
#endif
}

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

void JSCRuntime::JSCStringValue::invalidate() noexcept {
void JSCRuntime::JSCStringValue::invalidate() noexcept JSI_DISABLE_ASAN {
// 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 @@ -587,7 +593,7 @@ JSCRuntime::JSCObjectValue::JSCObjectValue(
#endif
}

void JSCRuntime::JSCObjectValue::invalidate() noexcept {
void JSCRuntime::JSCObjectValue::invalidate() noexcept JSI_DISABLE_ASAN {
#ifndef NDEBUG
counter_ -= 1;
#endif
Expand Down Expand Up @@ -863,7 +869,7 @@ jsi::Object JSCRuntime::createObject(std::shared_ptr<jsi::HostObject> ho) {
static void getPropertyNames(
JSContextRef ctx,
JSObjectRef object,
JSPropertyNameAccumulatorRef propertyNames) noexcept {
JSPropertyNameAccumulatorRef propertyNames) noexcept JSI_DISABLE_ASAN {
JSC_UNUSED(ctx);
auto proxy = static_cast<HostObjectProxy*>(JSObjectGetPrivate(object));
auto& rt = proxy->runtime;
Expand Down
Loading