From 07f6903cbefe268d7fbf7f17fc8c1cddae16db5a Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Sun, 26 Jul 2009 00:42:33 +0000 Subject: [PATCH] Simplify. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77102 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/VMCore/Value.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/VMCore/Value.cpp b/lib/VMCore/Value.cpp index 6157dd5a753..67cd11a3d19 100644 --- a/lib/VMCore/Value.cpp +++ b/lib/VMCore/Value.cpp @@ -177,7 +177,10 @@ void Value::setName(const Twine &NewName) { const char *NameStr = NameData.data(); unsigned NameLen = NameData.size(); - if (NameLen == 0 && !hasName()) return; + // Name isn't changing? + if (getName() == StringRef(NameStr, NameLen)) + return; + assert(getType() != Type::VoidTy && "Cannot assign a name to void values!"); // Get the symbol table to update for this object. @@ -193,13 +196,8 @@ void Value::setName(const Twine &NewName) { return; } - if (Name) { - // Name isn't changing? - if (NameLen == Name->getKeyLength() && - !memcmp(Name->getKeyData(), NameStr, NameLen)) - return; + if (Name) Name->Destroy(); - } // NOTE: Could optimize for the case the name is shrinking to not deallocate // then reallocated. @@ -213,11 +211,6 @@ void Value::setName(const Twine &NewName) { // NOTE: Could optimize for the case the name is shrinking to not deallocate // then reallocated. if (hasName()) { - // Name isn't changing? - if (NameLen == Name->getKeyLength() && - !memcmp(Name->getKeyData(), NameStr, NameLen)) - return; - // Remove old name. ST->removeValueName(Name); Name->Destroy(); -- 2.34.1