🛠 [Lex, Frontend] Remove comma hardcoding since we are servicing a fu…

…ll file
llvm · Oct 9, 2023 · adc9737 · adc9737
1 parent dfd6383
commit adc9737
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/clang/lib/Frontend/PrintPreprocessedOutput.cpp b/clang/lib/Frontend/PrintPreprocessedOutput.cpp
@@ -892,10 +892,6 @@ static void PrintPreprocessedTokens(Preprocessor &PP, Token &Tok,
       std::string Name = M->getFullModuleName();
       Callbacks->OS->write(Name.data(), Name.size());
       Callbacks->HandleNewlinesInToken(Name.data(), Name.size());
-    } else if (Tok.is(tok::comma)) {
-      // hard-wire comma writing to prevent #embed from spilling unread contents
-      // from fast token dumping or builtin speed writing
-      OS.write(',');
     } else if (Tok.isAnnotation()) {
       // Ignore annotation tokens created by pragmas - the pragmas themselves
       // will be reproduced in the preprocessed output.

diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp
@@ -3943,7 +3943,7 @@ void Preprocessor::HandleEmbedDirectiveNaive(
         TargetEmbedBuffer.append(Spelling.data(), Spelling.size());
       }
     }
-    for (size_t I = 0; I < BinaryContents.size(); ++I) {
+    for (size_t I = 0; I < TotalSize; ++I) {
       unsigned char ByteValue = BinaryContents[I];
       StringRef ByteRepresentation = IntegerLiterals[ByteValue];
       TargetEmbedBuffer.append(2, '(');
@@ -3952,7 +3952,7 @@ void Preprocessor::HandleEmbedDirectiveNaive(
       TargetEmbedBuffer.append(ByteRepresentation.data(),
                                ByteRepresentation.size());
       TargetEmbedBuffer.append(1, ')');
-      bool AtEndOfContents = I == (BinaryContents.size() - 1);
+      bool AtEndOfContents = I == (TotalSize - 1);
       if (!AtEndOfContents) {
         TargetEmbedBuffer.append(1, ',');
       }