diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2010-12-07 01:09:54 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2010-12-07 01:09:54 +0000 |
| commit | a2421ec705e6cfc75341665f675c232bada48dad (patch) | |
| tree | 5190ef1a0edd81aee21bae798753e6e20c7a23af /llvm/lib/MC | |
| parent | 347c4c7b8f29db3b9483521b3041a2340e7fd0df (diff) | |
| download | bcm5719-llvm-a2421ec705e6cfc75341665f675c232bada48dad.tar.gz bcm5719-llvm-a2421ec705e6cfc75341665f675c232bada48dad.zip | |
Fix a crash reduced from gcc produced assembly.
llvm-svn: 121085
Diffstat (limited to 'llvm/lib/MC')
| -rw-r--r-- | llvm/lib/MC/MachObjectWriter.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp index de96d64c279..fa3b4dce688 100644 --- a/llvm/lib/MC/MachObjectWriter.cpp +++ b/llvm/lib/MC/MachObjectWriter.cpp @@ -564,14 +564,10 @@ public: if (A_Base == B_Base && A_Base) report_fatal_error("unsupported relocation with identical base"); - assert((A_Base == NULL) == (B_Base == NULL)); - assert(A_SD.getFragment()->getParent() == - B_SD.getFragment()->getParent()); - - Value += Layout.getSymbolOffset(&A_SD) - - (A_Base == NULL ? 0 : Layout.getSymbolOffset(A_Base)); - Value -= Layout.getSymbolOffset(&B_SD) - - (B_Base == NULL ? 0 : Layout.getSymbolOffset(B_Base)); + Value += getSymbolAddress(&A_SD, Layout) - + (A_Base == NULL ? 0 : getSymbolAddress(A_Base, Layout)); + Value -= getSymbolAddress(&B_SD, Layout) - + (B_Base == NULL ? 0 : getSymbolAddress(B_Base, Layout)); if (A_Base) { Index = A_Base->getIndex(); |
