diff options
Diffstat (limited to 'llvm/lib/FileCheck/FileCheck.cpp')
| -rw-r--r-- | llvm/lib/FileCheck/FileCheck.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/llvm/lib/FileCheck/FileCheck.cpp b/llvm/lib/FileCheck/FileCheck.cpp index 04476d999336..c962231cbdc1 100644 --- a/llvm/lib/FileCheck/FileCheck.cpp +++ b/llvm/lib/FileCheck/FileCheck.cpp @@ -954,8 +954,8 @@ bool Pattern::parsePattern(StringRef PatternStr, StringRef Prefix, // Check to see if this is a fixed string, or if it has regex pieces. if (!MatchFullLinesHere && - (PatternStr.size() < 2 || (PatternStr.find("{{") == StringRef::npos && - PatternStr.find("[[") == StringRef::npos))) { + (PatternStr.size() < 2 || + (!PatternStr.contains("{{") && !PatternStr.contains("[[")))) { FixedStr = PatternStr; return false; } @@ -1034,7 +1034,8 @@ bool Pattern::parsePattern(StringRef PatternStr, StringRef Prefix, bool IsLegacyLineExpr = false; StringRef DefName; StringRef SubstStr; - std::string MatchRegexp; + StringRef MatchRegexp; + std::string WildcardRegexp; size_t SubstInsertIdx = RegExStr.size(); // Parse string variable or legacy @LINE expression. @@ -1078,7 +1079,7 @@ bool Pattern::parsePattern(StringRef PatternStr, StringRef Prefix, return true; } DefName = Name; - MatchRegexp = MatchStr.str(); + MatchRegexp = MatchStr; } else { if (IsPseudo) { MatchStr = OrigMatchStr; @@ -1117,7 +1118,8 @@ bool Pattern::parsePattern(StringRef PatternStr, StringRef Prefix, SubstStr = MatchStr; else { ExpressionFormat Format = ExpressionPointer->getFormat(); - MatchRegexp = cantFail(Format.getWildcardRegex()); + WildcardRegexp = cantFail(Format.getWildcardRegex()); + MatchRegexp = WildcardRegexp; } } |