From 2153daba2fbadbedd734bead760d20a0d4874285 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 2 Oct 2026 06:51:11 -0600 Subject: [PATCH] [subset] Extract retained-condition pointer before the ternary The universal first-match fix mixed hb::shared_ptr and nullptr in a conditional expression. GCC 13 rejects that expression, breaking the GCC-based CI jobs even though Clang and GCC 15 accept it. Use shared_ptr::get() so both operands have compatible pointer types. This preserves the existing ownership and null handling. Reproduced the rejected expression with GCC 13 and verified the fixed expression and C++11 amalgamation syntax check. The full Meson suite passes: 281 passed, 1 skipped. Local GCC C++11/C++20 and Clang C++11 checks also pass, as do all six reduced-feature CI profiles. Assisted-by: OpenAI Codex --- src/hb-ot-layout-common.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index cf0af6b71..3fccaf695 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -5435,7 +5435,7 @@ struct FeatureVariationRecord if (unlikely (!out)) return_trace (false); hb_set_t *retained_conditions = c->feature_record_cond_idx_map ? - c->feature_record_cond_idx_map->get (c->cur_feature_var_record_idx) : nullptr; + c->feature_record_cond_idx_map->get (c->cur_feature_var_record_idx).get () : nullptr; if (!insert_catch_all && retained_conditions && retained_conditions->is_empty ()) /* A null ConditionSet is the unconditional first-match record. */ out->conditions = 0;