Add -include-footer option.

Author: zahiraam

clang/include/clang/Driver/Options.td

@@ -4620,10 +4620,14 @@ def image__base : Separate<["-"], "image_base">;
 def include_ : JoinedOrSeparate<["-", "--"], "include">, Group<clang_i_Group>, EnumName<"include">,
     MetaVarName<"<file>">, HelpText<"Include file before parsing">,
     Visibility<[ClangOption, CC1Option]>;
-def include_footer : Separate<["-"], "include-footer">, Group<clang_i_Group>,
+def include_internal_footer : Separate<["-"], "include-internal-footer">, Group<clang_i_Group>,
     Visibility<[CC1Option]>,
     HelpText<"Name of the footer integration file">,  MetaVarName<"<file>">,
     MarshallingInfoString<PreprocessorOpts<"IncludeFooter">>;
+def include_internal_header : Separate<["-"], "include-internal-header">, Group<clang_i_Group>,
+    Visibility<[CC1Option]>,
+    HelpText<"Name of the header integration file">,  MetaVarName<"<file>">,
+    MarshallingInfoString<PreprocessorOpts<"IncludeHeader">>;
 def include_pch : Separate<["-"], "include-pch">, Group<clang_i_Group>,
   Visibility<[ClangOption, CC1Option]>,
   HelpText<"Include precompiled header file">, MetaVarName<"<file>">,

clang/include/clang/Lex/PreprocessorOptions.h

