svn commit: r345152 - in head: contrib/llvm/tools/clang/lib/AST lib/clang/include/clang/Basic lib/clang/include/lld/Common lib/clang/include/llvm/Support

[Dimitry Andric]

Author: dim
Date: Thu Mar 14 19:52:12 2019
New Revision: 345152
URL: https://svnweb.freebsd.org/changeset/base/345152

Log:
  Merge llvm, clang, compiler-rt, libc++, libunwind, lld, and lldb
  release_80 branch r356034 (effectively, 8.0.0 rc5), resolve conflicts,
  and bump version numbers.
  
  PR:		236062
  MFC after:	1 month
  X-MFC-With:	r344779

Modified:
  head/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp
  head/lib/clang/include/clang/Basic/Version.inc
  head/lib/clang/include/lld/Common/Version.inc
  head/lib/clang/include/llvm/Support/VCSRevision.h
Directory Properties:
  head/contrib/compiler-rt/   (props changed)
  head/contrib/libc++/   (props changed)
  head/contrib/libunwind/   (props changed)
  head/contrib/llvm/   (props changed)
  head/contrib/llvm/tools/clang/   (props changed)
  head/contrib/llvm/tools/lld/   (props changed)
  head/contrib/llvm/tools/lldb/   (props changed)

Modified: head/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp	Thu Mar 14 19:48:43 2019	(r345151)
+++ head/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp	Thu Mar 14 19:52:12 2019	(r345152)
@@ -10985,6 +10985,7 @@ bool Expr::EvaluateAsConstantExpr(EvalResult &Result, 
                                   const ASTContext &Ctx) const {
   EvalInfo::EvaluationMode EM = EvalInfo::EM_ConstantExpression;
   EvalInfo Info(Ctx, Result, EM);
+  Info.InConstantContext = true;
   if (!::Evaluate(Result.Val, Info, this))
     return false;
 
@@ -11625,6 +11626,7 @@ bool Expr::EvaluateWithSubstitution(APValue &Value, AS
                                     const Expr *This) const {
   Expr::EvalStatus Status;
   EvalInfo Info(Ctx, Status, EvalInfo::EM_ConstantExpressionUnevaluated);
+  Info.InConstantContext = true;
 
   LValue ThisVal;
   const LValue *ThisPtr = nullptr;
@@ -11708,6 +11710,7 @@ bool Expr::isPotentialConstantExprUnevaluated(Expr *E,
 
   EvalInfo Info(FD->getASTContext(), Status,
                 EvalInfo::EM_PotentialConstantExpressionUnevaluated);
+  Info.InConstantContext = true;
 
   // Fabricate a call stack frame to give the arguments a plausible cover story.
   ArrayRef<const Expr*> Args;

Modified: head/lib/clang/include/clang/Basic/Version.inc
==============================================================================
--- head/lib/clang/include/clang/Basic/Version.inc	Thu Mar 14 19:48:43 2019	(r345151)
+++ head/lib/clang/include/clang/Basic/Version.inc	Thu Mar 14 19:52:12 2019	(r345152)
@@ -8,4 +8,4 @@
 
 #define	CLANG_VENDOR			"FreeBSD "
 
-#define	SVN_REVISION			"355677"
+#define	SVN_REVISION			"356034"

Modified: head/lib/clang/include/lld/Common/Version.inc
==============================================================================
--- head/lib/clang/include/lld/Common/Version.inc	Thu Mar 14 19:48:43 2019	(r345151)
+++ head/lib/clang/include/lld/Common/Version.inc	Thu Mar 14 19:52:12 2019	(r345152)
@@ -7,4 +7,4 @@
 
 #define LLD_REPOSITORY_STRING "FreeBSD"
 // <Upstream revision at import>-<Local identifier in __FreeBSD_version style>
-#define LLD_REVISION_STRING "355677-1300002"
+#define LLD_REVISION_STRING "356034-1300002"

Modified: head/lib/clang/include/llvm/Support/VCSRevision.h
==============================================================================
--- head/lib/clang/include/llvm/Support/VCSRevision.h	Thu Mar 14 19:48:43 2019	(r345151)
+++ head/lib/clang/include/llvm/Support/VCSRevision.h	Thu Mar 14 19:52:12 2019	(r345152)
@@ -1,2 +1,2 @@
 /* $FreeBSD$ */
-#define LLVM_REVISION "svn-r355677"
+#define LLVM_REVISION "svn-r356034"