Merge commit '907d3acefc3b' from llvm.org/main into next

Author: git apple-llvm automerger

clang/docs/ReleaseNotes.rst

@@ -117,6 +117,7 @@ Non-comprehensive list of changes in this release
   - Support bitfields in struct and union.
   - Improve the dump format, dump both bitwidth(if its a bitfield) and field value.
   - Remove anonymous tag locations.
+  - Beautify dump format, add indent for nested struct and struct members.
 
 New Compiler Flags
 ------------------

clang/lib/CodeGen/CGBuiltin.cpp

@@ -2049,11 +2049,12 @@ static llvm::Value *dumpRecord(CodeGenFunction &CGF, QualType RType,
   ASTContext &Context = CGF.getContext();
   RecordDecl *RD = RType->castAs<RecordType>()->getDecl()->getDefinition();
   std::string Pad = std::string(Lvl * 4, ' ');
+  std::string ElementPad = std::string((Lvl + 1) * 4, ' ');
 
   PrintingPolicy Policy(Context.getLangOpts());
   Policy.AnonymousTagLocations = false;
-  Value *GString =
-      CGF.Builder.CreateGlobalStringPtr(RType.getAsString(Policy) + " {\n");
+  Value *GString = CGF.Builder.CreateGlobalStringPtr(
+    llvm::Twine(Pad).concat(RType.getAsString(Policy)).concat(" {\n").str());
   Value *Res = CGF.Builder.CreateCall(Func, {GString});
 
   static llvm::DenseMap<QualType, const char *> Types;
@@ -2081,7 +2082,7 @@ static llvm::Value *dumpRecord(CodeGenFunction &CGF, QualType RType,
   for (const auto *FD : RD->fields()) {
     Value *TmpRes = nullptr;
 
-    std::string Format = llvm::Twine(Pad)
+    std::string Format = llvm::Twine(ElementPad)
                              .concat(FD->getType().getAsString())
                              .concat(llvm::Twine(' '))
                              .concat(FD->getNameAsString())