[llvm-commits] [llvm] r122023 - in /llvm/trunk: include/llvm/MC/MCExpr.h lib/MC/MCExpr.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Thu Dec 16 20:05:45 2010
New Revision: 122023

URL: http://llvm.org/viewvc/llvm-project?rev=122023&view=rev
Log:
MC/Expr: Simplify.

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=122023&r1=122022&r2=122023&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCExpr.h (original)
+++ llvm/trunk/include/llvm/MC/MCExpr.h Thu Dec 16 20:05:45 2010
@@ -93,7 +93,10 @@
   /// @param Res - The relocatable value, if evaluation succeeds.
   /// @param Layout - The assembler layout object to use for evaluating values.
   /// @result - True on success.
-  bool EvaluateAsRelocatable(MCValue &Res, const MCAsmLayout *Layout = 0) const;
+  bool EvaluateAsRelocatable(MCValue &Res,
+                             const MCAsmLayout *Layout = 0) const {
+    return EvaluateAsRelocatableImpl(Res, Layout, 0, false);
+  }
 
   /// @}
 

Modified: llvm/trunk/lib/MC/MCExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCExpr.cpp?rev=122023&r1=122022&r2=122023&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCExpr.cpp (original)
+++ llvm/trunk/lib/MC/MCExpr.cpp Thu Dec 16 20:05:45 2010
@@ -355,14 +355,6 @@
   return true;
 }
 
-bool MCExpr::EvaluateAsRelocatable(MCValue &Res,
-                                   const MCAsmLayout *Layout) const {
-  if (Layout)
-    return EvaluateAsRelocatableImpl(Res, Layout, 0, false);
-  else
-    return EvaluateAsRelocatableImpl(Res, 0, 0, false);
-}
-
 bool MCExpr::EvaluateAsRelocatableImpl(MCValue &Res,
                                        const MCAsmLayout *Layout,
                                        const SectionAddrMap *Addrs,