K 10
svn:author
V 7
git2svn
K 8
svn:date
V 27
2021-08-26T18:11:47.743604Z
K 7
svn:log
V 890
Apply clang fix for assertion failure compiling multimedia/minitube

Merge commit 79f9cfbc21e0 from llvm git (by Yaxun (Sam) Liu):

  Do not merge LocalInstantiationScope for template specialization

  A lambda in a function template may be recursively instantiated. The recursive
  lambda will cause a lambda function instantiated multiple times, one inside another.
  The inner LocalInstantiationScope should not be marked as MergeWithParentScope
  since it already has references to locals properly substituted, otherwise it causes
  assertion due to the check for duplicate locals in merged LocalInstantiationScope.

  Reviewed by: Richard Smith

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

Reported by:	yuri
PR:		257978

(cherry picked from commit efa485d5c390b745f53761da9159721243c48b7b)

Git Hash:   9e1de6e8250355cda0615332d43bbba61d4d873f
Git Author: dim@FreeBSD.org
END