Index: test/tools/llvm-mc/line_end_with_space.test =================================================================== --- test/tools/llvm-mc/line_end_with_space.test +++ test/tools/llvm-mc/line_end_with_space.test @@ -0,0 +1,2 @@ +RUN: llvm-mc -disassemble %s + \ No newline at end of file Index: tools/llvm-mc/Disassembler.cpp =================================================================== --- tools/llvm-mc/Disassembler.cpp +++ tools/llvm-mc/Disassembler.cpp @@ -98,29 +98,23 @@ } static bool SkipToToken(StringRef &Str) { - while (!Str.empty() && Str.find_first_not_of(" \t\r\n#,") != 0) { + for (;;) { + if (Str.empty()) + return false; + // Strip horizontal whitespace and commas. - if (size_t Pos = Str.find_first_not_of(" \t\r,")) { + if (size_t Pos = Str.find_first_not_of(" \t\r\n,")) { Str = Str.substr(Pos); + continue; } - // If this is the end of a line or start of a comment, remove the rest of - // the line. - if (Str[0] == '\n' || Str[0] == '#') { - // Strip to the end of line if we already processed any bytes on this - // line. This strips the comment and/or the \n. - if (Str[0] == '\n') { - Str = Str.substr(1); - } else { + // If this is the start of a comment, remove the rest of the line. + if (Str[0] == '#') { Str = Str.substr(Str.find_first_of('\n')); - if (!Str.empty()) - Str = Str.substr(1); - } continue; } + return true; } - - return !Str.empty(); }