summaryrefslogtreecommitdiffstats
path: root/llvm/lib/MC
diff options
context:
space:
mode:
authorKevin Enderby <enderby@apple.com>2012-01-31 23:02:57 +0000
committerKevin Enderby <enderby@apple.com>2012-01-31 23:02:57 +0000
commite1a12cf3eeb1b87b01f6e9873f53cd008c7b50b0 (patch)
treef4ec0b1cda63eb6017ec821c28c4d0d8627a4e85 /llvm/lib/MC
parent9ccdb1d01bf98b47205f51a024a9ea4d5dd135d0 (diff)
downloadbcm5719-llvm-e1a12cf3eeb1b87b01f6e9873f53cd008c7b50b0.tar.gz
bcm5719-llvm-e1a12cf3eeb1b87b01f6e9873f53cd008c7b50b0.zip
Fixed a crash in llvm-mc for Mach-O when a symbol difference expression uses a
symbol from an assignment. In this case the symbol did not have a fragment so MCObjectWriter::IsSymbolRefDifferenceFullyResolved() should not have been calling IsSymbolRefDifferenceFullyResolvedImpl() with a NULL fragment and should just have returned false in that case. llvm-svn: 149442
Diffstat (limited to 'llvm/lib/MC')
-rw-r--r--llvm/lib/MC/MCObjectWriter.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/llvm/lib/MC/MCObjectWriter.cpp b/llvm/lib/MC/MCObjectWriter.cpp
index 18887397ab6..030f24793c5 100644
--- a/llvm/lib/MC/MCObjectWriter.cpp
+++ b/llvm/lib/MC/MCObjectWriter.cpp
@@ -68,6 +68,8 @@ MCObjectWriter::IsSymbolRefDifferenceFullyResolved(const MCAssembler &Asm,
const MCSymbolData &DataA = Asm.getSymbolData(SA);
const MCSymbolData &DataB = Asm.getSymbolData(SB);
+ if(!DataA.getFragment() || !DataB.getFragment())
+ return false;
return IsSymbolRefDifferenceFullyResolvedImpl(Asm, DataA,
*DataB.getFragment(),
OpenPOWER on IntegriCloud