merge main into amd-staging

Change-Id: I53753f919c905e20b8b941422459e7b3fdd405b4

.ci/monolithic-linux.sh

@@ -18,7 +18,7 @@ set -o pipefail
 
 MONOREPO_ROOT="${MONOREPO_ROOT:="$(git rev-parse --show-toplevel)"}"
 BUILD_DIR="${BUILD_DIR:=${MONOREPO_ROOT}/build}"
-rm -rf ${BUILD_DIR}
+rm -rf "${BUILD_DIR}"
 
 ccache --zero-stats
 
@@ -37,8 +37,8 @@ projects="${1}"
 targets="${2}"
 
 echo "--- cmake"
-pip install -q -r ${MONOREPO_ROOT}/mlir/python/requirements.txt
-cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
+pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
+cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
  -D LLVM_ENABLE_PROJECTS="${projects}" \
  -G Ninja \
  -D CMAKE_BUILD_TYPE=Release \

.ci/monolithic-windows.sh

@@ -19,7 +19,7 @@ set -o pipefail
 MONOREPO_ROOT="${MONOREPO_ROOT:="$(git rev-parse --show-toplevel)"}"
 BUILD_DIR="${BUILD_DIR:=${MONOREPO_ROOT}/build}"
 
-rm -rf ${BUILD_DIR}
+rm -rf "${BUILD_DIR}"
 
 if [[ -n "${CLEAR_CACHE:-}" ]]; then
  echo "clearing sccache"
@@ -37,14 +37,14 @@ projects="${1}"
 targets="${2}"
 
 echo "--- cmake"
-pip install -q -r ${MONOREPO_ROOT}/mlir/python/requirements.txt
+pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
 
 # The CMAKE_*_LINKER_FLAGS to disable the manifest come from research
 # on fixing a build reliability issue on the build server, please
 # see https://github.com/llvm/llvm-project/pull/82393 and
 # https://discourse.llvm.org/t/rfc-future-of-windows-pre-commit-ci/76840/40
 # for further information.
-cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
+cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
  -D LLVM_ENABLE_PROJECTS="${projects}" \
  -G Ninja \
  -D CMAKE_BUILD_TYPE=Release \

bolt/lib/Core/BinaryFunction.cpp

