Merge pull request #4958 from modocache/sr-2683-remove-todo

swift-ci · web-flow · commit 36b8dc2d091f · 2016-09-23T09:34:21.000-07:00
diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp
@@ -1210,8 +1210,12 @@ int swift::performFrontend(ArrayRef<const char *> Args,
     return 1;
   }
 
-  // TODO: reorder, if possible, so that diagnostics emitted during
-  // CompilerInvocation::parseArgs are included in the serialized file.
+  // Because the serialized diagnostics consumer is initialized here,
+  // diagnostics emitted above, within CompilerInvocation::parseArgs, are never
+  // serialized. This is a non-issue because, in nearly all cases, frontend
+  // arguments are generated by the driver, not directly by a user. The driver
+  // is responsible for emitting diagnostics for its own errors. See SR-2683
+  // for details.
   std::unique_ptr<DiagnosticConsumer> SerializedConsumer;
   {
     const std::string &SerializedDiagnosticsPath =

Original file line number	Diff line number	Diff line change
`@@ -1210,8 +1210,12 @@ int swift::performFrontend(ArrayRef<const char *> Args,`
`1210`	`1210`	`return 1;`
`1211`	`1211`	`}`
`1212`	`1212`
`1213`		`- // TODO: reorder, if possible, so that diagnostics emitted during`
`1214`		`- // CompilerInvocation::parseArgs are included in the serialized file.`
	`1213`	`+ // Because the serialized diagnostics consumer is initialized here,`
	`1214`	`+ // diagnostics emitted above, within CompilerInvocation::parseArgs, are never`
	`1215`	`+ // serialized. This is a non-issue because, in nearly all cases, frontend`
	`1216`	`+ // arguments are generated by the driver, not directly by a user. The driver`
	`1217`	`+ // is responsible for emitting diagnostics for its own errors. See SR-2683`
	`1218`	`+ // for details.`
`1215`	`1219`	`std::unique_ptr<DiagnosticConsumer> SerializedConsumer;`
`1216`	`1220`	`{`
`1217`	`1221`	`const std::string &SerializedDiagnosticsPath =`