<table border="1" cellspacing="0" cellpadding="8">
    <tr>
        <th>Issue</th>
        <td>
            <a href=https://github.com/llvm/llvm-project/issues/84713>84713</a>
        </td>
    </tr>

    <tr>
        <th>Summary</th>
        <td>
            Backport aeda1a6e800e and 2f479b811274 to 18.x
        </td>
    </tr>

    <tr>
      <th>Labels</th>
      <td>
            new issue
      </td>
    </tr>

    <tr>
      <th>Assignees</th>
      <td>
      </td>
    </tr>

    <tr>
      <th>Reporter</th>
      <td>
          SixWeining
      </td>
    </tr>
</table>

<pre>
    /cherry-pick aeda1a6e800e 2f479b811274

</pre>
<img width="1px" height="1px" alt="" src="http://email.email.llvm.org/o/eJxUz7EO2yAQBuCngcWKdRxg8MCQKPILdOgMBts0xLYAt8nbV7EqVZluOP2__s-WEuc1BEPkjcg7tUddtmx-xNfPENe4ztRt_m0IDuMScn5f9jg-Ghu8ZbYLGiA0OAnVO80YKkHgTuBKveG-572lwTDFgGEPUtLF-L4Hr9UkpIROiXEaJ945LZmwCMoxGg0CCuCMAZcgZas1OOdlx3uvMUhFBISnjalN6fez3fJMYylHMFooxmmyLqRyWhDX8Kc5nwTxQ8vmk7m4Yy5EQIqllv8tNdYUzM2Oj33L9RtoV_-FbOrWMN2-6JGTWWrdC-FXggPBYY51OVw7bk-Cw6f837nsefsVxkpwOCcVgsM5-W8AAAD__yRudJ0">