From: Ethan Luis McDonough <ethanluismcdonough@gmail.com>
Date: Sat, 18 Feb 2023 07:56:15 +0000 (-0600)
Subject: [flang] Remove macro replacement in angular bracket includes
X-Git-Tag: upstream/17.0.6~17076
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ce8eb0fbc83d9652f9266e5c7077727b8012db9;p=platform%2Fupstream%2Fllvm.git

[flang] Remove macro replacement in angular bracket includes

Addresses Github issue [[ https://github.com/llvm/llvm-project/issues/60317 | #60317 ]].

Reviewed By: klausler

Differential Revision: https://reviews.llvm.org/D143469
---

diff --git a/flang/lib/Parser/preprocessor.cpp b/flang/lib/Parser/preprocessor.cpp
index c8f944e..58b54f4 100644
--- a/flang/lib/Parser/preprocessor.cpp
+++ b/flang/lib/Parser/preprocessor.cpp
@@ -599,7 +599,7 @@ void Preprocessor::Directive(const TokenSequence &dir, Prescanner &prescanner) {
             "#include: expected '>' at end of included file"_port_en_US);
       }
       TokenSequence braced{dir, j + 1, k - j - 1};
-      include = ReplaceMacros(braced, prescanner).ToString();
+      include = braced.ToString();
       j = k;
     } else if ((include = dir.TokenAt(j).ToString()).substr(0, 1) == "\"" &&
         include.substr(include.size() - 1, 1) == "\"") { // #include "foo"
diff --git a/flang/test/Preprocessing/preserve-brace-include.F90 b/flang/test/Preprocessing/preserve-brace-include.F90
new file mode 100644
index 0000000..22df354
--- /dev/null
+++ b/flang/test/Preprocessing/preserve-brace-include.F90
@@ -0,0 +1,5 @@
+! RUN: %flang -E -I%S %s | FileCheck %s
+
+#define empty ERR_NONEXISTENT
+! CHECK-NOT: :5:
+#include <empty.h>