deprecate the -experimental-performance-annotations option

Performance annotations can now be used without specifying this option

Author: eeckstein

include/swift/AST/DiagnosticsSIL.def

@@ -310,8 +310,6 @@ WARNING(warn_dead_weak_store,none,
         "deallocated here", ())
 
 // performance diagnostics
-ERROR(performance_annotations_not_enabled,none,
-      "use -experimental-performance-annotations to enable performance annotations", ())
 ERROR(performance_dynamic_casting,none,
       "dynamic casting can lock or allocate", ())
 ERROR(performance_metadata,none,

include/swift/AST/SILOptions.h

@@ -125,9 +125,6 @@ class SILOptions {
   /// Controls whether cross module optimization is enabled.
   CrossModuleOptimizationMode CMOMode = CrossModuleOptimizationMode::Off;
 
-  /// Enables experimental performance annotations.
-  bool EnablePerformanceAnnotations = false;
-
   /// Enables the emission of stack protectors in functions.
   bool EnableStackProtection = true;
 

include/swift/Option/Options.td

@@ -935,7 +935,7 @@ def disableCrossModuleOptimization : Flag<["-"], "disable-cmo">,
 
 def ExperimentalPerformanceAnnotations : Flag<["-"], "experimental-performance-annotations">,
   Flags<[HelpHidden, FrontendOption]>,
-  HelpText<"Enable experimental performance annotations">;
+  HelpText<"Deprecated, has no effect">;
 
 def RemoveRuntimeAsserts : Flag<["-"], "remove-runtime-asserts">,
   Flags<[FrontendOption]>,

lib/DriverTool/sil_opt_main.cpp

@@ -638,7 +638,6 @@ int sil_opt_main(ArrayRef<const char *> argv, void *MainAddr) {
   SILOpts.OptRecordFile = options.RemarksFilename;
   SILOpts.OptRecordPasses = options.RemarksPasses;
   SILOpts.checkSILModuleLeaks = true;
-  SILOpts.EnablePerformanceAnnotations = true;
   SILOpts.EnableStackProtection = true;
   SILOpts.EnableMoveInoutStackProtection = options.EnableMoveInoutStackProtection;
 

lib/Frontend/CompilerInvocation.cpp

@@ -2058,8 +2058,6 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
   } else if (Args.hasArg(OPT_EnbaleDefaultCMO)) {
     Opts.CMOMode = CrossModuleOptimizationMode::Default;  
   }
-  Opts.EnablePerformanceAnnotations |=
-      Args.hasArg(OPT_ExperimentalPerformanceAnnotations);
   Opts.EnableStackProtection =
       Args.hasFlag(OPT_enable_stack_protector, OPT_disable_stack_protector,
                    Opts.EnableStackProtection);

lib/SILOptimizer/Mandatory/PerformanceDiagnostics.cpp

@@ -486,13 +486,6 @@ class PerformanceDiagnosticsPass : public SILModuleTransform {
         if (function.wasDeserializedCanonical())
           continue;
 
-        if (!module->getOptions().EnablePerformanceAnnotations) {
-          module->getASTContext().Diags.diagnose(
-            function.getLocation().getSourceLoc(),
-            diag::performance_annotations_not_enabled);
-          return;
-        }
-
         diagnoser.visitFunction(&function, function.getPerfConstraints());
       }
     }

lib/SILOptimizer/Transforms/GenericSpecializer.cpp

@@ -208,9 +208,6 @@ class MandatoryGenericSpecializer : public SILModuleTransform {
 void MandatoryGenericSpecializer::run() {
   SILModule *module = getModule();
 
-  if (!module->getOptions().EnablePerformanceAnnotations)
-    return;
-
   ClassHierarchyAnalysis *cha = getAnalysis<ClassHierarchyAnalysis>();
 
   llvm::SmallVector<SILFunction *, 8> workList;