diff options
Diffstat (limited to 'lib/VMCore')
-rw-r--r-- | lib/VMCore/Attributes.cpp | 6 | ||||
-rw-r--r-- | lib/VMCore/ValueSymbolTable.cpp | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/lib/VMCore/Attributes.cpp b/lib/VMCore/Attributes.cpp index 0f3efa7..5a8fad9 100644 --- a/lib/VMCore/Attributes.cpp +++ b/lib/VMCore/Attributes.cpp @@ -108,7 +108,7 @@ public: void DropRef() { if (--RefCount == 0) delete this; } void Profile(FoldingSetNodeID &ID) const { - Profile(ID, &Attrs[0], Attrs.size()); + Profile(ID, Attrs.data(), Attrs.size()); } static void Profile(FoldingSetNodeID &ID, const AttributeWithIndex *Attr, unsigned NumAttrs) { @@ -261,7 +261,7 @@ AttrListPtr AttrListPtr::addAttr(unsigned Idx, Attributes Attrs) const { OldAttrList.begin()+i, OldAttrList.end()); } - return get(&NewAttrList[0], NewAttrList.size()); + return get(NewAttrList.data(), NewAttrList.size()); } AttrListPtr AttrListPtr::removeAttr(unsigned Idx, Attributes Attrs) const { @@ -296,7 +296,7 @@ AttrListPtr AttrListPtr::removeAttr(unsigned Idx, Attributes Attrs) const { NewAttrList.insert(NewAttrList.end(), OldAttrList.begin()+i, OldAttrList.end()); - return get(&NewAttrList[0], NewAttrList.size()); + return get(NewAttrList.data(), NewAttrList.size()); } void AttrListPtr::dump() const { diff --git a/lib/VMCore/ValueSymbolTable.cpp b/lib/VMCore/ValueSymbolTable.cpp index 3a0c54e..eee18a1 100644 --- a/lib/VMCore/ValueSymbolTable.cpp +++ b/lib/VMCore/ValueSymbolTable.cpp @@ -33,7 +33,7 @@ ValueSymbolTable::~ValueSymbolTable() { // lookup a value - Returns null on failure... // Value *ValueSymbolTable::lookup(const std::string &Name) const { - const_iterator VI = vmap.find(&Name[0], &Name[Name.size()]); + const_iterator VI = vmap.find(Name.data(), Name.data() + Name.size()); if (VI != vmap.end()) // We found the symbol return VI->getValue(); return 0; @@ -70,8 +70,9 @@ void ValueSymbolTable::reinsertValue(Value* V) { UniqueName.resize(BaseSize); UniqueName.append_uint_32(++LastUnique); // Try insert the vmap entry with this suffix. - ValueName &NewName = vmap.GetOrCreateValue(&UniqueName[0], - &UniqueName[UniqueName.size()]); + ValueName &NewName = + vmap.GetOrCreateValue(UniqueName.data(), + UniqueName.data() + UniqueName.size()); if (NewName.getValue() == 0) { // Newly inserted name. Success! NewName.setValue(V); @@ -111,8 +112,9 @@ ValueName *ValueSymbolTable::createValueName(const char *NameStart, UniqueName.append_uint_32(++LastUnique); // Try insert the vmap entry with this suffix. - ValueName &NewName = vmap.GetOrCreateValue(&UniqueName[0], - &UniqueName[UniqueName.size()]); + ValueName &NewName = + vmap.GetOrCreateValue(UniqueName.data(), + UniqueName.data() + UniqueName.size()); if (NewName.getValue() == 0) { // Newly inserted name. Success! NewName.setValue(V); |