replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use nullptr instead of NULL, and remove use of VLA. 

llvm-svn: 152386
This commit is contained in:
Michael J. Spencer 2012-03-09 05:26:55 +00:00
parent 2bf10c3766
commit 4ff3c79998
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lld/include/lld/Core/Atom.h
View File

@ -54,19 +54,19 @@ public:
/// definedAtom - like dynamic_cast, if atom is definitionRegular
/// returns atom cast to DefinedAtom*, else returns nullptr;
virtual const DefinedAtom* definedAtom() const { return NULL; }
virtual const DefinedAtom* definedAtom() const { return nullptr; }
/// undefinedAtom - like dynamic_cast, if atom is definitionUndefined
/// returns atom cast to UndefinedAtom*, else returns NULL;
virtual const UndefinedAtom* undefinedAtom() const { return NULL; }
/// returns atom cast to UndefinedAtom*, else returns nullptr;
virtual const UndefinedAtom* undefinedAtom() const { return nullptr; }
/// sharedLibraryAtom - like dynamic_cast, if atom is definitionSharedLibrary
/// returns atom cast to SharedLibraryAtom*, else returns nullptr;
virtual const SharedLibraryAtom* sharedLibraryAtom() const { return NULL; }
virtual const SharedLibraryAtom* sharedLibraryAtom() const { return nullptr; }
/// absoluteAtom - like dynamic_cast, if atom is definitionAbsolute
/// returns atom cast to AbsoluteAtom*, else returns nullptr;
virtual const AbsoluteAtom* absoluteAtom() const { return NULL; }
virtual const AbsoluteAtom* absoluteAtom() const { return nullptr; }
protected:
/// Atom is an abstract base class. Only subclasses can access constructor.

5
lld/lib/Core/NativeWriter.cpp
View File

@ -446,7 +446,8 @@ private:
void writeTargetTable(llvm::raw_ostream& out) {
// Build table of target indexes
uint32_t maxTargetIndex = _targetsTableIndex.size();
uint32_t targetIndexes[maxTargetIndex];
assert(maxTargetIndex > 0);
std::vector<uint32_t> targetIndexes(maxTargetIndex);
for (TargetToIndex::iterator it = _targetsTableIndex.begin();
it != _targetsTableIndex.end(); ++it) {
const Atom* atom = it->first;
@ -501,7 +502,7 @@ private:
void writeAddendTable(llvm::raw_ostream& out) {
// Build table of addends
uint32_t maxAddendIndex = _addendsTableIndex.size();
Reference::Addend addends[maxAddendIndex];
std::vector<Reference::Addend> addends(maxAddendIndex);
for (AddendToIndex::iterator it = _addendsTableIndex.begin();
it != _addendsTableIndex.end(); ++it) {
Reference::Addend addend = it->first;