Skip to content

[Fabric] Optimize RawPropsParser::at out-of-order lookup using nameToIndex_ (#59759) #59848

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

Open
Bahadir10 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Fabric] Optimize RawPropsParser::at out-of-order lookup using nameToIndex_ (#59759) #59848

Show file tree
Hide file tree
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
31 changes: 15 additions & 16 deletions packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,26 +73,25 @@ const RawValue* RawPropsParser::at(
// This is trivial if you have a simple Props constructor, but difficult or
// impossible if you have a shared sub-prop Struct that is used by multiple
// parent Props.
#ifdef REACT_NATIVE_DEBUG
bool resetLoop = false;
#endif
do {
rawProps.keyIndexCursor_++;
rawProps.keyIndexCursor_++;

if (static_cast<size_t>(rawProps.keyIndexCursor_) >= keys_.size())
[[unlikely]] {
rawProps.keyIndexCursor_ = 0;
}

if (static_cast<size_t>(rawProps.keyIndexCursor_) >= keys_.size())
[[unlikely]] {
if (!keysEqual(key, keys_[rawProps.keyIndexCursor_])) [[unlikely]] {
auto keyIndex = nameToIndex_.at(key);
if (keyIndex == kRawPropsValueIndexEmpty) [[unlikely]] {
#ifdef REACT_NATIVE_DEBUG
if (resetLoop) {
LOG(ERROR)
<< "Looked up property name which was not seen when preparing: "
<< key;
return nullptr;
}
resetLoop = true;
LOG(ERROR)
<< "Looked up property name which was not seen when preparing: "
<< key;
#endif
rawProps.keyIndexCursor_ = 0;
return nullptr;
}
} while (!keysEqual(key, keys_[rawProps.keyIndexCursor_]));
rawProps.keyIndexCursor_ = static_cast<int>(keyIndex);
}

auto valueIndex = rawProps.keyIndexToValueIndex_[rawProps.keyIndexCursor_];
return valueIndex == kRawPropsValueIndexEmpty ? nullptr
Expand Down
18 changes: 18 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,3 +480,21 @@ TEST(RawPropsTest, copyJSIRawProps) {
EXPECT_NEAR(
copyProps->derivedFloatValue, originalProps->derivedFloatValue, 0.00001);
}

TEST(RawPropsTest, handleOutOfOrderPropsLookup) {
ContextContainer contextContainer{};
PropsParserContext parserContext{-1, contextContainer};

auto raw = RawProps(folly::dynamic::object("intValue", 42)("floatValue", 12.5f));

auto parser = RawPropsParser();
parser.prepare<PropsPrimitiveTypes>();
raw.parse(parser);

// In PropsPrimitiveTypes, keys are registered as:
// intValue, doubleValue, floatValue, stringValue, boolValue
// Lookup floatValue first, then intValue (out-of-order):
EXPECT_NEAR((float)*raw.at("floatValue"), 12.5f, 0.00001);
EXPECT_EQ((int)*raw.at("intValue"), 42);
EXPECT_NEAR((float)*raw.at("floatValue"), 12.5f, 0.00001);
}
Loading