Add variable name and indent parameter...

... to value witness table access sequence function

Author: WANGJIEKE

lib/PrintAsClang/ClangSyntaxPrinter.cpp

@@ -147,13 +147,15 @@ void ClangSyntaxPrinter::printSwiftTypeMetadataAccessFunctionCall(
 }
 
 void ClangSyntaxPrinter::printValueWitnessTableAccessSequenceFromTypeMetadata(
-    StringRef metadataVariable) {
-  os << "    auto *vwTableAddr = ";
+    StringRef metadataVariable, StringRef vwTableVariable, int indent) {
+  os << std::string(indent, ' ');
+  os << "auto *vwTableAddr = ";
   os << "reinterpret_cast<";
   printSwiftImplQualifier();
   os << "ValueWitnessTable **>(" << metadataVariable << "._0) - 1;\n";
   os << "#ifdef __arm64e__\n";
-  os << "    auto *vwTable = ";
+  os << std::string(indent, ' ');
+  os << "auto *" << vwTableVariable << " = ";
   os << "reinterpret_cast<";
   printSwiftImplQualifier();
   os << "ValueWitnessTable *>(ptrauth_auth_data(";
@@ -162,6 +164,7 @@ void ClangSyntaxPrinter::printValueWitnessTableAccessSequenceFromTypeMetadata(
   os << "ptrauth_blend_discriminator(vwTableAddr, "
      << SpecialPointerAuthDiscriminators::ValueWitnessTable << ")));\n";
   os << "#else\n";
-  os << "    auto *vwTable = *vwTableAddr;\n";
+  os << std::string(indent, ' ');
+  os << "auto *" << vwTableVariable << " = *vwTableAddr;\n";
   os << "#endif\n";
 }

lib/PrintAsClang/ClangSyntaxPrinter.h

@@ -93,7 +93,7 @@ class ClangSyntaxPrinter {
   /// Print the set of statements to access the value witness table pointer
   /// ('vwTable') from the given type metadata variable.
   void printValueWitnessTableAccessSequenceFromTypeMetadata(
-      StringRef metadataVariable);
+      StringRef metadataVariable, StringRef vwTableVariable, int indent);
 
 protected:
   raw_ostream &os;

lib/PrintAsClang/PrintClangValueType.cpp

@@ -65,7 +65,8 @@ void ClangValueTypePrinter::printValueWitnessTableAccessAsVariable(
     StringRef metadataVarName, StringRef vwTableVarName) {
   ClangSyntaxPrinter printer(os);
   printMetadataAccessAsVariable(os, metadataFuncName, indent, metadataVarName);
-  printer.printValueWitnessTableAccessSequenceFromTypeMetadata("metadata");
+  printer.printValueWitnessTableAccessSequenceFromTypeMetadata(
+      metadataVarName, vwTableVarName, indent);
 }
 
 static void