[all-commits] [llvm/llvm-project] 2ba884: Fix an assertion failure in unwrapSugar

[Akira Hatanaka via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 2ba88443b31a437a3e80ac4bb6d8ca1675828d1b
      https://github.com/llvm/llvm-project/commit/2ba88443b31a437a3e80ac4bb6d8ca1675828d1b
  Author: Akira Hatanaka <ahatanaka at apple.com>
  Date:   2023-04-12 (Wed, 12 Apr 2023)

  Changed paths:
    M clang/lib/AST/ASTContext.cpp
    M clang/test/SemaCXX/sugar-common-types.cpp

  Log Message:
  -----------
  Fix an assertion failure in unwrapSugar

An assertion in Qualifiers::addObjCLifetime fails when the ObjC lifetime
bits are already set.

Instead of calling operator+=, call addConsistentQualifiers, which
allows the lifetime bits to be set again as long the new value doesn't
conflict with the old value.

This fixes https://github.com/llvm/llvm-project/issues/61419.

Differential Revision: https://reviews.llvm.org/D147263