[all-commits] [llvm/llvm-project] c59312: [modules] While merging ObjCInterfaceDecl definiti...

[Volodymyr Sapsai via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: c5931267db26d71351c634df06006d9c818ff158
      https://github.com/llvm/llvm-project/commit/c5931267db26d71351c634df06006d9c818ff158
  Author: Volodymyr Sapsai <vsapsai at apple.com>
  Date:   2021-10-20 (Wed, 20 Oct 2021)

  Changed paths:
    M clang/lib/Serialization/ASTReaderDecl.cpp
    M clang/test/Modules/odr_hash.mm

  Log Message:
  -----------
  [modules] While merging ObjCInterfaceDecl definitions, merge them as decl contexts too.

While working on https://reviews.llvm.org/D110280 I've tried to merge
decl contexts as it seems to be correct and matching our handling of
decl contexts from different modules. It's not required for the fix in
https://reviews.llvm.org/D110280 but it revealed a missing diagnostic,
so separating this change into a separate commit.

Renamed some variables to distinguish diagnostic like "declaration of
'x' does not match" for different cases.

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