Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[FileCheck] Fix parsing empty global and pseudo variable names" #83657

Merged
merged 1 commit into from
Mar 2, 2024

Conversation

kovdan01
Copy link
Contributor

@kovdan01 kovdan01 commented Mar 2, 2024

@llvmbot
Copy link
Collaborator

llvmbot commented Mar 2, 2024

@llvm/pr-subscribers-testing-tools

Author: Daniil Kovalev (kovdan01)

Changes

Reverts llvm/llvm-project#82595

See build failure https://lab.llvm.org/buildbot/#/builders/139/builds/60549


Full diff: https://github.com/llvm/llvm-project/pull/83657.diff

2 Files Affected:

  • (modified) llvm/lib/FileCheck/FileCheck.cpp (-6)
  • (removed) llvm/test/FileCheck/empty-variable-name.txt (-32)
diff --git a/llvm/lib/FileCheck/FileCheck.cpp b/llvm/lib/FileCheck/FileCheck.cpp
index 8f80a69c4abd3a..6d3a2b9cf46f7c 100644
--- a/llvm/lib/FileCheck/FileCheck.cpp
+++ b/llvm/lib/FileCheck/FileCheck.cpp
@@ -297,12 +297,6 @@ Pattern::parseVariable(StringRef &Str, const SourceMgr &SM) {
   if (Str[0] == '$' || IsPseudo)
     ++I;
 
-  if (I == Str.size())
-    return ErrorDiagnostic::get(SM, Str.slice(I, StringRef::npos),
-                                StringRef("empty ") +
-                                    (IsPseudo ? "pseudo " : "global ") +
-                                    "variable name");
-
   if (!isValidVarNameStart(Str[I++]))
     return ErrorDiagnostic::get(SM, Str, "invalid variable name");
 
diff --git a/llvm/test/FileCheck/empty-variable-name.txt b/llvm/test/FileCheck/empty-variable-name.txt
deleted file mode 100644
index 29c6317e6bb17e..00000000000000
--- a/llvm/test/FileCheck/empty-variable-name.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-a
-
-; RUN: not FileCheck -input-file %s %s 2>&1 | \
-; RUN:   FileCheck -check-prefix CHECK-ERROR -DDIR=%S \
-; RUN:   --match-full-lines --strict-whitespace %s
-
-; CHECK:        a[[]]
-; CHECK-ERROR:[[DIR]]{{/|\\}}empty-variable-name.txt:7:13: error: empty variable name
-; CHECK-ERROR-NEXT:; CHECK: a{{\[\[\]\]}}
-;      CHECK-ERROR-NEXT:            ^
-
-b
-
-; RUN: not FileCheck -input-file %s -check-prefix CHECK-PSEUDO %s 2>&1 | \
-; RUN:   FileCheck -check-prefix CHECK-ERROR-PSEUDO -DDIR=%S \
-; RUN:   --match-full-lines --strict-whitespace %s
-
-; CHECK-PSEUDO: b[[@]]
-; CHECK-ERROR-PSEUDO:[[DIR]]{{/|\\}}empty-variable-name.txt:18:21: error: empty pseudo variable name
-; CHECK-ERROR-PSEUDO-NEXT:; CHECK-PSEUDO: b{{\[\[@\]\]}}
-;      CHECK-ERROR-PSEUDO-NEXT:                    ^
-
-c
-
-; RUN: not FileCheck -input-file %s -check-prefix CHECK-GLOBAL %s 2>&1 | \
-; RUN:   FileCheck -check-prefix CHECK-ERROR-GLOBAL -DDIR=%S \
-; RUN:   --match-full-lines --strict-whitespace %s
-
-; CHECK-GLOBAL: c[[$]]
-; CHECK-ERROR-GLOBAL:[[DIR]]{{/|\\}}empty-variable-name.txt:29:21: error: empty global variable name
-; CHECK-ERROR-GLOBAL-NEXT:; CHECK-GLOBAL: c{{\[\[\$\]\]}}
-;       CHECK-ERROR-GLOBAL-NEXT:                    ^

@kovdan01 kovdan01 merged commit 28b354a into main Mar 2, 2024
5 of 6 checks passed
@kovdan01 kovdan01 deleted the revert-82595-filecheck-empty-global-pseudo-variable branch March 2, 2024 05:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants