[llvm-commits] [llvm] r122012 - in /llvm/trunk: include/llvm/MC/MCExpr.h lib/MC/MCExpr.cpp
Daniel Dunbar
daniel at zuster.org
Thu Dec 16 17:07:32 PST 2010
Author: ddunbar
Date: Thu Dec 16 19:07:31 2010
New Revision: 122012
URL: http://llvm.org/viewvc/llvm-project?rev=122012&view=rev
Log:
MC: Remove dead MCAssembler argument -- Rafael, can you check the FIXME I added
here?
Modified:
llvm/trunk/include/llvm/MC/MCExpr.h
llvm/trunk/lib/MC/MCExpr.cpp
Modified: llvm/trunk/include/llvm/MC/MCExpr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCExpr.h?rev=122012&r1=122011&r2=122012&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCExpr.h (original)
+++ llvm/trunk/include/llvm/MC/MCExpr.h Thu Dec 16 19:07:31 2010
@@ -50,8 +50,7 @@
protected:
explicit MCExpr(ExprKind _Kind) : Kind(_Kind) {}
- bool EvaluateAsRelocatableImpl(MCValue &Res, const MCAssembler *Asm,
- const MCAsmLayout *Layout,
+ bool EvaluateAsRelocatableImpl(MCValue &Res, const MCAsmLayout *Layout,
const SectionAddrMap *Addrs,
bool InSet) const;
public:
Modified: llvm/trunk/lib/MC/MCExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCExpr.cpp?rev=122012&r1=122011&r2=122012&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCExpr.cpp (original)
+++ llvm/trunk/lib/MC/MCExpr.cpp Thu Dec 16 19:07:31 2010
@@ -267,7 +267,8 @@
return true;
}
- if (!EvaluateAsRelocatableImpl(Value, Asm, Layout, Addrs, Addrs) ||
+ // FIXME: This use of Addrs is wrong, right?
+ if (!EvaluateAsRelocatableImpl(Value, Layout, Addrs, /*InSet=*/Addrs) ||
!Value.isAbsolute()) {
// EvaluateAsAbsolute is defined to return the "current value" of
// the expression if we are given a Layout object, even in cases
@@ -377,14 +378,12 @@
bool MCExpr::EvaluateAsRelocatable(MCValue &Res,
const MCAsmLayout *Layout) const {
if (Layout)
- return EvaluateAsRelocatableImpl(Res, &Layout->getAssembler(), Layout,
- 0, false);
+ return EvaluateAsRelocatableImpl(Res, Layout, 0, false);
else
- return EvaluateAsRelocatableImpl(Res, 0, 0, 0, false);
+ return EvaluateAsRelocatableImpl(Res, 0, 0, false);
}
bool MCExpr::EvaluateAsRelocatableImpl(MCValue &Res,
- const MCAssembler *Asm,
const MCAsmLayout *Layout,
const SectionAddrMap *Addrs,
bool InSet) const {
@@ -404,10 +403,8 @@
// Evaluate recursively if this is a variable.
if (Sym.isVariable() && SRE->getKind() == MCSymbolRefExpr::VK_None) {
- bool Ret = Sym.getVariableValue()->EvaluateAsRelocatableImpl(Res, Asm,
- Layout,
- Addrs,
- true);
+ bool Ret = Sym.getVariableValue()->EvaluateAsRelocatableImpl(Res, Layout,
+ Addrs, true);
// If we failed to simplify this to a constant, let the target
// handle it.
if (Ret && !Res.getSymA() && !Res.getSymB())
@@ -422,7 +419,7 @@
const MCUnaryExpr *AUE = cast<MCUnaryExpr>(this);
MCValue Value;
- if (!AUE->getSubExpr()->EvaluateAsRelocatableImpl(Value, Asm, Layout,
+ if (!AUE->getSubExpr()->EvaluateAsRelocatableImpl(Value, Layout,
Addrs, InSet))
return false;
@@ -456,9 +453,9 @@
const MCBinaryExpr *ABE = cast<MCBinaryExpr>(this);
MCValue LHSValue, RHSValue;
- if (!ABE->getLHS()->EvaluateAsRelocatableImpl(LHSValue, Asm, Layout,
+ if (!ABE->getLHS()->EvaluateAsRelocatableImpl(LHSValue, Layout,
Addrs, InSet) ||
- !ABE->getRHS()->EvaluateAsRelocatableImpl(RHSValue, Asm, Layout,
+ !ABE->getRHS()->EvaluateAsRelocatableImpl(RHSValue, Layout,
Addrs, InSet))
return false;
More information about the llvm-commits
mailing list