Author: dim
Date: Mon Oct 12 21:35:29 2020
New Revision: 366655
URL: https://svnweb.freebsd.org/changeset/base/366655
Log:
Merge llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp
release/11.x llvmorg-11.0.0-0-g176249bd673 (aka 11.0.0 release).
MFC after: 4 weeks
X-MFC-With: r364284
Modified:
head/contrib/llvm-project/clang/include/clang/Driver/Options.td
head/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp
head/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
head/contrib/llvm-project/llvm/lib/CodeGen/TailDuplicator.cpp
head/lib/clang/include/VCSVersion.inc
head/lib/clang/include/llvm/Support/VCSRevision.h
Directory Properties:
head/contrib/llvm-project/ (props changed)
head/contrib/llvm-project/clang/ (props changed)
head/contrib/llvm-project/llvm/ (props changed)
Modified: head/contrib/llvm-project/clang/include/clang/Driver/Options.td
==============================================================================
--- head/contrib/llvm-project/clang/include/clang/Driver/Options.td Mon Oct
12 21:31:49 2020 (r366654)
+++ head/contrib/llvm-project/clang/include/clang/Driver/Options.td Mon Oct
12 21:35:29 2020 (r366655)
@@ -1435,11 +1435,11 @@ def fno_pch_validate_input_files_content:
Group<f_Group>, Flags<[DriverOption]>;
def fpch_instantiate_templates:
Flag <["-"], "fpch-instantiate-templates">,
- Group<f_Group>, Flags<[CC1Option]>,
+ Group<f_Group>, Flags<[CC1Option, CoreOption]>,
HelpText<"Instantiate templates already while building a PCH">;
def fno_pch_instantiate_templates:
Flag <["-"], "fno-pch-instantiate-templates">,
- Group<f_Group>, Flags<[CC1Option]>;
+ Group<f_Group>, Flags<[CC1Option, CoreOption]>;
defm pch_codegen: OptInFFlag<"pch-codegen", "Generate ", "Do not generate ",
"code for uses of this PCH that assumes an explicit object file will be
built for the PCH">;
defm pch_debuginfo: OptInFFlag<"pch-debuginfo", "Generate ", "Do not generate
",
Modified: head/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp
==============================================================================
--- head/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp Mon Oct
12 21:31:49 2020 (r366654)
+++ head/contrib/llvm-project/clang/lib/Driver/ToolChains/Clang.cpp Mon Oct
12 21:35:29 2020 (r366655)
@@ -1197,7 +1197,11 @@ void Clang::AddPreprocessingOptions(Compilation &C, co
if (YcArg && JA.getKind() >= Action::PrecompileJobClass &&
JA.getKind() <= Action::AssembleJobClass) {
CmdArgs.push_back(Args.MakeArgString("-building-pch-with-obj"));
- CmdArgs.push_back(Args.MakeArgString("-fpch-instantiate-templates"));
+ // -fpch-instantiate-templates is the default when creating
+ // precomp using /Yc
+ if (Args.hasFlag(options::OPT_fpch_instantiate_templates,
+ options::OPT_fno_pch_instantiate_templates, true))
+ CmdArgs.push_back(Args.MakeArgString("-fpch-instantiate-templates"));
}
if (YcArg || YuArg) {
StringRef ThroughHeader = YcArg ? YcArg->getValue() : YuArg->getValue();
Modified:
head/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
==============================================================================
--- head/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
Mon Oct 12 21:31:49 2020 (r366654)
+++ head/contrib/llvm-project/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
Mon Oct 12 21:35:29 2020 (r366655)
@@ -5751,10 +5751,8 @@ SDValue TargetLowering::getNegatedExpression(SDValue O
// If we already have the use of the negated floating constant, it is free
// to negate it even it has multiple uses.
- if (!Op.hasOneUse() && CFP.use_empty()) {
- RemoveDeadNode(CFP);
+ if (!Op.hasOneUse() && CFP.use_empty())
break;
- }
Cost = NegatibleCost::Neutral;
return CFP;
}
Modified: head/contrib/llvm-project/llvm/lib/CodeGen/TailDuplicator.cpp
==============================================================================
--- head/contrib/llvm-project/llvm/lib/CodeGen/TailDuplicator.cpp Mon Oct
12 21:31:49 2020 (r366654)
+++ head/contrib/llvm-project/llvm/lib/CodeGen/TailDuplicator.cpp Mon Oct
12 21:35:29 2020 (r366655)
@@ -627,6 +627,14 @@ bool TailDuplicator::shouldTailDuplicate(bool IsSimple
if (PreRegAlloc && MI.isCall())
return false;
+ // TailDuplicator::appendCopies will erroneously place COPYs after
+ // INLINEASM_BR instructions after 4b0aa5724fea, which demonstrates the
same
+ // bug that was fixed in f7a53d82c090.
+ // FIXME: Use findPHICopyInsertPoint() to find the correct insertion point
+ // for the COPY when replacing PHIs.
+ if (MI.getOpcode() == TargetOpcode::INLINEASM_BR)
+ return false;
+
if (MI.isBundle())
InstrCount += MI.getBundleSize();
else if (!MI.isPHI() && !MI.isMetaInstruction())
Modified: head/lib/clang/include/VCSVersion.inc
==============================================================================
--- head/lib/clang/include/VCSVersion.inc Mon Oct 12 21:31:49 2020
(r366654)
+++ head/lib/clang/include/VCSVersion.inc Mon Oct 12 21:35:29 2020
(r366655)
@@ -1,14 +1,14 @@
// $FreeBSD$
-#define LLVM_REVISION "llvmorg-11.0.0-rc5-0-g60a25202a7d"
+#define LLVM_REVISION "llvmorg-11.0.0-0-g176249bd673"
#define LLVM_REPOSITORY "g...@github.com:llvm/llvm-project.git"
-#define CLANG_REVISION "llvmorg-11.0.0-rc5-0-g60a25202a7d"
+#define CLANG_REVISION "llvmorg-11.0.0-0-g176249bd673"
#define CLANG_REPOSITORY "g...@github.com:llvm/llvm-project.git"
// <Upstream revision at import>-<Local identifier in __FreeBSD_version style>
-#define LLD_REVISION "llvmorg-11.0.0-rc5-0-g60a25202a7d-1300007"
+#define LLD_REVISION "llvmorg-11.0.0-0-g176249bd673-1300007"
#define LLD_REPOSITORY "FreeBSD"
-#define LLDB_REVISION "llvmorg-11.0.0-rc5-0-g60a25202a7d"
+#define LLDB_REVISION "llvmorg-11.0.0-0-g176249bd673"
#define LLDB_REPOSITORY "g...@github.com:llvm/llvm-project.git"
Modified: head/lib/clang/include/llvm/Support/VCSRevision.h
==============================================================================
--- head/lib/clang/include/llvm/Support/VCSRevision.h Mon Oct 12 21:31:49
2020 (r366654)
+++ head/lib/clang/include/llvm/Support/VCSRevision.h Mon Oct 12 21:35:29
2020 (r366655)
@@ -1,3 +1,3 @@
/* $FreeBSD$ */
-#define LLVM_REVISION "llvmorg-11.0.0-rc5-0-g60a25202a7d"
+#define LLVM_REVISION "llvmorg-11.0.0-0-g176249bd673"
#define LLVM_REPOSITORY "g...@github.com:llvm/llvm-project.git"
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
