maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix windows build for commit r362459 

llvm-svn: 362463
This commit is contained in:
Alex Lorenz 2019-06-03 23:17:21 +00:00
parent 6d04fd15b5
commit bb39f78113
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/Lex/DependencyDirectivesSourceMinimizer.cpp
View File

@ -122,7 +122,7 @@ LLVM_NODISCARD static bool isRawStringLiteral(const char *First,
assert(First <= Current); assert(First <= Current);
// Check if we can even back up. // Check if we can even back up.
if (*Current != '\"' || First == Current) if (*Current != '"' || First == Current)
return false; return false;
// Check for an "R". // Check for an "R".
@ -143,7 +143,7 @@ LLVM_NODISCARD static bool isRawStringLiteral(const char *First,
} }
static void skipRawString(const char *&First, const char *const End) { static void skipRawString(const char *&First, const char *const End) {
assert(First[0] == '\"'); assert(First[0] == '"');
assert(First[-1] == 'R'); assert(First[-1] == 'R');
const char *Last = ++First; const char *Last = ++First;
@ -177,7 +177,7 @@ static void skipRawString(const char *&First, const char *const End) {
} }
if (size_t(Last - First) < Terminator.size()) if (size_t(Last - First) < Terminator.size())
continue; continue;
if (*Last != '\"') if (*Last != '"')
continue; continue;
First = Last + 1; First = Last + 1;
return; return;
@ -185,7 +185,7 @@ static void skipRawString(const char *&First, const char *const End) {
} }
static void skipString(const char *&First, const char *const End) { static void skipString(const char *&First, const char *const End) {
assert(*First == '\'' || *First == '\"'); assert(*First == '\'' || *First == '"');
const char Terminator = *First; const char Terminator = *First;
for (++First; First != End && *First != Terminator; ++First) for (++First; First != End && *First != Terminator; ++First)
if (*First == '\\') if (*First == '\\')
@ -281,7 +281,7 @@ static void skipLine(const char *&First, const char *const End) {
const char *Start = First; const char *Start = First;
while (First != End && !isVerticalWhitespace(*First)) { while (First != End && !isVerticalWhitespace(*First)) {
// Iterate over strings correctly to avoid comments and newlines. // Iterate over strings correctly to avoid comments and newlines.
if (*First == '\"' || if (*First == '"' ||
(*First == '\'' && !isQuoteCppDigitSeparator(Start, First, End))) { (*First == '\'' && !isQuoteCppDigitSeparator(Start, First, End))) {
if (isRawStringLiteral(Start, First)) if (isRawStringLiteral(Start, First))
skipRawString(First, End); skipRawString(First, End);
@ -336,7 +336,7 @@ void Minimizer::printToNewline(const char *&First, const char *const End) {
const char *Last = First; const char *Last = First;
do { do {
// Iterate over strings correctly to avoid comments and newlines. // Iterate over strings correctly to avoid comments and newlines.
if (*Last == '\"' || *Last == '\'') { if (*Last == '"' || *Last == '\'') {
if (LLVM_UNLIKELY(isRawStringLiteral(First, Last))) if (LLVM_UNLIKELY(isRawStringLiteral(First, Last)))
skipRawString(Last, End); skipRawString(Last, End);
else else