Revert "Fix UBSan report in StringMap implementation."

This reverts commit r223402. Some bots fail with -Winvalid-offsetof
warning.

llvm-svn: 223407
This commit is contained in:
Alexey Samsonov 2014-12-04 23:00:50 +00:00
parent da7e03f1bf
commit 4c79708a34
1 changed files with 4 additions and 1 deletions

View File

@ -182,7 +182,10 @@ public:
/// GetStringMapEntryFromValue - Given a value that is known to be embedded
/// into a StringMapEntry, return the StringMapEntry itself.
static StringMapEntry &GetStringMapEntryFromValue(ValueTy &V) {
char *Ptr = reinterpret_cast<char *>(&V) - offsetof(StringMapEntry, second);
StringMapEntry *EPtr = 0;
char *Ptr = reinterpret_cast<char*>(&V) -
(reinterpret_cast<char*>(&EPtr->second) -
reinterpret_cast<char*>(EPtr));
return *reinterpret_cast<StringMapEntry*>(Ptr);
}
static const StringMapEntry &GetStringMapEntryFromValue(const ValueTy &V) {