Rename -dump-trc option to -dump-type-refinement-contexts

As Jordan notes, 'TRC' is not a commonly-known acronym for most Swift compiler developers. Swift SVN r30414
bdvx2507 · Jul 20, 2015 · ea18bc0 · ea18bc0
1 parent ada08bd
commit ea18bc0
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/include/swift/Frontend/FrontendOptions.h b/include/swift/Frontend/FrontendOptions.h
@@ -129,7 +129,8 @@ class FrontendOptions {
     DumpAST, ///< Parse, type-check, and dump AST
     PrintAST, ///< Parse, type-check, and pretty-print AST
 
-    DumpTRC, ///< Parse, type-check, and dump type refinement context hierarchy
+    /// Parse, type-check, and dump type refinement context hierarchy
+    DumpTypeRefinementContexts,
 
     EmitSILGen, ///< Emit raw SIL
     EmitSIL, ///< Emit canonical SIL

diff --git a/include/swift/Option/Options.td b/include/swift/Option/Options.td
@@ -344,7 +344,8 @@ def dump_parse : Flag<["-"], "dump-parse">,
 def dump_ast : Flag<["-"], "dump-ast">,
   HelpText<"Parse and type-check input file(s) and dump AST(s)">, ModeOpt,
   Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild]>;
-def dump_trc : Flag<["-"], "dump-trc">,
+def dump_type_refinement_contexts :
+  Flag<["-"], "dump-type-refinement-contexts">,
   HelpText<"Type-check input file(s) and dump type refinement contexts(s)">,
   ModeOpt,
   Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild]>;

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
@@ -938,7 +938,7 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
     case options::OPT_dump_parse:
     case options::OPT_dump_ast:
     case options::OPT_print_ast:
-    case options::OPT_dump_trc:
+    case options::OPT_dump_type_refinement_contexts:
       OI.CompilerOutputType = types::TY_Nothing;
       break;
 

diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -166,8 +166,8 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
       Action = FrontendOptions::DumpParse;
     } else if (Opt.matches(OPT_dump_ast)) {
       Action = FrontendOptions::DumpAST;
-    } else if (Opt.matches(OPT_dump_trc)) {
-      Action = FrontendOptions::DumpTRC;
+    } else if (Opt.matches(OPT_dump_type_refinement_contexts)) {
+      Action = FrontendOptions::DumpTypeRefinementContexts;
     } else if (Opt.matches(OPT_print_ast)) {
       Action = FrontendOptions::PrintAST;
     } else if (Opt.matches(OPT_repl) ||
@@ -338,7 +338,7 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
     case FrontendOptions::DumpParse:
     case FrontendOptions::DumpAST:
     case FrontendOptions::PrintAST:
-    case FrontendOptions::DumpTRC:
+    case FrontendOptions::DumpTypeRefinementContexts:
       // Textual modes.
       Opts.setSingleOutputFilename("-");
       break;
@@ -526,7 +526,7 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
     case FrontendOptions::DumpParse:
     case FrontendOptions::DumpAST:
     case FrontendOptions::PrintAST:
-    case FrontendOptions::DumpTRC:
+    case FrontendOptions::DumpTypeRefinementContexts:
     case FrontendOptions::Immediate:
     case FrontendOptions::REPL:
       Diags.diagnose(SourceLoc(), diag::error_mode_cannot_emit_dependencies);
@@ -551,7 +551,7 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
     case FrontendOptions::DumpParse:
     case FrontendOptions::DumpAST:
     case FrontendOptions::PrintAST:
-    case FrontendOptions::DumpTRC:
+    case FrontendOptions::DumpTypeRefinementContexts:
     case FrontendOptions::Immediate:
     case FrontendOptions::REPL:
       Diags.diagnose(SourceLoc(), diag::error_mode_cannot_emit_header);
@@ -578,7 +578,7 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
     case FrontendOptions::DumpParse:
     case FrontendOptions::DumpAST:
     case FrontendOptions::PrintAST:
-    case FrontendOptions::DumpTRC:
+    case FrontendOptions::DumpTypeRefinementContexts:
     case FrontendOptions::EmitSILGen:
     case FrontendOptions::Immediate:
     case FrontendOptions::REPL:

diff --git a/lib/Frontend/FrontendOptions.cpp b/lib/Frontend/FrontendOptions.cpp
@@ -23,7 +23,7 @@ bool FrontendOptions::actionHasOutput() const {
   case DumpParse:
   case DumpAST:
   case PrintAST:
-  case DumpTRC:
+  case DumpTypeRefinementContexts:
     return false;
   case EmitSILGen:
   case EmitSIL:
@@ -50,7 +50,7 @@ bool FrontendOptions::actionIsImmediate() const {
   case DumpParse:
   case DumpAST:
   case PrintAST:
-  case DumpTRC:
+  case DumpTypeRefinementContexts:
   case EmitSILGen:
   case EmitSIL:
   case EmitSIBGen:

diff --git a/test/Sema/availability_refinement_contexts.swift b/test/Sema/availability_refinement_contexts.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -parse -dump-trc %s > %t.dump 2>&1
+// RUN: %target-swift-frontend -parse -dump-type-refinement-contexts %s > %t.dump 2>&1
 // RUN: FileCheck --strict-whitespace %s < %t.dump
 
 // REQUIRES: OS=macosx

diff --git a/tools/driver/frontend_main.cpp b/tools/driver/frontend_main.cpp
@@ -667,15 +667,15 @@ static bool performCompile(CompilerInstance &Instance,
   if (Action == FrontendOptions::DumpParse ||
       Action == FrontendOptions::DumpAST ||
       Action == FrontendOptions::PrintAST ||
-      Action == FrontendOptions::DumpTRC) {
+      Action == FrontendOptions::DumpTypeRefinementContexts) {
     SourceFile *SF = PrimarySourceFile;
     if (!SF) {
       SourceFileKind Kind = Invocation.getSourceFileKind();
       SF = &Instance.getMainModule()->getMainSourceFile(Kind);
     }
     if (Action == FrontendOptions::PrintAST)
       SF->print(llvm::outs(), PrintOptions::printEverything());
-    else if (Action == FrontendOptions::DumpTRC)
+    else if (Action == FrontendOptions::DumpTypeRefinementContexts)
       SF->getTypeRefinementContext()->dump(llvm::errs(), Context.SourceMgr);
     else
       SF->dump();