@@ -68,6 +68,7 @@ class PreprocessorOptions {
   std::vector<std::pair<std::string, bool/*isUndef*/>> Macros;
   std::vector<std::string> Includes;
   std::string IncludeFooter;
+  std::string IncludeHeader;
   std::vector<std::string> MacroIncludes;
 
   /// Perform extra checks when loading PCM files for mutable file systems.

clang/lib/Driver/ToolChains/Clang.cpp

@@ -5729,7 +5729,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       // action to determine this.
       if (types::getPreprocessedType(Input.getType()) != types::TY_INVALID &&
           !Header.empty()) {
-        CmdArgs.push_back("-include");
+        CmdArgs.push_back("-include-internal-header");
         CmdArgs.push_back(Args.MakeArgString(Header));
         // When creating dependency information, filter out the generated
         // header file.
@@ -5745,7 +5745,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       StringRef Footer = D.getIntegrationFooter(Input.getBaseInput());
       if (types::getPreprocessedType(Input.getType()) != types::TY_INVALID &&
           !Args.hasArg(options::OPT_fno_sycl_use_footer) && !Footer.empty()) {
-        CmdArgs.push_back("-include-footer");
+        CmdArgs.push_back("-include-internal-footer");
         CmdArgs.push_back(Args.MakeArgString(Footer));
         // When creating dependency information, filter out the generated
         // integration footer file.

clang/lib/Frontend/InitPreprocessor.cpp

@@ -1663,6 +1663,19 @@ void clang::InitializePreprocessor(Preprocessor &PP,
     AddImplicitInclude(Builder, Path);
   }
 
+   #if 1
+  // Process -include-internal-header directive.
+  if (!LangOpts.SYCLIsDevice) {
+    if (!InitOpts.IncludeHeader.empty()) {
+      AddImplicitInclude(Builder, InitOpts.IncludeHeader);
+    }
+    // Process -include-internal-footer directive.
+    if (!InitOpts.IncludeFooter.empty()) {
+      AddImplicitInclude(Builder, InitOpts.IncludeFooter);
+    }
+  }
+  #endif
+
   // Instruct the preprocessor to skip the preamble.
   PP.setSkipMainFilePreamble(InitOpts.PrecompiledPreambleBytes.first,
                              InitOpts.PrecompiledPreambleBytes.second);

clang/lib/Frontend/PrintPreprocessedOutput.cpp

@@ -272,10 +272,18 @@ void PrintPPOutputPPCallbacks::WriteLineInfo(unsigned LineNo,
 
   // Emit #line directives or GNU line markers depending on what mode we're in.
   if (UseLineDirectives) {
-    *OS << "#line" << ' ' << LineNo << ' ' << '"';
-    OS->write_escaped(CurFilename);
+    if (CurFilename != PP.getPreprocessorOpts().IncludeFooter &&
+	CurFilename != PP.getPreprocessorOpts().IncludeHeader) {
+      *OS << "#line" << ' ' << LineNo << ' ' << '"';
+      OS->write_escaped(CurFilename);
+      *OS << '"';
+    }
+    //    *OS << "#line" << ' ' << LineNo << ' ' << '"';
+    //    OS->write_escaped(CurFilename);
     *OS << '"';
   } else {
+    if (CurFilename != PP.getPreprocessorOpts().IncludeFooter &&
+	CurFilename != PP.getPreprocessorOpts().IncludeHeader) {
     *OS << '#' << ' ' << LineNo << ' ' << '"';
     OS->write_escaped(CurFilename);
     *OS << '"';
@@ -287,6 +295,7 @@ void PrintPPOutputPPCallbacks::WriteLineInfo(unsigned LineNo,
       OS->write(" 3", 2);
     else if (FileType == SrcMgr::C_ExternCSystem)
       OS->write(" 3 4", 4);
+    }
   }
   *OS << '\n';
 }
@@ -417,13 +426,26 @@ void PrintPPOutputPPCallbacks::FileChanged(SourceLocation Loc,
 
   switch (Reason) {
   case PPCallbacks::EnterFile:
+#if 0
+     // Don't print the header and footer lines in the pre-processed output.
+    if (CurFilename != PP.getPreprocessorOpts().IncludeFooter &&
+        CurFilename != PP.getPreprocessorOpts().IncludeHeader)
+#endif
     WriteLineInfo(CurLine, " 1", 2);
     break;
   case PPCallbacks::ExitFile:
+#if 0
+    if (CurFilename != PP.getPreprocessorOpts().IncludeFooter &&
+        CurFilename != PP.getPreprocessorOpts().IncludeHeader)
+#endif
     WriteLineInfo(CurLine, " 2", 2);
     break;
   case PPCallbacks::SystemHeaderPragma:
   case PPCallbacks::RenameFile:
+#if 0
+    if (CurFilename != PP.getPreprocessorOpts().IncludeFooter &&
+        CurFilename != PP.getPreprocessorOpts().IncludeHeader)
+#endif
     WriteLineInfo(CurLine);
     break;
   }
@@ -914,7 +936,7 @@ static void PrintIncludeFooter(Preprocessor &PP, SourceLocation Loc,
   FileID FooterFileID = SourceMgr.ComputeValidFooterFileID(Footer);
   StringRef FooterContentBuffer = SourceMgr.getBufferData(FooterFileID);
   // print out the name of the integration footer.
-  Callbacks->WriteFooterInfo(Footer);
+  // Callbacks->WriteFooterInfo(Footer);
   SmallVector<StringRef, 8> FooterContentArr;
   FooterContentBuffer.split(FooterContentArr, '\r');
   // print out the content of the integration footer.
@@ -1187,6 +1209,7 @@ void clang::DoPrintPreprocessedInput(Preprocessor &PP, raw_ostream *OS,
   PrintPreprocessedTokens(PP, Tok, Callbacks);
   *OS << '\n';
 
+#if 0
   if (!PP.getPreprocessorOpts().IncludeFooter.empty() &&
       !PP.IncludeFooterProcessed) {
     assert(PP.getLangOpts().SYCLIsHost &&
@@ -1195,7 +1218,7 @@ void clang::DoPrintPreprocessedInput(Preprocessor &PP, raw_ostream *OS,
     PrintIncludeFooter(PP, Loc, PP.getPreprocessorOpts().IncludeFooter,
                        Callbacks);
   }
-
+#endif
   // Remove the handlers we just added to leave the preprocessor in a sane state
   // so that it can be reused (for example by a clang::Parser instance).
   PP.RemovePragmaHandler(MicrosoftExtHandler.get());

clang/lib/Lex/PPLexerChange.cpp

@@ -535,6 +535,7 @@ bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) {
     }
   }
 
+#if 0
   if (isInPrimaryFile() && getLangOpts().SYCLIsHost &&
       !getPreprocessorOpts().IncludeFooter.empty()) {
     SourceManager &SourceMgr = getSourceManager();
@@ -555,6 +556,7 @@ bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) {
       return false;
     }
   }
+#endif
 
   // If this is the end of the main file, form an EOF token.
   assert(CurLexer && "Got EOF but no current lexer set!");