[llvm] [llvm][Tablegen][llvm-tblgen] Added keyword #undef to llvm-tblgen (PR #69135)
zhao jiangtao via llvm-commits
llvm-commits at lists.llvm.org
Thu Oct 19 00:13:45 PDT 2023
https://github.com/whousemyname updated https://github.com/llvm/llvm-project/pull/69135
>From d5e185cd733db95f3a9e44df8b281ce4cf257674 Mon Sep 17 00:00:00 2001
From: angryZ <lazytortoisezzzz at gmail.com>
Date: Mon, 16 Oct 2023 10:18:49 +0800
Subject: [PATCH] [llvm-tblgen] Added keyword #undef to llvm-tblgen and fixed a
small bug for llvm-tblgen
---
llvm/lib/TableGen/TGLexer.cpp | 29 ++++++++++++++-----
llvm/lib/TableGen/TGLexer.h | 1 +
llvm/test/TableGen/prep-undef-1.td | 9 ++++++
llvm/test/TableGen/prep-undef-2.td | 8 +++++
llvm/test/TableGen/prep-undef-3.td | 9 ++++++
llvm/test/TableGen/prep-undef-diag-1.td | 4 +++
llvm/test/TableGen/prep-undef-diag-2.td | 4 +++
.../TableGen/prep-undef-included-file.inc | 9 ++++++
8 files changed, 65 insertions(+), 8 deletions(-)
create mode 100644 llvm/test/TableGen/prep-undef-1.td
create mode 100644 llvm/test/TableGen/prep-undef-2.td
create mode 100644 llvm/test/TableGen/prep-undef-3.td
create mode 100644 llvm/test/TableGen/prep-undef-diag-1.td
create mode 100644 llvm/test/TableGen/prep-undef-diag-2.td
create mode 100644 llvm/test/TableGen/prep-undef-included-file.inc
diff --git a/llvm/lib/TableGen/TGLexer.cpp b/llvm/lib/TableGen/TGLexer.cpp
index d5140e91fce9e94..00167cf2e374271 100644
--- a/llvm/lib/TableGen/TGLexer.cpp
+++ b/llvm/lib/TableGen/TGLexer.cpp
@@ -35,13 +35,9 @@ namespace {
struct {
tgtok::TokKind Kind;
const char *Word;
-} PreprocessorDirs[] = {
- { tgtok::Ifdef, "ifdef" },
- { tgtok::Ifndef, "ifndef" },
- { tgtok::Else, "else" },
- { tgtok::Endif, "endif" },
- { tgtok::Define, "define" }
-};
+} PreprocessorDirs[] = {{tgtok::Ifdef, "ifdef"}, {tgtok::Ifndef, "ifndef"},
+ {tgtok::Else, "else"}, {tgtok::Endif, "endif"},
+ {tgtok::Define, "define"}, {tgtok::Undef, "undef"}};
} // end anonymous namespace
TGLexer::TGLexer(SourceMgr &SM, ArrayRef<std::string> Macros) : SrcMgr(SM) {
@@ -834,6 +830,23 @@ tgtok::TokKind TGLexer::lexPreprocessor(
return tgtok::Error;
}
+ return LexToken();
+ } else if (Kind == tgtok::Undef) {
+ StringRef MacroName = prepLexMacroName();
+ if (MacroName.empty())
+ return ReturnError(TokStart, "Expected macro name after #undef");
+
+ DefinedMacros.erase(MacroName);
+
+ if (!prepSkipDirectiveEnd())
+ return ReturnError(CurPtr,
+ "Only comments are supported after #undef NAME");
+
+ if (!ReturnNextLiveToken) {
+ PrintFatalError("#undef must be ignored during the lines skipping");
+ return tgtok::Error;
+ }
+
return LexToken();
}
@@ -867,7 +880,7 @@ bool TGLexer::prepSkipRegion(bool MustNeverBeFalse) {
// If we did not find a preprocessing directive or it is #define,
// then just skip to the next line. We do not have to do anything
// for #define in the line-skipping mode.
- if (Kind == tgtok::Error || Kind == tgtok::Define)
+ if (Kind == tgtok::Error || Kind == tgtok::Define || Kind == tgtok::Undef)
continue;
tgtok::TokKind ProcessedKind = lexPreprocessor(Kind, false);
diff --git a/llvm/lib/TableGen/TGLexer.h b/llvm/lib/TableGen/TGLexer.h
index 4429c91b7c9cf76..02d141b629e1e04 100644
--- a/llvm/lib/TableGen/TGLexer.h
+++ b/llvm/lib/TableGen/TGLexer.h
@@ -72,6 +72,7 @@ enum TokKind {
Else,
Endif,
Define,
+ Undef,
// Reserved keywords. ('ElseKW' is named to distinguish it from the
// existing 'Else' that means the preprocessor #else.)
diff --git a/llvm/test/TableGen/prep-undef-1.td b/llvm/test/TableGen/prep-undef-1.td
new file mode 100644
index 000000000000000..b5b175961053fc2
--- /dev/null
+++ b/llvm/test/TableGen/prep-undef-1.td
@@ -0,0 +1,9 @@
+// RUN: llvm-tblgen %s | FileCheck %s
+
+// CHECK: def TEST_MACRONAME
+#define MACRONAME
+#undef MACRONAME
+
+#ifndef MACRONAME
+def TEST_MACRONAME;
+#endif
diff --git a/llvm/test/TableGen/prep-undef-2.td b/llvm/test/TableGen/prep-undef-2.td
new file mode 100644
index 000000000000000..7d91aad08bb64a8
--- /dev/null
+++ b/llvm/test/TableGen/prep-undef-2.td
@@ -0,0 +1,8 @@
+// RUN: llvm-tblgen %s | FileCheck %s
+
+// CHECK: def TEST_MACRONAME
+#undef MACRONAME
+#define MACRONAME
+#ifdef MACRONAME
+def TEST_MACRONAME;
+#endif
diff --git a/llvm/test/TableGen/prep-undef-3.td b/llvm/test/TableGen/prep-undef-3.td
new file mode 100644
index 000000000000000..f0790a7e175ddfb
--- /dev/null
+++ b/llvm/test/TableGen/prep-undef-3.td
@@ -0,0 +1,9 @@
+// RUN: llvm-tblgen -I %p %s 2>&1 | FileCheck %s
+
+// CHECK: def DEF_A
+#define FILE_A
+include "prep-undef-included-file.inc"
+
+// CHECK: def DEF_B
+#define FILE_B
+include "prep-undef-included-file.inc"
diff --git a/llvm/test/TableGen/prep-undef-diag-1.td b/llvm/test/TableGen/prep-undef-diag-1.td
new file mode 100644
index 000000000000000..084acb9f5b4323e
--- /dev/null
+++ b/llvm/test/TableGen/prep-undef-diag-1.td
@@ -0,0 +1,4 @@
+// // RUN: not llvm-tblgen %s 2>&1 | FileCheck %s
+
+// CHECK: error: Expected macro name after #undef
+#undef 1
diff --git a/llvm/test/TableGen/prep-undef-diag-2.td b/llvm/test/TableGen/prep-undef-diag-2.td
new file mode 100644
index 000000000000000..545acd7387411ff
--- /dev/null
+++ b/llvm/test/TableGen/prep-undef-diag-2.td
@@ -0,0 +1,4 @@
+// // RUN: not llvm-tblgen %s 2>&1 | FileCheck %s
+
+// CHECK: error: Only comments are supported after #undef NAME
+#undef MACRO 42
diff --git a/llvm/test/TableGen/prep-undef-included-file.inc b/llvm/test/TableGen/prep-undef-included-file.inc
new file mode 100644
index 000000000000000..46c1e0e32d7eac4
--- /dev/null
+++ b/llvm/test/TableGen/prep-undef-included-file.inc
@@ -0,0 +1,9 @@
+#ifdef FILE_A
+#undef FILE_A
+def DEF_A;
+#endif
+
+#ifdef FILE_B
+#undef FILE_B
+def DEF_B;
+#endif
More information about the llvm-commits
mailing list