1 files changed, 0 insertions, 380 deletions

diff --git a/recipes-devtools/clang/clang/0018-clang-Initial-implementation-of-fmacro-prefix-map-an.patch b/recipes-devtools/clang/clang/0018-clang-Initial-implementation-of-fmacro-prefix-map-an.patch
deleted file mode 100644
index b9e67d4..0000000
--- a/recipes-devtools/clang/clang/0018-clang-Initial-implementation-of-fmacro-prefix-map-an.patch
+++ /dev/null
@@ -1,380 +0,0 @@
-From 3a6bf36829e16fd7ab1c2eb6b93ed6caa8210cd1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 15 Feb 2019 10:02:52 -0800
-Subject: [PATCH] clang: Initial implementation of -fmacro-prefix-map and
- -ffile-prefix-map
-
-Upstream-Status: Submitted [https://reviews.llvm.org/D49466]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- .../clang/Basic/DiagnosticDriverKinds.td      |  4 +-
- clang/include/clang/Driver/Options.td         |  6 +++
- clang/include/clang/Lex/PreprocessorOptions.h |  3 ++
- clang/lib/CodeGen/CGDebugInfo.cpp             |  9 +++--
- clang/lib/CodeGen/CGDebugInfo.h               |  2 +-
- clang/lib/Driver/ToolChains/Clang.cpp         | 20 +++++++++-
- clang/lib/Driver/ToolChains/FreeBSD.cpp       | 14 +++++++
- clang/lib/Driver/ToolChains/Gnu.cpp           | 12 ++++++
- clang/lib/Frontend/CompilerInvocation.cpp     |  3 ++
- clang/lib/Lex/PPMacroExpansion.cpp            | 13 ++++++-
- clang/test/CodeGen/debug-prefix-map.c         |  2 +
- clang/test/Driver/debug-prefix-map.S          |  1 +
- clang/test/Driver/debug-prefix-map.c          | 37 ++++++++++++++-----
- clang/test/Preprocessor/file_test.c           | 22 +++++++++++
- clang/test/Preprocessor/file_test.h           |  2 +
- 15 files changed, 132 insertions(+), 18 deletions(-)
- create mode 100644 clang/test/Preprocessor/file_test.c
- create mode 100644 clang/test/Preprocessor/file_test.h
-
-diff --git a/clang/include/clang/Basic/DiagnosticDriverKinds.td b/clang/include/clang/Basic/DiagnosticDriverKinds.td
-index 12f1a7f6c48..0f8e94dad66 100644
---- a/clang/include/clang/Basic/DiagnosticDriverKinds.td
-+++ b/clang/include/clang/Basic/DiagnosticDriverKinds.td
-@@ -141,8 +141,8 @@ def err_drv_missing_arg_mtp : Error<
-   "missing argument to '%0'">;
- def err_drv_invalid_libcxx_deployment : Error<
-   "invalid deployment target for -stdlib=libc++ (requires %0 or later)">;
--def err_drv_invalid_argument_to_fdebug_prefix_map : Error<
--  "invalid argument '%0' to -fdebug-prefix-map">;
-+def err_drv_invalid_argument_to_option : Error<
-+  "invalid argument '%0' to -%1">;
- def err_drv_malformed_sanitizer_blacklist : Error<
-   "malformed sanitizer blacklist: '%0'">;
- def err_drv_duplicate_config : Error<
-diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
-index 4ea8bfff097..cf73c9ca465 100644
---- a/clang/include/clang/Driver/Options.td
-+++ b/clang/include/clang/Driver/Options.td
-@@ -1866,10 +1866,16 @@ def fsplit_dwarf_inlining: Flag <["-"], "fsplit-dwarf-inlining">, Group<f_Group>
-   Flags<[CC1Option]>, HelpText<"Provide minimal debug info in the object/executable to facilitate online symbolication/stack traces in the absence of .dwo/.dwp files when using Split DWARF">;
- def fno_split_dwarf_inlining: Flag<["-"], "fno-split-dwarf-inlining">, Group<f_Group>,
-   Flags<[CC1Option]>;
-+def ffile_prefix_map_EQ
-+  : Joined<["-"], "ffile-prefix-map=">, Group<f_Group>, Flags<[CC1Option]>,
-+    HelpText<"remap file source paths in debug info and predefined preprocessor macros">;
- def fdebug_prefix_map_EQ
-   : Joined<["-"], "fdebug-prefix-map=">, Group<f_Group>,
-     Flags<[CC1Option,CC1AsOption]>,
-     HelpText<"remap file source paths in debug info">;
-+def fmacro_prefix_map_EQ
-+  : Joined<["-"], "fmacro-prefix-map=">, Group<Preprocessor_Group>, Flags<[CC1Option]>,
-+    HelpText<"remap file source paths in predefined preprocessor macros">;
- def g_Flag : Flag<["-"], "g">, Group<g_Group>,
-   HelpText<"Generate source-level debug information">;
- def gline_tables_only : Flag<["-"], "gline-tables-only">, Group<gN_Group>,
-diff --git a/clang/include/clang/Lex/PreprocessorOptions.h b/clang/include/clang/Lex/PreprocessorOptions.h
-index 1480548c7fb..712b423e679 100644
---- a/clang/include/clang/Lex/PreprocessorOptions.h
-+++ b/clang/include/clang/Lex/PreprocessorOptions.h
-@@ -169,6 +169,9 @@ public:
-   /// build it again.
-   std::shared_ptr<FailedModulesSet> FailedModules;
- 
-+  /// A prefix map for __FILE__ and __BASE_FILE__
-+  std::map<std::string, std::string, std::greater<std::string>> MacroPrefixMap;
-+
- public:
-   PreprocessorOptions() : PrecompiledPreambleBytes(0, false) {}
- 
-diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
-index f6ee7ee26d4..8a190558533 100644
---- a/clang/lib/CodeGen/CGDebugInfo.cpp
-+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
-@@ -475,10 +475,13 @@ CGDebugInfo::createFile(StringRef FileName,
- }
- 
- std::string CGDebugInfo::remapDIPath(StringRef Path) const {
-+  SmallString<256> p = Path;
-   for (const auto &Entry : DebugPrefixMap)
--    if (Path.startswith(Entry.first))
--      return (Twine(Entry.second) + Path.substr(Entry.first.size())).str();
--  return Path.str();
-+    if (llvm::sys::path::replace_path_prefix(p, Entry.first, Entry.second))
-+      break;
-+  while (llvm::sys::path::is_separator(p.back()))
-+    p.set_size(p.size() - 1);
-+  return p.str();
- }
- 
- unsigned CGDebugInfo::getLineNumber(SourceLocation Loc) {
-diff --git a/clang/lib/CodeGen/CGDebugInfo.h b/clang/lib/CodeGen/CGDebugInfo.h
-index 7edbea86633..7077d0f043c 100644
---- a/clang/lib/CodeGen/CGDebugInfo.h
-+++ b/clang/lib/CodeGen/CGDebugInfo.h
-@@ -83,7 +83,7 @@ class CGDebugInfo {
-   /// Cache of previously constructed Types.
-   llvm::DenseMap<const void *, llvm::TrackingMDRef> TypeCache;
- 
--  llvm::SmallDenseMap<llvm::StringRef, llvm::StringRef> DebugPrefixMap;
-+  std::map<llvm::StringRef, llvm::StringRef, std::greater<llvm::StringRef>> DebugPrefixMap;
- 
-   /// Cache that maps VLA types to size expressions for that type,
-   /// represented by instantiated Metadata nodes.
-diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
-index dd461a1976d..08165a60206 100644
---- a/clang/lib/Driver/ToolChains/Clang.cpp
-+++ b/clang/lib/Driver/ToolChains/Clang.cpp
-@@ -618,16 +618,30 @@ static void addDebugCompDirArg(const ArgList &Args, ArgStringList &CmdArgs) {
- 
- /// Add a CC1 and CC1AS option to specify the debug file path prefix map.
- static void addDebugPrefixMapArg(const Driver &D, const ArgList &Args, ArgStringList &CmdArgs) {
--  for (const Arg *A : Args.filtered(options::OPT_fdebug_prefix_map_EQ)) {
-+  for (const Arg *A : Args.filtered(options::OPT_ffile_prefix_map_EQ,
-+                                    options::OPT_fdebug_prefix_map_EQ)) {
-     StringRef Map = A->getValue();
-     if (Map.find('=') == StringRef::npos)
--      D.Diag(diag::err_drv_invalid_argument_to_fdebug_prefix_map) << Map;
-+      D.Diag(diag::err_drv_invalid_argument_to_option) << Map << A->getOption().getName();
-     else
-       CmdArgs.push_back(Args.MakeArgString("-fdebug-prefix-map=" + Map));
-     A->claim();
-   }
- }
- 
-+/// Add a CC1 and CC1AS option to specify the macro file path prefix map.
-+static void addMacroPrefixMapArg(const Driver &D, const ArgList &Args, ArgStringList &CmdArgs) {
-+  for (const Arg *A : Args.filtered(options::OPT_ffile_prefix_map_EQ,
-+                                    options::OPT_fmacro_prefix_map_EQ)) {
-+    StringRef Map = A->getValue();
-+    if (Map.find('=') == StringRef::npos)
-+      D.Diag(diag::err_drv_invalid_argument_to_option) << Map << A->getOption().getName();
-+    else
-+      CmdArgs.push_back(Args.MakeArgString("-fmacro-prefix-map=" + Map));
-+    A->claim();
-+  }
-+}
-+
- /// Vectorize at all optimization levels greater than 1 except for -Oz.
- /// For -Oz the loop vectorizer is disabled, while the slp vectorizer is
- /// enabled.
-@@ -1317,6 +1331,8 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
-     // For IAMCU add special include arguments.
-     getToolChain().AddIAMCUIncludeArgs(Args, CmdArgs);
-   }
-+
-+  addMacroPrefixMapArg(D, Args, CmdArgs);
- }
- 
- // FIXME: Move to target hook.
-diff --git a/clang/lib/Driver/ToolChains/FreeBSD.cpp b/clang/lib/Driver/ToolChains/FreeBSD.cpp
-index 3a0bab8d07f..6eea9f04620 100644
---- a/clang/lib/Driver/ToolChains/FreeBSD.cpp
-+++ b/clang/lib/Driver/ToolChains/FreeBSD.cpp
-@@ -12,6 +12,7 @@
- #include "Arch/Sparc.h"
- #include "CommonArgs.h"
- #include "clang/Driver/Compilation.h"
-+#include "clang/Driver/DriverDiagnostic.h"
- #include "clang/Driver/Options.h"
- #include "clang/Driver/SanitizerArgs.h"
- #include "llvm/Option/ArgList.h"
-@@ -30,6 +31,7 @@ void freebsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
-                                       const char *LinkingOutput) const {
-   claimNoWarnArgs(Args);
-   ArgStringList CmdArgs;
-+  const auto &D = getToolChain().getDriver();
- 
-   // When building 32-bit code on FreeBSD/amd64, we have to explicitly
-   // instruct as in the base system to assemble 32-bit code.
-@@ -103,6 +105,18 @@ void freebsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
-   }
-   }
- 
-+  for (const Arg *A : Args.filtered(options::OPT_ffile_prefix_map_EQ,
-+                                    options::OPT_fdebug_prefix_map_EQ)) {
-+    StringRef Map = A->getValue();
-+    if (Map.find('=') == StringRef::npos)
-+      D.Diag(diag::err_drv_invalid_argument_to_option) << Map << A->getOption().getName();
-+    else {
-+      CmdArgs.push_back(Args.MakeArgString("--debug-prefix-map"));
-+      CmdArgs.push_back(Args.MakeArgString(Map));
-+    }
-+    A->claim();
-+  }
-+
-   Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA, options::OPT_Xassembler);
- 
-   CmdArgs.push_back("-o");
-diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index 20517a369f7..ebb315d9c15 100644
---- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -874,6 +874,18 @@ void tools::gnutools::Assembler::ConstructJob(Compilation &C,
-   }
-   }
- 
-+  for (const Arg *A : Args.filtered(options::OPT_ffile_prefix_map_EQ,
-+                                    options::OPT_fdebug_prefix_map_EQ)) {
-+    StringRef Map = A->getValue();
-+    if (Map.find('=') == StringRef::npos)
-+      D.Diag(diag::err_drv_invalid_argument_to_option) << Map << A->getOption().getName();
-+    else {
-+      CmdArgs.push_back(Args.MakeArgString("--debug-prefix-map"));
-+      CmdArgs.push_back(Args.MakeArgString(Map));
-+    }
-+    A->claim();
-+  }
-+
-   Args.AddAllArgs(CmdArgs, options::OPT_I);
-   Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA, options::OPT_Xassembler);
- 
-diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
-index bc54e38a1a6..ff68adb865d 100644
---- a/clang/lib/Frontend/CompilerInvocation.cpp
-+++ b/clang/lib/Frontend/CompilerInvocation.cpp
-@@ -3180,6 +3180,9 @@ static void ParsePreprocessorArgs(PreprocessorOptions &Opts, ArgList &Args,
-   for (const auto *A : Args.filtered(OPT_error_on_deserialized_pch_decl))
-     Opts.DeserializedPCHDeclsToErrorOn.insert(A->getValue());
- 
-+  for (const auto &A : Args.getAllArgValues(OPT_fmacro_prefix_map_EQ))
-+    Opts.MacroPrefixMap.insert(StringRef(A).split('='));
-+
-   if (const Arg *A = Args.getLastArg(OPT_preamble_bytes_EQ)) {
-     StringRef Value(A->getValue());
-     size_t Comma = Value.find(',');
-diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp
-index 687b9a9d3b7..9fffe35d924 100644
---- a/clang/lib/Lex/PPMacroExpansion.cpp
-+++ b/clang/lib/Lex/PPMacroExpansion.cpp
-@@ -28,6 +28,7 @@
- #include "clang/Lex/MacroInfo.h"
- #include "clang/Lex/Preprocessor.h"
- #include "clang/Lex/PreprocessorLexer.h"
-+#include "clang/Lex/PreprocessorOptions.h"
- #include "clang/Lex/Token.h"
- #include "llvm/ADT/ArrayRef.h"
- #include "llvm/ADT/DenseMap.h"
-@@ -1436,6 +1437,15 @@ static bool isTargetEnvironment(const TargetInfo &TI,
-   return TI.getTriple().getEnvironment() == Env.getEnvironment();
- }
- 
-+static void remapMacroPath(
-+    SmallString<256> &Path,
-+    const std::map<std::string, std::string, std::greater<std::string>>
-+        &MacroPrefixMap) {
-+  for (const auto &Entry : MacroPrefixMap)
-+    if (llvm::sys::path::replace_path_prefix(Path, Entry.first, Entry.second))
-+      break;
-+}
-+
- /// ExpandBuiltinMacro - If an identifier token is read that is to be expanded
- /// as a builtin macro, handle it and return the next token as 'Tok'.
- void Preprocessor::ExpandBuiltinMacro(Token &Tok) {
-@@ -1502,7 +1512,7 @@ void Preprocessor::ExpandBuiltinMacro(Token &Tok) {
-     }
- 
-     // Escape this filename.  Turn '\' -> '\\' '"' -> '\"'
--    SmallString<128> FN;
-+    SmallString<256> FN;
-     if (PLoc.isValid()) {
-       // __FILE_NAME__ is a Clang-specific extension that expands to the
-       // the last part of __FILE__.
-@@ -1518,6 +1528,7 @@ void Preprocessor::ExpandBuiltinMacro(Token &Tok) {
-         FN += PLoc.getFilename();
-       }
-       Lexer::Stringify(FN);
-+      remapMacroPath(FN, PPOpts->MacroPrefixMap);
-       OS << '"' << FN << '"';
-     }
-     Tok.setKind(tok::string_literal);
-diff --git a/clang/test/CodeGen/debug-prefix-map.c b/clang/test/CodeGen/debug-prefix-map.c
-index f755ba47a29..e57808f03f9 100644
---- a/clang/test/CodeGen/debug-prefix-map.c
-+++ b/clang/test/CodeGen/debug-prefix-map.c
-@@ -2,6 +2,8 @@
- // RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%p=/UNLIKELY_PATH=empty %s -emit-llvm -o - | FileCheck %s -check-prefix CHECK-EVIL
- // RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%p=/UNLIKELY_PATH/empty %s -emit-llvm -o - -main-file-name debug-prefix-map.c | FileCheck %s
- // RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%p=/UNLIKELY_PATH/empty %s -emit-llvm -o - -fdebug-compilation-dir %p | FileCheck %s -check-prefix CHECK-COMPILATION-DIR
-+// RUN: %clang -g -fdebug-prefix-map=%p=/UNLIKELY_PATH/empty -S -c %s -emit-llvm -o - | FileCheck %s
-+// RUN: %clang -g -ffile-prefix-map=%p=/UNLIKELY_PATH/empty -S -c %s -emit-llvm -o - | FileCheck %s
- 
- #include "Inputs/stdio.h"
- 
-diff --git a/clang/test/Driver/debug-prefix-map.S b/clang/test/Driver/debug-prefix-map.S
-index 2ba66be0edf..7d12a174797 100644
---- a/clang/test/Driver/debug-prefix-map.S
-+++ b/clang/test/Driver/debug-prefix-map.S
-@@ -1,4 +1,5 @@
- // RUN: %clang -### -g -fdebug-prefix-map=old=new %s 2>&1 | FileCheck %s
-+// RUN: %clang -### -g -ffile-prefix-map=old=new %s 2>&1 | FileCheck %s
- 
- // CHECK: cc1as
- // CHECK-SAME: -fdebug-prefix-map=old=new
-diff --git a/clang/test/Driver/debug-prefix-map.c b/clang/test/Driver/debug-prefix-map.c
-index b4f3859f982..f2c87cb7c11 100644
---- a/clang/test/Driver/debug-prefix-map.c
-+++ b/clang/test/Driver/debug-prefix-map.c
-@@ -1,9 +1,28 @@
--// RUN: %clang -### -fdebug-prefix-map=old %s 2>&1 | FileCheck %s -check-prefix CHECK-INVALID
--// RUN: %clang -### -fdebug-prefix-map=old=new %s 2>&1 | FileCheck %s -check-prefix CHECK-SIMPLE
--// RUN: %clang -### -fdebug-prefix-map=old=n=ew %s 2>&1 | FileCheck %s -check-prefix CHECK-COMPLEX
--// RUN: %clang -### -fdebug-prefix-map=old= %s 2>&1 | FileCheck %s -check-prefix CHECK-EMPTY
--
--// CHECK-INVALID: error: invalid argument 'old' to -fdebug-prefix-map
--// CHECK-SIMPLE: fdebug-prefix-map=old=new
--// CHECK-COMPLEX: fdebug-prefix-map=old=n=ew
--// CHECK-EMPTY: fdebug-prefix-map=old=
-+// RUN: %clang -### -fdebug-prefix-map=old %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-INVALID
-+// RUN: %clang -### -fmacro-prefix-map=old %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-INVALID
-+// RUN: %clang -### -ffile-prefix-map=old %s 2>&1 | FileCheck %s -check-prefix CHECK-FILE-INVALID
-+
-+// RUN: %clang -### -fdebug-prefix-map=old=new %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-SIMPLE
-+// RUN: %clang -### -fmacro-prefix-map=old=new %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-SIMPLE
-+// RUN: %clang -### -ffile-prefix-map=old=new %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-SIMPLE
-+// RUN: %clang -### -ffile-prefix-map=old=new %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-SIMPLE
-+
-+// RUN: %clang -### -fdebug-prefix-map=old=n=ew %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-COMPLEX
-+// RUN: %clang -### -fmacro-prefix-map=old=n=ew %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-COMPLEX
-+// RUN: %clang -### -ffile-prefix-map=old=n=ew %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-COMPLEX
-+// RUN: %clang -### -ffile-prefix-map=old=n=ew %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-COMPLEX
-+
-+// RUN: %clang -### -fdebug-prefix-map=old= %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-EMPTY
-+// RUN: %clang -### -fmacro-prefix-map=old= %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-EMPTY
-+// RUN: %clang -### -ffile-prefix-map=old= %s 2>&1 | FileCheck %s -check-prefix CHECK-DEBUG-EMPTY
-+// RUN: %clang -### -ffile-prefix-map=old= %s 2>&1 | FileCheck %s -check-prefix CHECK-MACRO-EMPTY
-+
-+// CHECK-DEBUG-INVALID: error: invalid argument 'old' to -fdebug-prefix-map
-+// CHECK-MACRO-INVALID: error: invalid argument 'old' to -fmacro-prefix-map
-+// CHECK-FILE-INVALID: error: invalid argument 'old' to -ffile-prefix-map
-+// CHECK-DEBUG-SIMPLE: fdebug-prefix-map=old=new
-+// CHECK-MACRO-SIMPLE: fmacro-prefix-map=old=new
-+// CHECK-DEBUG-COMPLEX: fdebug-prefix-map=old=n=ew
-+// CHECK-MACRO-COMPLEX: fmacro-prefix-map=old=n=ew
-+// CHECK-DEBUG-EMPTY: fdebug-prefix-map=old=
-+// CHECK-MACRO-EMPTY: fmacro-prefix-map=old=
-diff --git a/clang/test/Preprocessor/file_test.c b/clang/test/Preprocessor/file_test.c
-new file mode 100644
-index 00000000000..bdc5f1df659
---- /dev/null
-+++ b/clang/test/Preprocessor/file_test.c
-@@ -0,0 +1,22 @@
-+// RUN: %clang -E -ffile-prefix-map=%p=/UNLIKELY_PATH/empty -c -o - %s | FileCheck %s
-+// RUN: %clang -E -fmacro-prefix-map=%p=/UNLIKELY_PATH/empty -c -o - %s | FileCheck %s
-+// RUN: %clang -E -fmacro-prefix-map=%p=/UNLIKELY_PATH=empty -c -o - %s | FileCheck %s -check-prefix CHECK-EVIL
-+// RUN: %clang -E -fmacro-prefix-map=%p/= -c -o - %s | FileCheck %s --check-prefix CHECK-REMOVE
-+
-+filename: __FILE__
-+#include "file_test.h"
-+
-+// CHECK: filename: "/UNLIKELY_PATH/empty{{[/\\]}}file_test.c"
-+// CHECK: filename: "/UNLIKELY_PATH/empty{{[/\\]}}file_test.h"
-+// CHECK: basefile: "/UNLIKELY_PATH/empty{{[/\\]}}file_test.c"
-+// CHECK-NOT: filename:
-+
-+// CHECK-EVIL: filename: "/UNLIKELY_PATH=empty{{[/\\]}}file_test.c"
-+// CHECK-EVIL: filename: "/UNLIKELY_PATH=empty{{[/\\]}}file_test.h"
-+// CHECK-EVIL: basefile: "/UNLIKELY_PATH=empty{{[/\\]}}file_test.c"
-+// CHECK-EVIL-NOT: filename:
-+
-+// CHECK-REMOVE: filename: "file_test.c"
-+// CHECK-REMOVE: filename: "file_test.h"
-+// CHECK-REMOVE: basefile: "file_test.c"
-+// CHECK-REMOVE-NOT: filename:
-diff --git a/clang/test/Preprocessor/file_test.h b/clang/test/Preprocessor/file_test.h
-new file mode 100644
-index 00000000000..c289e5c8362
---- /dev/null
-+++ b/clang/test/Preprocessor/file_test.h
-@@ -0,0 +1,2 @@
-+filename: __FILE__
-+basefile: __BASE_FILE__