From ec1efe4ee36c82dd4a6f5ed8066bbd4c4795a348 Mon Sep 17 00:00:00 2001 From: Maya Madhavan Date: Thu, 20 Sep 2018 05:11:42 +0000 Subject: Fix for bug 34002 - label generated before it block is finalized. Differential Revision: https://reviews.llvm.org/D52258 llvm-svn: 342615 --- llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'llvm/lib/Target') diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index da6296a6319..9e84a676e84 100644 --- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -631,6 +631,8 @@ public: void ReportNearMisses(SmallVectorImpl &NearMisses, SMLoc IDLoc, OperandVector &Operands); + void doBeforeLabelEmit(MCSymbol *Symbol) override; + void onLabelParsed(MCSymbol *Symbol) override; }; @@ -9443,10 +9445,13 @@ bool ARMAsmParser::parseDirectiveARM(SMLoc L) { return false; } -void ARMAsmParser::onLabelParsed(MCSymbol *Symbol) { +void ARMAsmParser::doBeforeLabelEmit(MCSymbol *Symbol) { // We need to flush the current implicit IT block on a label, because it is // not legal to branch into an IT block. flushPendingInstructions(getStreamer()); +} + +void ARMAsmParser::onLabelParsed(MCSymbol *Symbol) { if (NextSymbolIsThumb) { getParser().getStreamer().EmitThumbFunc(Symbol); NextSymbolIsThumb = false; -- cgit v1.2.3