@@ -3547,7 +3547,7 @@ MCSymbol *BinaryFunction::getSymbolForEntryID(uint64_t EntryID) {
  if (!isMultiEntry())
  return nullptr;
 
- uint64_t NumEntries = 0;
+ uint64_t NumEntries = 1;
  if (hasCFG()) {
  for (BinaryBasicBlock *BB : BasicBlocks) {
  MCSymbol *EntrySymbol = getSecondaryEntryPointSymbol(*BB);
@@ -3580,7 +3580,7 @@ uint64_t BinaryFunction::getEntryIDForSymbol(const MCSymbol *Symbol) const {
  return 0;
 
  // Check all secondary entries available as either basic blocks or lables.
- uint64_t NumEntries = 0;
+ uint64_t NumEntries = 1;
  for (const BinaryBasicBlock *BB : BasicBlocks) {
  MCSymbol *EntrySymbol = getSecondaryEntryPointSymbol(*BB);
  if (!EntrySymbol)
@@ -3589,7 +3589,7 @@ uint64_t BinaryFunction::getEntryIDForSymbol(const MCSymbol *Symbol) const {
  return NumEntries;
  ++NumEntries;
  }
- NumEntries = 0;
+ NumEntries = 1;
  for (const std::pair<const uint32_t, MCSymbol *> &KV : Labels) {
  MCSymbol *EntrySymbol = getSecondaryEntryPointSymbol(KV.second);
  if (!EntrySymbol)

bolt/lib/Profile/YAMLProfileWriter.cpp

@@ -25,6 +25,25 @@ extern llvm::cl::opt<bool> ProfileUseDFS;
 namespace llvm {
 namespace bolt {
 
+/// Set CallSiteInfo destination fields from \p Symbol and return a target
+/// BinaryFunction for that symbol.
+static const BinaryFunction *setCSIDestination(const BinaryContext &BC,
+ yaml::bolt::CallSiteInfo &CSI,
+ const MCSymbol *Symbol) {
+ CSI.DestId = 0; // designated for unknown functions
+ CSI.EntryDiscriminator = 0;
+ if (Symbol) {
+ uint64_t EntryID = 0;
+ if (const BinaryFunction *const Callee =
+ BC.getFunctionForSymbol(Symbol, &EntryID)) {
+ CSI.DestId = Callee->getFunctionNumber();
+ CSI.EntryDiscriminator = EntryID;
+ return Callee;
+ }
+ }
+ return nullptr;
+}
+
 yaml::bolt::BinaryFunctionProfile
 YAMLProfileWriter::convert(const BinaryFunction &BF, bool UseDFS) {
  yaml::bolt::BinaryFunctionProfile YamlBF;
@@ -79,31 +98,20 @@ YAMLProfileWriter::convert(const BinaryFunction &BF, bool UseDFS) {
  continue;
  for (const IndirectCallProfile &CSP : ICSP.get()) {
  StringRef TargetName = "";
- CSI.DestId = 0; // designated for unknown functions
- CSI.EntryDiscriminator = 0;
- if (CSP.Symbol) {
- const BinaryFunction *Callee = BC.getFunctionForSymbol(CSP.Symbol);
- if (Callee) {
- CSI.DestId = Callee->getFunctionNumber();
- TargetName = Callee->getOneName();
- }
- }
+ const BinaryFunction *Callee = setCSIDestination(BC, CSI, CSP.Symbol);
+ if (Callee)
+ TargetName = Callee->getOneName();
  CSI.Count = CSP.Count;
  CSI.Mispreds = CSP.Mispreds;
  CSTargets.emplace_back(TargetName, CSI);
  }
  } else { // direct call or a tail call
- uint64_t EntryID = 0;
- CSI.DestId = 0;
  StringRef TargetName = "";
  const MCSymbol *CalleeSymbol = BC.MIB->getTargetSymbol(Instr);
  const BinaryFunction *const Callee =
- BC.getFunctionForSymbol(CalleeSymbol, &EntryID);
- if (Callee) {
- CSI.DestId = Callee->getFunctionNumber();
- CSI.EntryDiscriminator = EntryID;
+ setCSIDestination(BC, CSI, CalleeSymbol);
+ if (Callee)
  TargetName = Callee->getOneName();
- }
 
  auto getAnnotationWithDefault = [&](const MCInst &Inst, StringRef Ann) {
  return BC.MIB->getAnnotationWithDefault(Instr, Ann, 0ull);

bolt/test/X86/yaml-secondary-entry-discriminator.s

@@ -0,0 +1,74 @@
+# This reproduces a bug with BOLT setting incorrect discriminator for
+# secondary entry points in YAML profile.
+
+# REQUIRES: system-linux
+# RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown %s -o %t.o
+# RUN: link_fdata %s %t.o %t.fdata
+# RUN: llvm-strip --strip-unneeded %t.o
+# RUN: %clang %cflags %t.o -o %t.exe -Wl,-q -nostdlib
+# RUN: llvm-bolt %t.exe -o %t.out --data %t.fdata -w %t.yaml --print-profile \
+# RUN: --print-only=main | FileCheck %s --check-prefix=CHECK-CFG
+# RUN: FileCheck %s -input-file %t.yaml
+# CHECK: - name: main
+# CHECK-NEXT: fid: 2
+# CHECK-NEXT: hash: 0xADF270D550151185
+# CHECK-NEXT: exec: 0
+# CHECK-NEXT: nblocks: 4
+# CHECK-NEXT: blocks:
+# CHECK: - bid: 1
+# CHECK-NEXT: insns: 1
+# CHECK-NEXT: hash: 0x36A303CBA4360014
+# CHECK-NEXT: calls: [ { off: 0x0, fid: 1, disc: 1, cnt: 1 } ]
+# CHECK: - bid: 2
+# CHECK-NEXT: insns: 5
+# CHECK-NEXT: hash: 0x8B2F5747CD0019
+# CHECK-NEXT: calls: [ { off: 0x0, fid: 1, disc: 1, cnt: 1, mis: 1 } ]
+
+# Make sure that the profile is attached correctly
+# RUN: llvm-bolt %t.exe -o %t.out --data %t.yaml --print-profile \
+# RUN: --print-only=main | FileCheck %s --check-prefix=CHECK-CFG
+
+# CHECK-CFG: Binary Function "main" after attaching profile {
+# CHECK-CFG: callq secondary_entry # Offset: [[#]] # Count: 1
+# CHECK-CFG: callq *%rax # Offset: [[#]] # CallProfile: 1 (1 misses) :
+# CHECK-CFG-NEXT: { secondary_entry: 1 (1 misses) }
+
+.globl func
+.type func, @function
+func:
+# FDATA: 0 [unknown] 0 1 func 0 1 0
+ .cfi_startproc
+ pushq %rbp
+ movq %rsp, %rbp
+.globl secondary_entry
+secondary_entry:
+ popq %rbp
+ retq
+ nopl (%rax)
+ .cfi_endproc
+ .size func, .-func
+
+.globl main
+.type main, @function
+main:
+ .cfi_startproc
+ pushq %rbp
+ movq %rsp, %rbp
+ subq $16, %rsp
+ movl $0, -4(%rbp)
+ testq %rax, %rax
+ jne Lindcall
+Lcall:
+ call secondary_entry
+# FDATA: 1 main #Lcall# 1 secondary_entry 0 1 1
+Lindcall:
+ callq *%rax
+# FDATA: 1 main #Lindcall# 1 secondary_entry 0 1 1
+ xorl %eax, %eax
+ addq $16, %rsp
+ popq %rbp
+ retq
+# For relocations against .text
+ call exit
+ .cfi_endproc
+ .size main, .-main

clang/docs/ReleaseNotes.rst

@@ -289,6 +289,9 @@ Improvements to Clang's diagnostics
  annotated with the ``clang::always_destroy`` attribute.
  Fixes #GH68686, #GH86486
 
+- ``-Wmicrosoft``, ``-Wgnu``, or ``-pedantic`` is now required to diagnose C99
+ flexible array members in a union or alone in a struct. Fixes GH#84565.
+
 Improvements to Clang's time-trace
 ----------------------------------
 

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -6464,9 +6464,6 @@ def ext_c99_flexible_array_member : Extension<
 def err_flexible_array_virtual_base : Error<
  "flexible array member %0 not allowed in "
  "%select{struct|interface|union|class|enum}1 which has a virtual base class">;
-def err_flexible_array_empty_aggregate : Error<
- "flexible array member %0 not allowed in otherwise empty "
- "%select{struct|interface|union|class|enum}1">;
 def err_flexible_array_has_nontrivial_dtor : Error<
  "flexible array member %0 of type %1 with non-trivial destruction">;
 def ext_flexible_array_in_struct : Extension<
@@ -6481,8 +6478,6 @@ def ext_flexible_array_empty_aggregate_ms : Extension<
  "flexible array member %0 in otherwise empty "
  "%select{struct|interface|union|class|enum}1 is a Microsoft extension">,
  InGroup<MicrosoftFlexibleArray>;
-def err_flexible_array_union : Error<
- "flexible array member %0 in a union is not allowed">;
 def ext_flexible_array_union_ms : Extension<
  "flexible array member %0 in a union is a Microsoft extension">,
  InGroup<MicrosoftFlexibleArray>;

clang/lib/AST/ASTContext.cpp

@@ -9601,11 +9601,11 @@ static uint64_t getRVVTypeSize(ASTContext &Context, const BuiltinType *Ty) {
 
  ASTContext::BuiltinVectorTypeInfo Info = Context.getBuiltinVectorTypeInfo(Ty);
 
- unsigned EltSize = Context.getTypeSize(Info.ElementType);
+ uint64_t EltSize = Context.getTypeSize(Info.ElementType);
  if (Info.ElementType == Context.BoolTy)
  EltSize = 1;
 
- unsigned MinElts = Info.EC.getKnownMinValue();
+ uint64_t MinElts = Info.EC.getKnownMinValue();
  return VScale->first * MinElts * EltSize;
 }
 

clang/lib/CodeGen/CGExprComplex.cpp

@@ -289,7 +289,7 @@ class ComplexExprEmitter
  const BinOpInfo &Op);
 
  QualType GetHigherPrecisionFPType(QualType ElementType) {
- const auto *CurrentBT = dyn_cast<BuiltinType>(ElementType);
+ const auto *CurrentBT = cast<BuiltinType>(ElementType);
  switch (CurrentBT->getKind()) {
  case BuiltinType::Kind::Float16:
  return CGF.getContext().FloatTy;

clang/lib/CodeGen/Targets/PPC.cpp

@@ -274,7 +274,7 @@ void AIXTargetCodeGenInfo::setTargetAttributes(
  if (!isa<llvm::GlobalVariable>(GV))
  return;
 
- auto *GVar = dyn_cast<llvm::GlobalVariable>(GV);
+ auto *GVar = cast<llvm::GlobalVariable>(GV);
  auto GVId = GV->getName();
 
  // Is this a global variable specified by the user as toc-data?

clang/lib/Driver/ToolChains/CommonArgs.cpp

@@ -770,8 +770,9 @@ bool tools::isTLSDESCEnabled(const ToolChain &TC,
 void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
  ArgStringList &CmdArgs, const InputInfo &Output,
  const InputInfo &Input, bool IsThinLTO) {
- const bool IsOSAIX = ToolChain.getTriple().isOSAIX();
- const bool IsAMDGCN = ToolChain.getTriple().isAMDGCN();
+ const llvm::Triple &Triple = ToolChain.getTriple();
+ const bool IsOSAIX = Triple.isOSAIX();
+ const bool IsAMDGCN = Triple.isAMDGCN();
  const char *Linker = Args.MakeArgString(ToolChain.GetLinkerPath());
  const Driver &D = ToolChain.getDriver();
  bool ClosedNeeded =
@@ -782,7 +783,7 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
  const bool IsUnifiedLTO = Args.hasArg(options::OPT_funified_lto);
  if (llvm::sys::path::filename(Linker) != "ld.lld" &&
  llvm::sys::path::stem(Linker) != "ld.lld" && !ClosedNeeded &&
- !ToolChain.getTriple().isOSOpenBSD()) {
+ !Triple.isOSOpenBSD()) {
  // Tell the linker to load the plugin. This has to come before
  // AddLinkerInputs as gold requires -plugin and AIX ld requires -bplugin to
  // come before any -plugin-opt/-bplugin_opt that -Wl might forward.
@@ -851,7 +852,7 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
  // the plugin.
 
  // Handle flags for selecting CPU variants.
- std::string CPU = getCPUName(D, Args, ToolChain.getTriple());
+ std::string CPU = getCPUName(D, Args, Triple);
  if (!CPU.empty())
  CmdArgs.push_back(
  Args.MakeArgString(Twine(PluginOptPrefix) + ExtraDash + "mcpu=" + CPU));
@@ -982,10 +983,9 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
  bool HasRoptr = Args.hasFlag(options::OPT_mxcoff_roptr,
  options::OPT_mno_xcoff_roptr, false);
  StringRef OptStr = HasRoptr ? "-mxcoff-roptr" : "-mno-xcoff-roptr";
-
  if (!IsOSAIX)
  D.Diag(diag::err_drv_unsupported_opt_for_target)
- << OptStr << ToolChain.getTriple().str();
+ << OptStr << Triple.str();
 
  if (HasRoptr) {
  // The data sections option is on by default on AIX. We only need to error
@@ -1048,7 +1048,7 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
  }
 
  if (Args.hasFlag(options::OPT_femulated_tls, options::OPT_fno_emulated_tls,
- ToolChain.getTriple().hasDefaultEmulatedTLS())) {
+ Triple.hasDefaultEmulatedTLS())) {
  CmdArgs.push_back(
  Args.MakeArgString(Twine(PluginOptPrefix) + "-emulated-tls"));
  }

clang/lib/Format/TokenAnnotator.cpp

@@ -4827,6 +4827,10 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
  Right.is(TT_TemplateOpener)) {
  return true;
  }
+ if (Left.is(tok::identifier) && Right.is(tok::numeric_constant) &&
+ Right.TokenText[0] == '.') {
+ return false;
+ }
  } else if (Style.isProto()) {
  if (Right.is(tok::period) &&
  Left.isOneOf(Keywords.kw_optional, Keywords.kw_required,

clang/lib/InstallAPI/Visitor.cpp

@@ -255,7 +255,7 @@ bool InstallAPIVisitor::VisitFunctionDecl(const FunctionDecl *D) {
  return true;
 
  // Skip methods in CXX RecordDecls.
- for (auto P : D->getASTContext().getParents(*M)) {
+ for (const DynTypedNode &P : D->getASTContext().getParents(*M)) {
  if (P.get<CXXRecordDecl>())
  return true;
  }

clang/lib/Sema/SemaDecl.cpp

@@ -19429,15 +19429,11 @@ void Sema::ActOnFields(Scope *S, SourceLocation RecLoc, Decl *EnclosingDecl,
  } else if (Record->isUnion())
  DiagID = getLangOpts().MicrosoftExt
  ? diag::ext_flexible_array_union_ms
- : getLangOpts().CPlusPlus
- ? diag::ext_flexible_array_union_gnu
- : diag::err_flexible_array_union;
+ : diag::ext_flexible_array_union_gnu;
  else if (NumNamedMembers < 1)
  DiagID = getLangOpts().MicrosoftExt
  ? diag::ext_flexible_array_empty_aggregate_ms
- : getLangOpts().CPlusPlus
- ? diag::ext_flexible_array_empty_aggregate_gnu
- : diag::err_flexible_array_empty_aggregate;
+ : diag::ext_flexible_array_empty_aggregate_gnu;
 
  if (DiagID)
  Diag(FD->getLocation(), DiagID)

clang/lib/Sema/SemaInit.cpp

@@ -2329,11 +2329,11 @@ void InitListChecker::CheckStructUnionTypes(
  break;
  }
 
- // We've already initialized a member of a union. We're done.
+ // We've already initialized a member of a union. We can stop entirely.
  if (InitializedSomething && RD->isUnion())
- break;
+ return;
 
- // If we've hit the flexible array member at the end, we're done.
+ // Stop if we've hit a flexible array member.
  if (Field->getType()->isIncompleteArrayType())
  break;
 
@@ -2456,6 +2456,11 @@ void InitListChecker::CheckStructUnionTypes(
  else
  CheckImplicitInitList(MemberEntity, IList, Field->getType(), Index,
  StructuredList, StructuredIndex);
+
+ if (RD->isUnion() && StructuredList) {
+ // Initialize the first field within the union.
+ StructuredList->setInitializedFieldInUnion(*Field);
+ }
 }
 
 /// Expand a field designator that refers to a member of an

clang/lib/Sema/SemaTemplate.cpp

@@ -2974,7 +2974,7 @@ void DeclareImplicitDeductionGuidesForTypeAlias(
  if (auto *FPrime = SemaRef.InstantiateFunctionDeclaration(
  F, TemplateArgListForBuildingFPrime, AliasTemplate->getLocation(),
  Sema::CodeSynthesisContext::BuildingDeductionGuides)) {
- auto *GG = dyn_cast<CXXDeductionGuideDecl>(FPrime);
+ auto *GG = cast<CXXDeductionGuideDecl>(FPrime);
  buildDeductionGuide(SemaRef, AliasTemplate, FPrimeTemplateParamList,
  GG->getCorrespondingConstructor(),
  GG->getExplicitSpecifier(), GG->getTypeSourceInfo(),