Revert "[Printer] Conditionally print Clang types in emitted SIL."

varungandhi-apple · varungandhi-apple · commit d9a7a7d49e77 · 2020-01-22T09:04:52.000-08:00
This reverts commit a27c5f0.
diff --git a/include/swift/AST/PrintOptions.h b/include/swift/AST/PrintOptions.h
@@ -564,7 +564,7 @@ struct PrintOptions {
   static PrintOptions printDocInterface();
 
   /// Retrieve the set of options suitable for printing SIL functions.
-  static PrintOptions printSIL(bool printFullConvention = false) {
+  static PrintOptions printSIL() {
     PrintOptions result;
     result.PrintLongAttrsOnSeparateLines = true;
     result.PrintStorageRepresentationAttrs = true;
@@ -575,9 +575,6 @@ struct PrintOptions {
     result.PrintIfConfig = false;
     result.OpaqueReturnTypePrinting =
         OpaqueReturnTypePrintingMode::StableReference;
-    if (printFullConvention)
-      result.PrintFunctionRepresentationAttrs =
-        PrintOptions::FunctionRepresentationMode::Full;
     return result;
   }
 
diff --git a/include/swift/AST/SILOptions.h b/include/swift/AST/SILOptions.h
@@ -78,9 +78,6 @@ class SILOptions {
   /// variables by name when we print it out. This eases diffing of SIL files.
   bool EmitSortedSIL = false;
 
-  /// See \ref FrontendOptions.PrintFullConvention
-  bool PrintFullConvention = false;
-
   /// Whether to stop the optimization pipeline after serializing SIL.
   bool StopOptimizationAfterSerialization = false;
 
diff --git a/include/swift/Frontend/FrontendOptions.h b/include/swift/Frontend/FrontendOptions.h
@@ -253,9 +253,6 @@ class FrontendOptions {
   /// See the \ref SILOptions.EmitSortedSIL flag.
   bool EmitSortedSIL = false;
 
-  /// Should we emit the cType when printing @convention(c) or no?
-  bool PrintFullConvention = false;
-
   /// Indicates whether the dependency tracker should track system
   /// dependencies as well.
   bool TrackSystemDeps = false;
diff --git a/include/swift/Frontend/ModuleInterfaceSupport.h b/include/swift/Frontend/ModuleInterfaceSupport.h
@@ -31,8 +31,8 @@ struct ModuleInterfaceOptions {
   /// interface, or should we fully-qualify them?
   bool PreserveTypesAsWritten = false;
 
-  /// See \ref FrontendOptions.PrintFullConvention.
-  /// FIXME: [clang-function-type-serialization] This flag should go away.
+  /// Should we emit the cType when printing @convention(c) or no?
+  /// FIXME: [clang-function-type-serialization] This check should go away.
   bool PrintFullConvention = false;
 
   /// Copy of all the command-line flags passed at .swiftinterface
diff --git a/include/swift/Option/FrontendOptions.td b/include/swift/Option/FrontendOptions.td
@@ -608,12 +608,10 @@ def module_interface_preserve_types_as_written :
   HelpText<"When emitting a module interface, preserve types as they were "
            "written in the source">;
 
-// FIXME: [clang-function-type-serialization] Make this a SIL-only option once we
-// start unconditionally emitting non-canonical Clang types in swiftinterfaces.
 def experimental_print_full_convention :
  Flag<["-"], "experimental-print-full-convention">,
- HelpText<"When emitting a module interface or SIL, emit additional @convention"
-          " arguments, regardless of whether they were written in the source">;
+ HelpText<"When emitting a module interface, emit additional @convention "
+          "arguments, regardless of whether they were written in the source">;
 
 def prebuilt_module_cache_path :
   Separate<["-"], "prebuilt-module-cache-path">,
diff --git a/include/swift/SIL/SILModule.h b/include/swift/SIL/SILModule.h
@@ -644,11 +644,10 @@ class SILModule {
   ///        printed. The module would usually contain the types and Decls that
   ///        the SIL module depends on.
   /// \param PrintASTDecls If set to true print AST decls.
-  void print(raw_ostream &OS,
-             ModuleDecl *M = nullptr,
-             const SILOptions &Opts = SILOptions(),
+  void print(raw_ostream &OS, bool Verbose = false,
+             ModuleDecl *M = nullptr, bool ShouldSort = false,
              bool PrintASTDecls = true) const {
-    SILPrintContext PrintCtx(OS, Opts);
+    SILPrintContext PrintCtx(OS, Verbose, ShouldSort);
     print(PrintCtx, M, PrintASTDecls);
   }
 
diff --git a/include/swift/SIL/SILPrintContext.h b/include/swift/SIL/SILPrintContext.h
@@ -13,7 +13,6 @@
 #ifndef SWIFT_SIL_PRINTCONTEXT_H
 #define SWIFT_SIL_PRINTCONTEXT_H
 
-#include "swift/AST/SILOptions.h"
 #include "swift/SIL/SILDebugScope.h"
 #include "swift/SIL/SILValue.h"
 #include "llvm/ADT/DenseMap.h"
@@ -66,21 +65,13 @@ class SILPrintContext {
   /// Print debug locations and scopes.
   bool DebugInfo;
 
-  /// See \ref FrontendOptions.PrintFullConvention.
-  bool PrintFullConvention;
-
 public:
   /// Constructor with default values for options.
   ///
   /// DebugInfo will be set according to the -sil-print-debuginfo option.
   SILPrintContext(llvm::raw_ostream &OS, bool Verbose = false,
                   bool SortedSIL = false);
 
-  /// Constructor based on SILOptions.
-  ///
-  /// DebugInfo will be set according to the -sil-print-debuginfo option.
-  SILPrintContext(llvm::raw_ostream &OS, const SILOptions &Opts);
-
   SILPrintContext(llvm::raw_ostream &OS, bool Verbose,
                   bool SortedSIL, bool DebugInfo);
 
@@ -103,9 +94,6 @@ class SILPrintContext {
   /// Returns true if debug locations and scopes should be printed.
   bool printDebugInfo() const { return DebugInfo; }
 
-  /// Returns true if the entire @convention(c, cType: ..) should be printed.
-  bool printFullConvention() const { return PrintFullConvention; }
-
   SILPrintContext::ID getID(const SILBasicBlock *Block);
 
   SILPrintContext::ID getID(const SILNode *node);
diff --git a/include/swift/SIL/SILType.h b/include/swift/SIL/SILType.h
@@ -581,8 +581,7 @@ class SILType {
 
   std::string getAsString() const;
   void dump() const;
-  void print(raw_ostream &OS,
-             const PrintOptions &PO = PrintOptions::printSIL()) const;
+  void print(raw_ostream &OS) const;
 };
 
 // Statically prevent SILTypes from being directly cast to a type
diff --git a/lib/Frontend/ArgsToFrontendOptionsConverter.cpp b/lib/Frontend/ArgsToFrontendOptionsConverter.cpp
@@ -68,8 +68,6 @@ bool ArgsToFrontendOptionsConverter::convert(
 
   Opts.EmitVerboseSIL |= Args.hasArg(OPT_emit_verbose_sil);
   Opts.EmitSortedSIL |= Args.hasArg(OPT_emit_sorted_sil);
-  Opts.PrintFullConvention |=
-    Args.hasArg(OPT_experimental_print_full_convention);
 
   Opts.EnableTesting |= Args.hasArg(OPT_enable_testing);
   Opts.EnablePrivateImports |= Args.hasArg(OPT_enable_private_imports);
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -964,8 +964,6 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
   Opts.DebugSerialization |= Args.hasArg(OPT_sil_debug_serialization);
   Opts.EmitVerboseSIL |= Args.hasArg(OPT_emit_verbose_sil);
   Opts.EmitSortedSIL |= Args.hasArg(OPT_emit_sorted_sil);
-  Opts.PrintFullConvention |=
-    Args.hasArg(OPT_experimental_print_full_convention);
   Opts.PrintInstCounts |= Args.hasArg(OPT_print_inst_counts);
   if (const Arg *A = Args.getLastArg(OPT_external_pass_pipeline_filename))
     Opts.ExternalPassPipelineFilename = A->getValue();
diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp
@@ -499,19 +499,20 @@ static bool emitSyntax(SourceFile *SF, StringRef OutputFilename) {
 }
 
 /// Writes SIL out to the given file.
-static bool writeSIL(SILModule &SM, ModuleDecl *M, const SILOptions &Opts,
-                     StringRef OutputFilename) {
+static bool writeSIL(SILModule &SM, ModuleDecl *M, bool EmitVerboseSIL,
+                     StringRef OutputFilename, bool SortSIL) {
   auto OS = getFileOutputStream(OutputFilename, M->getASTContext());
   if (!OS) return true;
-  SM.print(*OS, M, Opts);
+  SM.print(*OS, EmitVerboseSIL, M, SortSIL);
 
   return M->getASTContext().hadError();
 }
 
 static bool writeSIL(SILModule &SM, const PrimarySpecificPaths &PSPs,
                      const CompilerInstance &Instance,
-                     const SILOptions &Opts) {
-  return writeSIL(SM, Instance.getMainModule(), Opts, PSPs.OutputFilename);
+                     const SILOptions &opts) {
+  return writeSIL(SM, Instance.getMainModule(), opts.EmitVerboseSIL,
+                  PSPs.OutputFilename, opts.EmitSortedSIL);
 }
 
 /// Prints the Objective-C "generated header" interface for \p M to \p
diff --git a/lib/SIL/SILPrinter.cpp b/lib/SIL/SILPrinter.cpp
@@ -419,11 +419,12 @@ static void printSILTypeColorAndSigil(raw_ostream &OS, SILType t) {
   ::print(OS, t.getCategory());
 }
       
-void SILType::print(raw_ostream &OS, const PrintOptions &PO) const {
+void SILType::print(raw_ostream &OS) const {
   printSILTypeColorAndSigil(OS, *this);
   
   // Print other types as their Swift representation.
-  getASTType().print(OS, PO);
+  PrintOptions SubPrinter = PrintOptions::printSIL();
+  getASTType().print(OS, SubPrinter);
 }
 
 void SILType::dump() const {
@@ -492,8 +493,7 @@ class SILPrinter : public SILInstructionVisitor<SILPrinter> {
       SILPrintContext &PrintCtx,
       llvm::DenseMap<CanType, Identifier> *AlternativeTypeNames = nullptr)
       : Ctx(PrintCtx),
-        PrintState{{PrintCtx.OS()},
-                   PrintOptions::printSIL(PrintCtx.printFullConvention())},
+        PrintState{{PrintCtx.OS()}, PrintOptions::printSIL()},
         LastBufferID(0) {
     PrintState.ASTOptions.AlternativeTypeNames = AlternativeTypeNames;
     PrintState.ASTOptions.PrintForSIL = true;
@@ -2449,8 +2449,7 @@ void SILFunction::print(SILPrintContext &PrintCtx) const {
   }
 
   {
-    PrintOptions withGenericEnvironment =
-      PrintOptions::printSIL(PrintCtx.printFullConvention());
+    PrintOptions withGenericEnvironment = PrintOptions::printSIL();
     withGenericEnvironment.GenericEnv = env;
     withGenericEnvironment.AlternativeTypeNames =
       Aliases.empty() ? nullptr : &Aliases;
@@ -2733,8 +2732,7 @@ void SILModule::print(SILPrintContext &PrintCtx, ModuleDecl *M,
   // Print the declarations and types from the associated context (origin module or
   // current file).
   if (M && PrintASTDecls) {
-    PrintOptions Options =
-      PrintOptions::printSIL(PrintCtx.printFullConvention());
+    PrintOptions Options = PrintOptions::printSIL();
     Options.TypeDefinitions = true;
     Options.VarInitializers = true;
     // FIXME: ExplodePatternBindingDecls is incompatible with VarInitializers!
@@ -3118,11 +3116,6 @@ SILPrintContext::SILPrintContext(llvm::raw_ostream &OS, bool Verbose,
   OutStream(OS), Verbose(Verbose), SortedSIL(SortedSIL),
   DebugInfo(SILPrintDebugInfo) { }
 
-SILPrintContext::SILPrintContext(llvm::raw_ostream &OS,
-                                 const SILOptions &Opts) :
-  OutStream(OS), Verbose(Opts.EmitVerboseSIL), SortedSIL(Opts.EmitSortedSIL),
-  DebugInfo(SILPrintDebugInfo), PrintFullConvention(Opts.PrintFullConvention) {}
-
 SILPrintContext::SILPrintContext(llvm::raw_ostream &OS, bool Verbose,
                                  bool SortedSIL, bool DebugInfo) :
   OutStream(OS), Verbose(Verbose), SortedSIL(SortedSIL),
diff --git a/test/SIL/clang-function-types.swift b/test/SIL/clang-function-types.swift
diff --git a/tools/sil-func-extractor/SILFunctionExtractor.cpp b/tools/sil-func-extractor/SILFunctionExtractor.cpp
@@ -101,10 +101,10 @@ static llvm::cl::opt<std::string> Triple("target",
                                          llvm::cl::desc("target triple"));
 
 static llvm::cl::opt<bool>
-EmitSortedSIL("emit-sorted-sil", llvm::cl::Hidden,
-              llvm::cl::init(false),
-              llvm::cl::desc("Sort Functions, VTables, Globals, "
-                             "WitnessTables by name to ease diffing."));
+EnableSILSortOutput("emit-sorted-sil", llvm::cl::Hidden,
+                    llvm::cl::init(false),
+                    llvm::cl::desc("Sort Functions, VTables, Globals, "
+                                   "WitnessTables by name to ease diffing."));
 
 static llvm::cl::opt<bool>
 DisableASTDump("sil-disable-ast-dump", llvm::cl::Hidden,
@@ -250,10 +250,6 @@ int main(int argc, char **argv) {
   Invocation.getLangOptions().EnableAccessControl = false;
   Invocation.getLangOptions().EnableObjCAttrRequiresFoundation = false;
 
-  SILOptions &Opts = Invocation.getSILOptions();
-  Opts.EmitVerboseSIL = EmitVerboseSIL;
-  Opts.EmitSortedSIL = EmitSortedSIL;
-
   serialization::ExtendedValidationInfo extendedInfo;
   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> FileBufOrErr =
       Invocation.setUpInputForSILTool(InputFilename, ModuleName,
@@ -360,8 +356,8 @@ int main(int argc, char **argv) {
         OutputFilename.size() ? StringRef(OutputFilename) : "-";
 
     if (OutputFile == "-") {
-      CI.getSILModule()->print(llvm::outs(), CI.getMainModule(),
-                               Invocation.getSILOptions(), !DisableASTDump);
+      CI.getSILModule()->print(llvm::outs(), EmitVerboseSIL, CI.getMainModule(),
+                               EnableSILSortOutput, !DisableASTDump);
     } else {
       std::error_code EC;
       llvm::raw_fd_ostream OS(OutputFile, EC, llvm::sys::fs::F_None);
@@ -370,8 +366,8 @@ int main(int argc, char **argv) {
                      << '\n';
         return 1;
       }
-      CI.getSILModule()->print(OS, CI.getMainModule(),
-                               Invocation.getSILOptions(), !DisableASTDump);
+      CI.getSILModule()->print(OS, EmitVerboseSIL, CI.getMainModule(),
+                               EnableSILSortOutput, !DisableASTDump);
     }
   }
 }
diff --git a/tools/sil-opt/SILOpt.cpp b/tools/sil-opt/SILOpt.cpp
@@ -196,10 +196,10 @@ static llvm::cl::opt<std::string>
 ModuleCachePath("module-cache-path", llvm::cl::desc("Clang module cache path"));
 
 static llvm::cl::opt<bool>
-EmitSortedSIL("emit-sorted-sil", llvm::cl::Hidden,
-              llvm::cl::init(false),
-              llvm::cl::desc("Sort Functions, VTables, Globals, "
-                             "WitnessTables by name to ease diffing."));
+EnableSILSortOutput("emit-sorted-sil", llvm::cl::Hidden,
+                    llvm::cl::init(false),
+                    llvm::cl::desc("Sort Functions, VTables, Globals, "
+                                   "WitnessTables by name to ease diffing."));
 
 static llvm::cl::opt<bool>
 DisableASTDump("sil-disable-ast-dump", llvm::cl::Hidden,
@@ -375,8 +375,6 @@ int main(int argc, char **argv) {
       break;
     }
   }
-  SILOpts.EmitVerboseSIL |= EmitVerboseSIL;
-  SILOpts.EmitSortedSIL |= EmitSortedSIL;
 
   serialization::ExtendedValidationInfo extendedInfo;
   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> FileBufOrErr =
@@ -483,8 +481,8 @@ int main(int argc, char **argv) {
                                    StringRef(OutputFilename) : "-";
 
     if (OutputFile == "-") {
-      CI.getSILModule()->print(llvm::outs(), CI.getMainModule(),
-                               Invocation.getSILOptions(), !DisableASTDump);
+      CI.getSILModule()->print(llvm::outs(), EmitVerboseSIL, CI.getMainModule(),
+                               EnableSILSortOutput, !DisableASTDump);
     } else {
       std::error_code EC;
       llvm::raw_fd_ostream OS(OutputFile, EC, llvm::sys::fs::F_None);
@@ -493,8 +491,8 @@ int main(int argc, char **argv) {
                      << EC.message() << '\n';
         return 1;
       }
-      CI.getSILModule()->print(OS, CI.getMainModule(),
-                               Invocation.getSILOptions(), !DisableASTDump);
+      CI.getSILModule()->print(OS, EmitVerboseSIL, CI.getMainModule(),
+                               EnableSILSortOutput, !DisableASTDump);
     }
   }
 
