Forward String::length in RuntimeDecorator and WithRuntimeDecorator (#58936)

Summary:
Pull Request resolved: https://github.com/react/react-native/pull/58936

`IRuntime::length(const String&)` came in with "Add `String::length` API" (590396bd4 on static_h, D96030262), and that commit didn't touch `decorator.h`. Neither `RuntimeDecorator` nor `WithRuntimeDecorator` overrides it, so on a decorated runtime `length()` falls back to the default `utf16(str).size()` and never reaches the wrapped runtime.

It looks like an oversight. The same stack added `push`, `tryGetMutableBuffer`, `detached` and the TypedArray methods, and each of those commits added decorator overrides, including one for this method's overload `length(const TypedArray&)`. The `createError*` commit (https://github.com/facebook/hermes/issues/2203) and this one didn't.

For Hermes-backed decorators the value is already right, because Hermes' `utf16()` is exact, but every call copies the whole string instead of reading the length. Runtimes with a native `length()` and the default `utf16()` get wrong answers. React Native's `JSCRuntime` is one: built against the system JavaScriptCore and wrapped in a `RuntimeDecorator`, `'a\uD800b'` has length 1 instead of 3 and `'x\uDC00yz'` has 1 instead of 4. With this change both match the undecorated runtime. That setup lives outside this repo, so it isn't a test here.

`WithRuntimeDecorator` needs the override too. Otherwise it would inherit the plain forward and `length()` would skip `Around`, which it currently goes through via `utf16()`.

`TracingRuntime` no longer records an incidental `Utf16Record` when `length()` is called. That record only came from the `utf16()` fallback. I didn't add a record for `length()`: strings are immutable, and `TracingRuntime` already leaves pure queries like `size(Array)` untraced.

X-link: https://github.com/facebook/hermes/pull/2205

Test Plan:
Added `JSITest.DecoratorForwardsStringLength`. An inner decorator returns a sentinel from `length()` and counts `length()` and `utf16()` calls. The test checks that a `RuntimeDecorator` and a `WithRuntimeDecorator` over it both reach that `length()` without calling `utf16()`, and that `Around` runs once. It fails without the change (it gets 5 from the `utf16()` fallback) and passes with it. The full `APITests` binary passes (357 tests) in a Debug + ASan build, including the SynthTrace and TraceInterpreter tests.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Reviewed By: avp

Differential Revision: D123943189

Pulled By: lavenzg

fbshipit-source-id: 519fdde9f2ad46ce906567bfd1d94d787015915c
This commit is contained in:
Marc Rousavy authored and meta-codesync[bot] committed 2026-10-07 17:46:48 -07:00
1 parent 4fec40e69d
commit be567d270c
11 files changed
+82

No files matched your search

@@ -243,6 +243,10 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
return plain_.utf16(sym);
}
size_t length(const String& str) override {
return plain_.length(str);
}
void getStringData(
const jsi::String& str,
void* ctx,
@@ -822,6 +826,11 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
return RD::utf16(sym);
}
size_t length(const String& str) override {
Around around{with_};
return RD::length(str);
}
void getStringData(
const jsi::String& str,
void* ctx,
@@ -138,6 +138,61 @@ TEST_P(JSITest, StringLengthTest) {
EXPECT_EQ(invalid.length(rt), 2);
}
TEST_P(JSITest, DecoratorForwardsStringLength) {
// Decorators should forward length(const String&) to the decorated runtime
// instead of falling back to the default Runtime::length, which copies the
// string via utf16() and bypasses the runtime's own implementation.
class Inner : public RuntimeDecorator<Runtime, Runtime> {
public:
explicit Inner(Runtime& rt) : RuntimeDecorator(rt) {}
size_t length(const String&) override {
++lengthCalls;
return 42;
}
std::u16string utf16(const String& str) override {
++utf16Calls;
return RuntimeDecorator::utf16(str);
}
int lengthCalls = 0;
int utf16Calls = 0;
};
class Outer : public RuntimeDecorator<Runtime, Runtime> {
public:
explicit Outer(Runtime& rt) : RuntimeDecorator(rt) {}
};
struct Count {
void before() {
++beforeCalls;
}
void after() {
++afterCalls;
}
int beforeCalls = 0;
int afterCalls = 0;
};
Inner inner(rt);
String str = String::createFromAscii(inner, "hello");
Outer outer(inner);
EXPECT_EQ(str.length(outer), 42);
EXPECT_EQ(inner.lengthCalls, 1);
EXPECT_EQ(inner.utf16Calls, 0);
Count count;
WithRuntimeDecorator<Count> with(inner, count);
EXPECT_EQ(str.length(with), 42);
EXPECT_EQ(inner.lengthCalls, 2);
EXPECT_EQ(inner.utf16Calls, 0);
EXPECT_EQ(count.beforeCalls, 1);
EXPECT_EQ(count.afterCalls, 1);
}
TEST_P(JSITest, ObjectTest) {
eval("x = {1:2, '3':4, 5:'six', 'seven':['eight', 'nine']}");
Object x = rt.global().getPropertyAsObject(rt, "x");
@@ -12784,6 +12784,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime {
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -12902,6 +12903,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -12400,6 +12400,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime {
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -12518,6 +12519,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -12631,6 +12631,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime {
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -12749,6 +12750,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -14545,6 +14545,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime {
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -14663,6 +14664,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -14227,6 +14227,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime {
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -14345,6 +14346,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -14402,6 +14402,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime {
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -14520,6 +14521,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -9731,6 +9731,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime {
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -9849,6 +9850,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -9555,6 +9555,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime {
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -9673,6 +9674,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -9722,6 +9722,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime {
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;
@@ -9840,6 +9841,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat
protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override;
protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t length(const facebook::jsi::String& str) override;
protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override;
protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override;
protected virtual size_t size(const facebook::jsi::Array& a) override;