[all-commits] [llvm/llvm-project] 5a3f6b: Reapply "[OpenMP][FIX] Verify compatible types for...

[Johannes Doerfert via All-commits]

  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: 5a3f6bfe8a71b94728597aee12a4c36949d5f6af
      https://github.com/llvm/llvm-project/commit/5a3f6bfe8a71b94728597aee12a4c36949d5f6af
  Author: Johannes Doerfert <johannes at jdoerfert.de>
  Date:   2020-10-07 (Wed, 07 Oct 2020)

  Changed paths:
    M clang/lib/AST/ASTContext.cpp
    M clang/lib/Sema/SemaOpenMP.cpp
    M clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
    A clang/test/AST/ast-dump-openmp-begin-declare-variant_template_3.cpp

  Log Message:
  -----------
  Reapply "[OpenMP][FIX] Verify compatible types for declare variant calls" D88384

This reapplies D88384 with the minor modification that an assertion was
changed to a regular conditional and graceful exit from
ASTContext::mergeTypes.