Skip to content
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

perf: Add object rvalue overload for accessors. Enables reference stealing #3970

Merged
merged 23 commits into from
Jun 1, 2022
Merged

perf: Add object rvalue overload for accessors. Enables reference stealing #3970

Changes from 4 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
79f35a9
Add object rvalue overload for accessors. Enables reference stealing
Skylion007 May 24, 2022
df69ada
Fix comments
Skylion007 May 24, 2022
7df50dc
Fix more comment typos
Skylion007 May 24, 2022
9a14da2
Fix bug
Skylion007 May 24, 2022
1ee3e17
Merge branch 'master' into skylion007/attr-key-reference-stealing
Skylion007 May 25, 2022
653eed3
reorder declarations for clarity
Skylion007 May 25, 2022
8955551
fix another perf bug
Skylion007 May 25, 2022
65d511a
should be static
Skylion007 May 25, 2022
382515d
future proof operator overloads
Skylion007 May 26, 2022
191dc2c
Fix perfect forwarding
Skylion007 May 27, 2022
7e5fcc4
Add a couple of tests
Skylion007 May 27, 2022
167649c
Remove errant include
Skylion007 May 27, 2022
cee6619
Improve test documentation
Skylion007 May 27, 2022
300d485
Add dict test
Skylion007 May 27, 2022
29250ab
add object attr tests
Skylion007 May 27, 2022
33fb072
Optimize STL map caster and cleanup enum
Skylion007 May 28, 2022
6de8287
Reorder to match declarations
Skylion007 May 31, 2022
3a444cd
Merge branch 'master' of https://github.com/pybind/pybind11 into skyl…
Skylion007 May 31, 2022
a82bfcf
Merge branch 'master' of https://github.com/pybind/pybind11 into skyl…
Skylion007 May 31, 2022
3c3d346
adjust increfs
Skylion007 May 31, 2022
fbe2404
Remove comment
Skylion007 May 31, 2022
1603ac2
revert value change
Skylion007 Jun 1, 2022
75bf0bd
add missing move
Skylion007 Jun 1, 2022
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
19 changes: 17 additions & 2 deletions include/pybind11/pytypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,10 @@ class object_api : public pyobject_tag {
or `object` subclass causes a call to ``__setitem__``.
\endrst */
item_accessor operator[](handle key) const;
/// See above (the only difference is that they key is provided as a string literal)
/// See above (the only difference is that the key is provided as a string literal)
item_accessor operator[](const char *key) const;
/// See above (the only difference is that the key's reference is stolen)
item_accessor operator[](object &&key) const;

/** \rst
Return an internal functor to access the object's attributes. Casting the
Expand All @@ -95,8 +97,10 @@ class object_api : public pyobject_tag {
or `object` subclass causes a call to ``setattr``.
\endrst */
obj_attr_accessor attr(handle key) const;
/// See above (the only difference is that they key is provided as a string literal)
/// See above (the only difference is that the key is provided as a string literal)
str_attr_accessor attr(const char *key) const;
/// See above (the only difference is that the key's reference is stolen)
obj_attr_accessor attr(object &&key) const;

/** \rst
Matches * unpacking in Python, e.g. to unpack arguments out of a ``tuple``
Expand Down Expand Up @@ -1683,6 +1687,7 @@ class tuple : public object {
bool empty() const { return size() == 0; }
detail::tuple_accessor operator[](size_t index) const { return {*this, index}; }
detail::item_accessor operator[](handle h) const { return object::operator[](h); }
detail::item_accessor operator[](object &&o) const { return object::operator[](std::move(o)); }
detail::tuple_iterator begin() const { return {*this, 0}; }
detail::tuple_iterator end() const { return {*this, PyTuple_GET_SIZE(m_ptr)}; }
};
Expand Down Expand Up @@ -1743,6 +1748,7 @@ class sequence : public object {
bool empty() const { return size() == 0; }
detail::sequence_accessor operator[](size_t index) const { return {*this, index}; }
detail::item_accessor operator[](handle h) const { return object::operator[](h); }
detail::item_accessor operator[](object &&o) const { return object::operator[](std::move(o)); }
detail::sequence_iterator begin() const { return {*this, 0}; }
detail::sequence_iterator end() const { return {*this, PySequence_Size(m_ptr)}; }
};
Expand All @@ -1762,6 +1768,7 @@ class list : public object {
bool empty() const { return size() == 0; }
detail::list_accessor operator[](size_t index) const { return {*this, index}; }
detail::item_accessor operator[](handle h) const { return object::operator[](h); }
detail::item_accessor operator[](object &&o) const { return object::operator[](std::move(o)); }
detail::list_iterator begin() const { return {*this, 0}; }
detail::list_iterator end() const { return {*this, PyList_GET_SIZE(m_ptr)}; }
template <typename T>
Expand Down Expand Up @@ -2057,6 +2064,10 @@ iterator object_api<D>::end() const {
return iterator::sentinel();
}
template <typename D>
item_accessor object_api<D>::operator[](object &&key) const {
Skylion007 marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The declaration appears after the overload for handle. Could you please put them in the same order here?

return {derived(), std::move(key)};
}
template <typename D>
item_accessor object_api<D>::operator[](handle key) const {
return {derived(), reinterpret_borrow<object>(key)};
}
Expand All @@ -2065,6 +2076,10 @@ item_accessor object_api<D>::operator[](const char *key) const {
return {derived(), pybind11::str(key)};
}
template <typename D>
obj_attr_accessor object_api<D>::attr(object &&key) const {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep the order of declarations here, too.

return {derived(), std::move(key)};
}
template <typename D>
obj_attr_accessor object_api<D>::attr(handle key) const {
return {derived(), reinterpret_borrow<object>(key)};
}
Expand Down