Merge pull request #5924 from Jnosh/comment-typo

swift-ci · web-flow · commit 301f6f617920 · 2016-11-25T01:36:17.000-08:00
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -1028,7 +1028,7 @@ static bool ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args,
   Opts.WarningsAsErrors |= Args.hasArg(OPT_warnings_as_errors);
 
   assert(!(Opts.WarningsAsErrors && Opts.SuppressWarnings) &&
-         "conflicting arguments; should of been caught by driver");
+         "conflicting arguments; should have been caught by driver");
 
   return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -1028,7 +1028,7 @@ static bool ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args,`
`1028`	`1028`	`Opts.WarningsAsErrors \|= Args.hasArg(OPT_warnings_as_errors);`
`1029`	`1029`
`1030`	`1030`	`assert(!(Opts.WarningsAsErrors && Opts.SuppressWarnings) &&`
`1031`		`- "conflicting arguments; should of been caught by driver");`
	`1031`	`+ "conflicting arguments; should have been caught by driver");`
`1032`	`1032`
`1033`	`1033`	`return false;`
`1034`	`1034`	`}`