From 76507f14edbfa7729775ee73173de735aa2f4781 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 2 Dec 2010 07:53:12 +0000 Subject: [PATCH] Add a fast path to EvaluateSymbolicAdd. This avoids computing symbol addresses which then avoids running EnsureValid. This cuts the assembly time of the testcase in PR8711 from 2:50 minutes to 1 minute. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120697 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCExpr.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp index 6eab0bd30d3..64c57b335ce 100644 --- a/lib/MC/MCExpr.cpp +++ b/lib/MC/MCExpr.cpp @@ -294,12 +294,20 @@ static bool EvaluateSymbolicAdd(const MCAsmLayout *Layout, bool InSet, if (Layout && A && B) { const MCSymbol &SA = A->getSymbol(); const MCSymbol &SB = B->getSymbol(); - const MCObjectFormat &F = - Layout->getAssembler().getBackend().getObjectFormat(); + const MCAssembler &Asm = Layout->getAssembler(); + const MCObjectFormat &F = Asm.getBackend().getObjectFormat(); if (SA.isDefined() && SB.isDefined() && F.isAbsolute(InSet, SA, SB)) { - const MCAssembler &Asm = Layout->getAssembler(); MCSymbolData &AD = Asm.getSymbolData(A->getSymbol()); MCSymbolData &BD = Asm.getSymbolData(B->getSymbol()); + + if (AD.getFragment() == BD.getFragment()) { + Res = MCValue::get(+ AD.getOffset() + - BD.getOffset() + + LHS.getConstant() + + RHS_Cst); + return true; + } + Res = MCValue::get(+ Layout->getSymbolAddress(&AD) - Layout->getSymbolAddress(&BD) + LHS.getConstant() -- 2.11.0