wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor duplicated expression. 

llvm-svn: 321736
This commit is contained in:
Rafael Espindola 2018-01-03 16:38:46 +00:00
parent d703b198f2
commit cc333d7400
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lld/ELF/Relocations.cpp
View File

@ -884,8 +884,8 @@ static void scanRelocs(InputSectionBase &Sec, ArrayRef<RelTy> Rels) {
if (maybeReportUndefined(Sym, Sec, Rel.r_offset)) if (maybeReportUndefined(Sym, Sec, Rel.r_offset))
continue; continue;
RelExpr Expr = const uint8_t *RelocatedAddr = Sec.Data.begin() + Rel.r_offset;
Target->getRelExpr(Type, Sym, Sec.Data.begin() + Rel.r_offset); RelExpr Expr = Target->getRelExpr(Type, Sym, RelocatedAddr);
// Ignore "hint" relocations because they are only markers for relaxation. // Ignore "hint" relocations because they are only markers for relaxation.
if (isRelExprOneOf<R_HINT, R_NONE>(Expr)) if (isRelExprOneOf<R_HINT, R_NONE>(Expr))
@ -919,8 +919,7 @@ static void scanRelocs(InputSectionBase &Sec, ArrayRef<RelTy> Rels) {
if (Sym.isGnuIFunc()) if (Sym.isGnuIFunc())
Expr = toPlt(Expr); Expr = toPlt(Expr);
else if (!Preemptible && Expr == R_GOT_PC && !isAbsoluteValue(Sym)) else if (!Preemptible && Expr == R_GOT_PC && !isAbsoluteValue(Sym))
Expr = Expr = Target->adjustRelaxExpr(Type, RelocatedAddr, Expr);
Target->adjustRelaxExpr(Type, Sec.Data.data() + Rel.r_offset, Expr);
else if (!Preemptible) else if (!Preemptible)
Expr = fromPlt(Expr); Expr = fromPlt(Expr);