Author: Daniil Kovalev Date: 2024-03-02T07:20:30+03:00 New Revision: e1d58e480eb92b21ae4989b15bf625fc8383e50f
URL: https://github.com/llvm/llvm-project/commit/e1d58e480eb92b21ae4989b15bf625fc8383e50f DIFF: https://github.com/llvm/llvm-project/commit/e1d58e480eb92b21ae4989b15bf625fc8383e50f.diff LOG: Revert "[FileCheck] Fix parsing empty global and pseudo variable names (#82595)" This reverts commit aab3d13179dc5a37465a0e6fbf1b9369a4e6e50f. Added: Modified: llvm/lib/FileCheck/FileCheck.cpp Removed: llvm/test/FileCheck/empty-variable-name.txt ################################################################################ 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: ^ _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
