From 81e84a5e39617d51285e029f61c7b85011774858 Mon Sep 17 00:00:00 2001 From: Jim Grosbach Date: Fri, 16 Oct 2015 22:07:59 +0000 Subject: [PATCH] MC: Don't crash after issuing a diagnostic. Crashing is bad, m'kay? Fixing a 4 year old bug of my own creation. Adding the testcase now which I should have added then which would have long since caught this. The problem is that printMessage() will display the diagnostic but not set HadError to true, resulting in the assembler continuing on its way and trying to create relocations for things that may not allow them or otherwise get itself into trouble. Using the Error() helper function here rather than calling printMessage() directly resolves this. rdar://23133240 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@250557 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCParser/AsmParser.cpp | 5 ++--- test/MC/AsmParser/undefined-local-symbol.s | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 test/MC/AsmParser/undefined-local-symbol.s diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index 9c542244fc7..c003c797dd9 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -690,9 +690,8 @@ bool AsmParser::Run(bool NoInitialTextSection, bool NoFinalize) { // FIXME: We would really like to refer back to where the symbol was // first referenced for a source location. We need to add something // to track that. Currently, we just point to the end of the file. - printMessage(getLexer().getLoc(), SourceMgr::DK_Error, - "assembler local symbol '" + Sym->getName() + - "' not defined"); + return Error(getLexer().getLoc(), "assembler local symbol '" + + Sym->getName() + "' not defined"); } } diff --git a/test/MC/AsmParser/undefined-local-symbol.s b/test/MC/AsmParser/undefined-local-symbol.s new file mode 100644 index 00000000000..280fc555980 --- /dev/null +++ b/test/MC/AsmParser/undefined-local-symbol.s @@ -0,0 +1,8 @@ +# RUN: not llvm-mc -triple i386-apple-darwin -filetype=obj -o /dev/null %s 2>&1 | FileCheck %s + +# NOTE: apple-darwin portion of the triple is to enforce the convention choice +# of what an assembler local symbol looks like (i.e., 'L' prefix.) + +# CHECK: error: assembler local symbol 'Lbar' not defined +foo: + jmp Lbar -- 2.34.1