walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't retry creating again and again in lazy_loader if create failed 

Still does that if get_null() returns nullptr.  Our shaper data objects
are like that.  Shrug.
This commit is contained in:
Behdad Esfahbod 2018-11-13 20:48:46 -05:00
parent 086235f593
commit dc4225ccd1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hb-machinery.hh
View File

@ -752,16 +752,19 @@ struct hb_data_wrapper_t
return *(((Data **) (void *) this) - WheresData); return *(((Data **) (void *) this) - WheresData);
} }
inline bool is_inert (void) const { return !get_data (); }
template <typename Stored, typename Subclass> template <typename Stored, typename Subclass>
inline Stored * call_create (void) const inline Stored * call_create (void) const
{ {
Data *data = this->get_data (); return Subclass::create (this->get_data ());
return likely (data) ? Subclass::create (data) : nullptr;
} }
}; };
template <> template <>
struct hb_data_wrapper_t<void, 0> struct hb_data_wrapper_t<void, 0>
{ {
inline bool is_inert (void) const { return false; }
template <typename Stored, typename Funcs> template <typename Stored, typename Funcs>
inline Stored * call_create (void) const inline Stored * call_create (void) const
{ {
@ -800,7 +803,7 @@ struct hb_lazy_loader_t : hb_data_wrapper_t<Data, WheresData>
static inline void do_destroy (Stored *p) static inline void do_destroy (Stored *p)
{ {
if (p) if (p && p != const_cast<Stored *> (Funcs::get_null ()))
Funcs::destroy (p); Funcs::destroy (p);
} }
@ -814,9 +817,12 @@ struct hb_lazy_loader_t : hb_data_wrapper_t<Data, WheresData>
Stored *p = this->instance.get (); Stored *p = this->instance.get ();
if (unlikely (!p)) if (unlikely (!p))
{ {
if (unlikely (this->is_inert ()))
return const_cast<Stored *> (Funcs::get_null ());
p = this->template call_create<Stored, Funcs> (); p = this->template call_create<Stored, Funcs> ();
if (unlikely (!p)) if (unlikely (!p))
return const_cast<Stored *> (Funcs::get_null ()); p = const_cast<Stored *> (Funcs::get_null ());
if (unlikely (!this->instance.cmpexch (nullptr, p))) if (unlikely (!this->instance.cmpexch (nullptr, p)))
{ {