Merge remote-tracking branch 'llvm/master' into upstream-with-swift

swift-ci · swift-ci · commit 64c040670a2c · 2019-08-20T09:19:08.000-07:00
diff --git a/source/Utility/RegularExpression.cpp b/source/Utility/RegularExpression.cpp
@@ -28,10 +28,7 @@ bool RegularExpression::Execute(
   return m_regex.match(str, matches);
 }
 
-bool RegularExpression::IsValid() const {
-  std::string discarded;
-  return m_regex.isValid(discarded);
-}
+bool RegularExpression::IsValid() const { return m_regex.isValid(); }
 
 llvm::StringRef RegularExpression::GetText() const { return m_regex_text; }
 

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,7 @@ bool RegularExpression::Execute(`
`28`	`28`	`return m_regex.match(str, matches);`
`29`	`29`	`}`
`30`	`30`
`31`		`-bool RegularExpression::IsValid() const {`
`32`		`- std::string discarded;`
`33`		`- return m_regex.isValid(discarded);`
`34`		`-}`
	`31`	`+bool RegularExpression::IsValid() const { return m_regex.isValid(); }`
`35`	`32`
`36`	`33`	`llvm::StringRef RegularExpression::GetText() const { return m_regex_text; }`
`37`	`34`