Addressed review comments and refactored the code.

Author: zahiraam

clang/lib/Driver/ToolChains/Clang.cpp

@@ -5734,7 +5734,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       // action to determine this.
       if (types::getPreprocessedType(Input.getType()) != types::TY_INVALID &&
           !Header.empty()) {
-        // Add the -include-header option to add the integration header
+        // Add the -include-internal-header option to add the integration header
         CmdArgs.push_back("-include-internal-header");
         CmdArgs.push_back(Args.MakeArgString(Header));
         // When creating dependency information, filter out the generated

clang/lib/Frontend/PrintPreprocessedOutput.cpp

@@ -271,24 +271,14 @@ static bool is_separator(char value) {
   return false;
 }
 
-static StringRef remove_leading_dotbackslah(StringRef Path) {
-  // Remove leading ".\" (or ".\\" or ".\.\" etc.)
-  while (Path.size() > 2 && Path[0] == '.' && is_separator(Path[1])) {
-    Path = Path.substr(2);
-    while (Path.size() > 0 && is_separator(Path[0]))
-      Path = Path.substr(1);
-  }
-  return Path;
-}
-
 void PrintPPOutputPPCallbacks::WriteLineInfo(unsigned LineNo,
                                              const char *Extra,
                                              unsigned ExtraLen) {
   startNewLineIfNeeded();
 
   // Emit #line directives or GNU line markers depending on what mode we're in.
   StringRef CurFilenameWithNoLeaningDotSlash =
-      remove_leading_dotbackslah(CurFilename.str());
+      llvm::sys::path::remove_leading_dotbackslah(CurFilename.str());
   if ((CurFilenameWithNoLeaningDotSlash ==
               PP.getPreprocessorOpts().IncludeFooter) ||
       CurFilenameWithNoLeaningDotSlash ==

llvm/include/llvm/Support/Path.h

@@ -201,6 +201,12 @@ bool replace_path_prefix(SmallVectorImpl<char> &Path, StringRef OldPrefix,
 /// @result The cleaned-up \a path.
 StringRef remove_leading_dotslash(StringRef path, Style style = Style::native);
 
+/// Remove redundant leading ".\" pieces and consecutive separators.
+///
+/// @param path Input path.
+/// @result The cleaned-up \a path.
+StringRef remove_leading_dotbackslah(StringRef path);
+
 /// In-place remove any './' and optionally '../' components from a path.
 ///
 /// @param path processed path

llvm/lib/Support/Path.cpp

@@ -711,6 +711,13 @@ StringRef remove_leading_dotslash(StringRef Path, Style style) {
   return Path;
 }
 
+StringRef remove_leading_dotbackslah(StringRef Path) {
+  // Remove leading ".\\".
+  if (Path.size() > 2 && Path[0] == '.' && Path[1] == '\\')
+    Path = Path.substr(2);
+  return Path;
+}
+
 // Remove path traversal components ("." and "..") when possible, and
 // canonicalize slashes.
 bool remove_dots(SmallVectorImpl<char> &the_path, bool remove_dot_dot,