Index: third_party/harfbuzz-ng/src/hb-shaper-private.hh |
diff --git a/third_party/harfbuzz-ng/src/hb-shaper-private.hh b/third_party/harfbuzz-ng/src/hb-shaper-private.hh |
index 29c4493943de9c6fd66b88af22dca5a51a50e9fb..d1d1146dad21060667ec259f00bed12f56a08085 100644 |
--- a/third_party/harfbuzz-ng/src/hb-shaper-private.hh |
+++ b/third_party/harfbuzz-ng/src/hb-shaper-private.hh |
@@ -79,10 +79,9 @@ struct hb_shaper_data_t { |
HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (HB_SHAPER_DATA_TYPE (shaper, object) *data) |
#define HB_SHAPER_DATA_DESTROY(shaper, object) \ |
- if (object->shaper_data.shaper && \ |
- object->shaper_data.shaper != HB_SHAPER_DATA_INVALID && \ |
- object->shaper_data.shaper != HB_SHAPER_DATA_SUCCEEDED) \ |
- HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (HB_SHAPER_DATA (shaper, object)); |
+ if (HB_SHAPER_DATA_TYPE (shaper, object) *data = HB_SHAPER_DATA (shaper, object)) \ |
+ if (data != HB_SHAPER_DATA_INVALID && data != HB_SHAPER_DATA_SUCCEEDED) \ |
+ HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (data); |
#define HB_SHAPER_DATA_ENSURE_DECLARE(shaper, object) \ |
static inline bool \ |