MC: Don't crash after issuing a diagnostic.
authorJim Grosbach <grosbach@apple.com>
Fri, 16 Oct 2015 22:07:59 +0000 (22:07 +0000)
committerJim Grosbach <grosbach@apple.com>
Fri, 16 Oct 2015 22:07:59 +0000 (22:07 +0000)
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
test/MC/AsmParser/undefined-local-symbol.s [new file with mode: 0644]

index 9c542244fc779a912a6ab0a86508d663fed6f69a..c003c797dd9301d279033f3267e0760814a699fd 100644 (file)
@@ -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 (file)
index 0000000..280fc55
--- /dev/null
@@ -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