[llvm] 4172fcc - Revert "[MC][AsmParser] Diagnose improperly nested .cfi frames"
Jon Roelofs via llvm-commits
llvm-commits at lists.llvm.org
Fri Nov 17 10:12:52 PST 2023
Author: Jon Roelofs
Date: 2023-11-17T10:12:02-08:00
New Revision: 4172fcc1ebbe0a7b699bfcbdaae9d5f688b62b09
URL: https://github.com/llvm/llvm-project/commit/4172fcc1ebbe0a7b699bfcbdaae9d5f688b62b09
DIFF: https://github.com/llvm/llvm-project/commit/4172fcc1ebbe0a7b699bfcbdaae9d5f688b62b09.diff
LOG: Revert "[MC][AsmParser] Diagnose improperly nested .cfi frames"
This reverts commit a4051932895d9ef6c4516c42309a49912f69f740.
It broke: lld/test/COFF/gc-dwarf-eh.s
Added:
Modified:
llvm/lib/MC/MCParser/AsmParser.cpp
Removed:
llvm/test/MC/AArch64/cfi-bad-nesting.s
################################################################################
diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp
index 9c3fd476f21ba53..b36c5f067a95392 100644
--- a/llvm/lib/MC/MCParser/AsmParser.cpp
+++ b/llvm/lib/MC/MCParser/AsmParser.cpp
@@ -125,7 +125,6 @@ class AsmParser : public MCAsmParser {
void *SavedDiagContext;
std::unique_ptr<MCAsmParserExtension> PlatformParser;
SMLoc StartTokLoc;
- std::optional<SMLoc> CFIStartProcLoc;
/// This is the current buffer index we're lexing from as managed by the
/// SourceMgr object.
@@ -1950,11 +1949,6 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info,
Lex();
}
- if (CFIStartProcLoc && Sym->isExternal())
- return Error(StartTokLoc, "non-private labels cannot appear between "
- ".cfi_startproc / .cfi_endproc pairs") &&
- Error(*CFIStartProcLoc, "previous .cfi_startproc was here");
-
if (discardLTOSymbol(IDVal))
return false;
@@ -4199,8 +4193,6 @@ bool AsmParser::parseDirectiveCFISections() {
/// parseDirectiveCFIStartProc
/// ::= .cfi_startproc [simple]
bool AsmParser::parseDirectiveCFIStartProc() {
- CFIStartProcLoc = StartTokLoc;
-
StringRef Simple;
if (!parseOptionalToken(AsmToken::EndOfStatement)) {
if (check(parseIdentifier(Simple) || Simple != "simple",
@@ -4221,11 +4213,8 @@ bool AsmParser::parseDirectiveCFIStartProc() {
/// parseDirectiveCFIEndProc
/// ::= .cfi_endproc
bool AsmParser::parseDirectiveCFIEndProc() {
- CFIStartProcLoc = std::nullopt;
-
if (parseEOL())
return true;
-
getStreamer().emitCFIEndProc();
return false;
}
diff --git a/llvm/test/MC/AArch64/cfi-bad-nesting.s b/llvm/test/MC/AArch64/cfi-bad-nesting.s
deleted file mode 100644
index 3a1a06e21394a74..000000000000000
--- a/llvm/test/MC/AArch64/cfi-bad-nesting.s
+++ /dev/null
@@ -1,23 +0,0 @@
-; RUN: not llvm-mc -triple arm64-apple-darwin %s -filetype=obj -o /dev/null 2>&1 | FileCheck %s
-
-; REQUIRES: aarch64-registered-target
-
- .section __TEXT,locomotive,regular,pure_instructions
-
- .globl _locomotive
- .p2align 2
-_locomotive:
- .cfi_startproc
- ret
-
- ; It is invalid to have a non-private label between .cfi_startproc / .cfi_endproc
- .section __TEXT,__text,regular,pure_instructions
- .globl _caboose
- .p2align 2
-_caboose:
-; CHECK: [[#@LINE-1]]:1: error: non-private labels cannot appear between .cfi_startproc / .cfi_endproc pairs
-; CHECK: [[#@LINE-9]]:2: error: previous .cfi_startproc was here
- ret
- .cfi_endproc
-
-.subsections_via_symbols
\ No newline at end of file
More information about the llvm-commits
mailing list