diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2010-12-18 06:27:54 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2010-12-18 06:27:54 +0000 |
| commit | b403e098a125ef10e206a1de5a850bf73034b330 (patch) | |
| tree | 08c40def4ebd66c5d39b389cbda1ab7197214c5c /llvm/lib/MC/MCExpr.cpp | |
| parent | 8396dd0893d5b0168cf66fd65108676c362f644c (diff) | |
| download | bcm5719-llvm-b403e098a125ef10e206a1de5a850bf73034b330.tar.gz bcm5719-llvm-b403e098a125ef10e206a1de5a850bf73034b330.zip | |
Merge isAbsolute into IsSymbolRefDifferenceFullyResolved.
llvm-svn: 122148
Diffstat (limited to 'llvm/lib/MC/MCExpr.cpp')
| -rw-r--r-- | llvm/lib/MC/MCExpr.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp index 22d8740a197..94b9f0079a4 100644 --- a/llvm/lib/MC/MCExpr.cpp +++ b/llvm/lib/MC/MCExpr.cpp @@ -300,7 +300,7 @@ static void AttemptToFoldSymbolOffsetDifference(const MCAsmLayout *Layout, const MCAssembler &Asm = Layout->getAssembler(); if (A && B && - Asm.getWriter().IsSymbolRefDifferenceFullyResolved(Asm, A, B)) { + Asm.getWriter().IsSymbolRefDifferenceFullyResolved(Asm, A, B, false)) { // Eagerly evaluate. Addend += (Layout->getSymbolOffset(&Asm.getSymbolData(A->getSymbol())) - Layout->getSymbolOffset(&Asm.getSymbolData(B->getSymbol()))); @@ -385,10 +385,9 @@ static bool EvaluateSymbolicAdd(const MCAssembler *Asm, "Must have an assembler object if layout is given!"); if (Asm && A && B) { - const MCSymbol &SA = A->getSymbol(); - const MCSymbol &SB = B->getSymbol(); - if (SA.isDefined() && SB.isDefined() && - Asm->getWriter().isAbsolute(InSet, SA, SB)) { + if (A->getSymbol().isDefined() && B->getSymbol().isDefined() && + Asm->getWriter().IsSymbolRefDifferenceFullyResolved(*Asm, A, B, + InSet)) { MCSymbolData &AD = Asm->getSymbolData(A->getSymbol()); MCSymbolData &BD = Asm->getSymbolData(B->getSymbol()); |
