From 8d627d31531ad45fecca82d52cd34092c7c4cc1d Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 5 May 2010 19:00:56 +0000 Subject: [PATCH] MC: Make setVariableValue check the redefinition condition a bit more strongly. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@103110 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/MC/MCSymbol.h | 5 +---- lib/MC/MCSymbol.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/llvm/MC/MCSymbol.h b/include/llvm/MC/MCSymbol.h index 2b254b97efa..2ee7dd44cff 100644 --- a/include/llvm/MC/MCSymbol.h +++ b/include/llvm/MC/MCSymbol.h @@ -131,10 +131,7 @@ namespace llvm { return Value; } - void setVariableValue(const MCExpr *Value) { - assert(Value && "Invalid variable value!"); - this->Value = Value; - } + void setVariableValue(const MCExpr *Value); /// @} diff --git a/lib/MC/MCSymbol.cpp b/lib/MC/MCSymbol.cpp index 3fb12336c4f..82d72a3e95b 100644 --- a/lib/MC/MCSymbol.cpp +++ b/lib/MC/MCSymbol.cpp @@ -8,6 +8,7 @@ //===----------------------------------------------------------------------===// #include "llvm/MC/MCSymbol.h" +#include "llvm/MC/MCExpr.h" #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" using namespace llvm; @@ -38,6 +39,13 @@ static bool NameNeedsQuoting(StringRef Str) { return false; } +void MCSymbol::setVariableValue(const MCExpr *Value) { + assert(Value && "Invalid variable value!"); + assert((isUndefined() || (isAbsolute() && isa(Value))) && + "Invalid redefinition!"); + this->Value = Value; +} + void MCSymbol::print(raw_ostream &OS) const { // The name for this MCSymbol is required to be a valid target name. However, // some targets support quoting names with funny characters. If the name