[clang] [llvm] fix-liveness (PR #205740)

[via cfe-commits]

github-actions[bot] wrote:

<!--PREMERGE ADVISOR COMMENT: Linux-->
# :penguin: Linux x64 Test Results

* 88364 tests passed
* 1680 tests skipped
* 1 test failed

## Failed Tests
(click on a test name to see its output)

### Clang
<details>
<summary>Clang.Sema/LifetimeSafety/safety.cpp</summary>

```
Exit Code: 1

Command Output (stdout):
--
# RUN: at line 1
/home/gha/actions-runner/_work/llvm-project/llvm-project/build/bin/clang -cc1 -internal-isystem /home/gha/actions-runner/_work/llvm-project/llvm-project/build/lib/clang/23/include -nostdsysteminc -fsyntax-only -Wlifetime-safety -Wlifetime-safety-annotation-placement -Wno-dangling -verify=expected,function /home/gha/actions-runner/_work/llvm-project/llvm-project/clang/test/Sema/LifetimeSafety/safety.cpp
# executed command: /home/gha/actions-runner/_work/llvm-project/llvm-project/build/bin/clang -cc1 -internal-isystem /home/gha/actions-runner/_work/llvm-project/llvm-project/build/lib/clang/23/include -nostdsysteminc -fsyntax-only -Wlifetime-safety -Wlifetime-safety-annotation-placement -Wno-dangling -verify=expected,function /home/gha/actions-runner/_work/llvm-project/llvm-project/clang/test/Sema/LifetimeSafety/safety.cpp
# .---command stderr------------
# | error: diagnostics with 'error' severity seen but not expected: 
# |   File /home/gha/actions-runner/_work/llvm-project/llvm-project/clang/test/Sema/LifetimeSafety/safety.cpp Line 3959: version control conflict marker in file
# | error: diagnostics with 'warning' severity expected but not seen: 
# |   File /home/gha/actions-runner/_work/llvm-project/llvm-project/clang/test/Sema/LifetimeSafety/safety.cpp Line 1147 'expected-warning': stack memory associated with parameter 't' is returned
# | error: diagnostics with 'note' severity expected but not seen: 
# |   File /home/gha/actions-runner/_work/llvm-project/llvm-project/clang/test/Sema/LifetimeSafety/safety.cpp Line 1147 (directive at /home/gha/actions-runner/_work/llvm-project/llvm-project/clang/test/Sema/LifetimeSafety/safety.cpp:1148) 'expected-note': returned here
# |   File /home/gha/actions-runner/_work/llvm-project/llvm-project/clang/test/Sema/LifetimeSafety/safety.cpp Line 1151 'function-note': in instantiation of
# | 4 errors generated.
# `-----------------------------
# error: command failed with exit status: 1

--

```
</details>

If these failures are unrelated to your changes (for example tests are broken or flaky at HEAD), please open an issue at https://github.com/llvm/llvm-project/issues and add the `infrastructure` label.

https://github.com/llvm/llvm-project/pull/205740