summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target
diff options
context:
space:
mode:
authorMaya Madhavan <maya.madhavan@windriver.com>2018-09-20 05:11:42 +0000
committerMaya Madhavan <maya.madhavan@windriver.com>2018-09-20 05:11:42 +0000
commitec1efe4ee36c82dd4a6f5ed8066bbd4c4795a348 (patch)
tree6b251ad8577698716c962b6ca2a2cf1966b5ba11 /llvm/lib/Target
parentaccb65b994074caba156d35ead9c7b50f6c320ac (diff)
downloadbcm5719-llvm-ec1efe4ee36c82dd4a6f5ed8066bbd4c4795a348.tar.gz
bcm5719-llvm-ec1efe4ee36c82dd4a6f5ed8066bbd4c4795a348.zip
Fix for bug 34002 - label generated before it block is finalized. Differential Revision: https://reviews.llvm.org/D52258
llvm-svn: 342615
Diffstat (limited to 'llvm/lib/Target')
-rw-r--r--llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp7
1 files changed, 6 insertions, 1 deletions
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<NearMissInfo> &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;
OpenPOWER on IntegriCloud