Merge pull request #27980 from drodriguez/windows-const-is-your-friend

compnerd · web-flow · commit 1a5a8dd780e1 · 2019-10-31T10:46:15.000-07:00
[Diagnostics] Use constant strings to avoid use after free.
diff --git a/unittests/AST/DiagnosticConsumerTests.cpp b/unittests/AST/DiagnosticConsumerTests.cpp
@@ -50,7 +50,7 @@ namespace {
     }
   };
 
-  DiagnosticInfo testDiagnosticInfo(SourceLoc Loc, std::string Message,
+  DiagnosticInfo testDiagnosticInfo(SourceLoc Loc, const char *Message,
                                     DiagnosticKind Kind) {
     return DiagnosticInfo(DiagID(0), Loc, Kind, Message, /*args*/ {},
                           /*indirectBuffer*/ SourceLoc(), /*childInfo*/ {},

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ namespace {`
`50`	`50`	`}`
`51`	`51`	`};`
`52`	`52`
`53`		`- DiagnosticInfo testDiagnosticInfo(SourceLoc Loc, std::string Message,`
	`53`	`+ DiagnosticInfo testDiagnosticInfo(SourceLoc Loc, const char *Message,`
`54`	`54`	`DiagnosticKind Kind) {`
`55`	`55`	`return DiagnosticInfo(DiagID(0), Loc, Kind, Message, /args/ {},`
`56`	`56`	`/indirectBuffer/ SourceLoc(), /childInfo/ {},`