[cfi] Fix one -fno-sanitize-merge case, and add two TODOs #135438
Merged
The logs for this run have expired and are no longer available.
Loading