Skip to content

make static empty_array to be constexpr #1682

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
Shamzik wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −12
Open

make static empty_array to be constexpr #1682

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
2 changes: 1 addition & 1 deletion runtime-common/core/core-types/decl/array_decl.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private:
inline static size_t estimate_size(int64_t& new_int_size, bool is_vector);
inline static array_inner* create(int64_t new_int_size, bool is_vector);

inline static array_inner* empty_array() __attribute__((always_inline));
inline static const array_inner* empty_array() __attribute__((always_inline));

inline void dispose();

Expand Down
22 changes: 11 additions & 11 deletions runtime-common/core/core-types/definition/array.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,23 +104,23 @@ bool array<T>::is_int_key(const typename array<T>::key_type& key) {
}

template<>
inline typename array<Unknown>::array_inner* array<Unknown>::array_inner::empty_array() {
inline const typename array<Unknown>::array_inner* array<Unknown>::array_inner::empty_array() {
// need this hack because gcc10 and newer complains about
// "array subscript is outside array bounds of array<Unknown>::array_inner"
static array_inner_control empty_array[1]{{
static constexpr array_inner_control empty_array[1]{{
true,
ExtraRefCnt::for_global_const,
-1,
{0, 0},
0,
2,
}};
return static_cast<array<Unknown>::array_inner*>(&empty_array[0]);
return static_cast<const array<Unknown>::array_inner*>(&empty_array[0]);
}

template<class T>
typename array<T>::array_inner* array<T>::array_inner::empty_array() {
return reinterpret_cast<array_inner*>(array<Unknown>::array_inner::empty_array());
const typename array<T>::array_inner* array<T>::array_inner::empty_array() {
return reinterpret_cast<const array_inner*>(array<Unknown>::array_inner::empty_array());
}

template<class T>
Expand Down Expand Up @@ -869,7 +869,7 @@ template<class T>
template<class T1>
void array<T>::copy_from(const array<T1>& other) {
if (other.empty()) {
p = array_inner::empty_array();
p = const_cast<array_inner*>(array_inner::empty_array());
return;
}

Expand Down Expand Up @@ -900,7 +900,7 @@ template<class T>
template<class T1>
void array<T>::move_from(array<T1>&& other) noexcept {
if (other.empty()) {
p = array_inner::empty_array();
p = const_cast<array_inner*>(array_inner::empty_array());
return;
}

Expand Down Expand Up @@ -944,7 +944,7 @@ array<T> array<T>::convert_from(const array<U>& other) {

template<class T>
array<T>::array()
: p(array_inner::empty_array()) {}
: p(const_cast<array_inner*>(array_inner::empty_array())) {}

template<class T>
array<T>::array(const array_size& s)
Expand All @@ -966,7 +966,7 @@ array<T>::array(const array<T>& other) noexcept
template<class T>
array<T>::array(array<T>&& other) noexcept
: p(other.p) {
other.p = array_inner::empty_array();
other.p = const_cast<array_inner*>(array_inner::empty_array());
}

template<class T>
Expand Down Expand Up @@ -1004,7 +1004,7 @@ array<T>& array<T>::operator=(array&& other) noexcept {
if (this != &other) {
destroy();
p = other.p;
other.p = array_inner::empty_array();
other.p = const_cast<array_inner*>(array_inner::empty_array());
}
return *this;
}
Expand Down Expand Up @@ -1040,7 +1040,7 @@ array<T>::~array() {
template<class T>
void array<T>::clear() {
destroy();
p = array_inner::empty_array();
p = const_cast<array_inner*>(array_inner::empty_array());
}

template<class T>
Expand Down
Loading