[llvm-commits] [llvm] r171896 - in /llvm/trunk: include/llvm/Support/YAMLTraits.h lib/Support/YAMLTraits.cpp
Nick Kledzik
kledzik at apple.com
Tue Jan 8 13:04:44 PST 2013
Author: kledzik
Date: Tue Jan 8 15:04:44 2013
New Revision: 171896
URL: http://llvm.org/viewvc/llvm-project?rev=171896&view=rev
Log:
Fix memory leak in YAML I/O.
Stop using BumpPtrAllocator for HNodes because
they have fields (vector, map) which require HNode
destructors to be run.
Modified:
llvm/trunk/include/llvm/Support/YAMLTraits.h
llvm/trunk/lib/Support/YAMLTraits.cpp
Modified: llvm/trunk/include/llvm/Support/YAMLTraits.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/YAMLTraits.h?rev=171896&r1=171895&r2=171896&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/YAMLTraits.h (original)
+++ llvm/trunk/include/llvm/Support/YAMLTraits.h Tue Jan 8 15:04:44 2013
@@ -685,7 +685,8 @@
public:
// Construct a yaml Input object from a StringRef and optional user-data.
Input(StringRef InputContent, void *Ctxt=NULL);
-
+ ~Input();
+
// Check if there was an syntax or semantic error during parsing.
llvm::error_code error();
@@ -718,6 +719,7 @@
class HNode {
public:
HNode(Node *n) : _node(n) { }
+ virtual ~HNode() { }
static inline bool classof(const HNode *) { return true; }
Node *_node;
@@ -726,6 +728,7 @@
class EmptyHNode : public HNode {
public:
EmptyHNode(Node *n) : HNode(n) { }
+ virtual ~EmptyHNode() {}
static inline bool classof(const HNode *n) {
return NullNode::classof(n->_node);
}
@@ -735,6 +738,7 @@
class ScalarHNode : public HNode {
public:
ScalarHNode(Node *n, StringRef s) : HNode(n), _value(s) { }
+ virtual ~ScalarHNode() { }
StringRef value() const { return _value; }
@@ -749,6 +753,7 @@
class MapHNode : public HNode {
public:
MapHNode(Node *n) : HNode(n) { }
+ virtual ~MapHNode();
static inline bool classof(const HNode *n) {
return MappingNode::classof(n->_node);
@@ -774,6 +779,7 @@
class SequenceHNode : public HNode {
public:
SequenceHNode(Node *n) : HNode(n) { }
+ virtual ~SequenceHNode();
static inline bool classof(const HNode *n) {
return SequenceNode::classof(n->_node);
@@ -795,10 +801,11 @@
void nextDocument();
private:
- llvm::yaml::Stream *Strm;
- llvm::SourceMgr SrcMgr;
+ llvm::SourceMgr SrcMgr; // must be before Strm
+ OwningPtr<llvm::yaml::Stream> Strm;
+ OwningPtr<HNode> TopNode;
llvm::error_code EC;
- llvm::BumpPtrAllocator Allocator;
+ llvm::BumpPtrAllocator StringAllocator;
llvm::yaml::document_iterator DocIterator;
std::vector<bool> BitValuesUsed;
HNode *CurrentNode;
Modified: llvm/trunk/lib/Support/YAMLTraits.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/YAMLTraits.cpp?rev=171896&r1=171895&r2=171896&view=diff
==============================================================================
--- llvm/trunk/lib/Support/YAMLTraits.cpp (original)
+++ llvm/trunk/lib/Support/YAMLTraits.cpp Tue Jan 8 15:04:44 2013
@@ -40,11 +40,17 @@
// Input
//===----------------------------------------------------------------------===//
-Input::Input(StringRef InputContent, void *Ctxt) : IO(Ctxt), CurrentNode(NULL) {
- Strm = new Stream(InputContent, SrcMgr);
+Input::Input(StringRef InputContent, void *Ctxt)
+ : IO(Ctxt),
+ Strm(new Stream(InputContent, SrcMgr)),
+ CurrentNode(NULL) {
DocIterator = Strm->begin();
}
+Input::~Input() {
+
+}
+
error_code Input::error() {
return EC;
}
@@ -65,7 +71,8 @@
++DocIterator;
return setCurrentDocument();
}
- CurrentNode = this->createHNodes(N);
+ TopNode.reset(this->createHNodes(N));
+ CurrentNode = TopNode.get();
return true;
}
return false;
@@ -271,13 +278,13 @@
if (!StringStorage.empty()) {
// Copy string to permanent storage
unsigned Len = StringStorage.size();
- char *Buf = Allocator.Allocate<char>(Len);
+ char *Buf = StringAllocator.Allocate<char>(Len);
memcpy(Buf, &StringStorage[0], Len);
KeyStr = StringRef(Buf, Len);
}
- return new (Allocator) ScalarHNode(N, KeyStr);
+ return new ScalarHNode(N, KeyStr);
} else if (SequenceNode *SQ = dyn_cast<SequenceNode>(N)) {
- SequenceHNode *SQHNode = new (Allocator) SequenceHNode(N);
+ SequenceHNode *SQHNode = new SequenceHNode(N);
for (SequenceNode::iterator i = SQ->begin(), End = SQ->end(); i != End;
++i) {
HNode *Entry = this->createHNodes(i);
@@ -287,7 +294,7 @@
}
return SQHNode;
} else if (MappingNode *Map = dyn_cast<MappingNode>(N)) {
- MapHNode *mapHNode = new (Allocator) MapHNode(N);
+ MapHNode *mapHNode = new MapHNode(N);
for (MappingNode::iterator i = Map->begin(), End = Map->end(); i != End;
++i) {
ScalarNode *KeyScalar = dyn_cast<ScalarNode>(i->getKey());
@@ -296,7 +303,7 @@
if (!StringStorage.empty()) {
// Copy string to permanent storage
unsigned Len = StringStorage.size();
- char *Buf = Allocator.Allocate<char>(Len);
+ char *Buf = StringAllocator.Allocate<char>(Len);
memcpy(Buf, &StringStorage[0], Len);
KeyStr = StringRef(Buf, Len);
}
@@ -307,7 +314,7 @@
}
return mapHNode;
} else if (isa<NullNode>(N)) {
- return new (Allocator) EmptyHNode(N);
+ return new EmptyHNode(N);
} else {
setError(N, "unknown node kind");
return NULL;
@@ -327,6 +334,22 @@
this->setError(CurrentNode, Message);
}
+Input::MapHNode::~MapHNode() {
+ for (MapHNode::NameToNode::iterator i = Mapping.begin(), End = Mapping.end();
+ i != End; ++i) {
+ delete i->second;
+ }
+}
+
+Input::SequenceHNode::~SequenceHNode() {
+ for (std::vector<HNode*>::iterator i = Entries.begin(), End = Entries.end();
+ i != End; ++i) {
+ delete *i;
+ }
+}
+
+
+
//===----------------------------------------------------------------------===//
// Output
//===----------------------------------------------------------------------===//
More information about the llvm-commits
mailing list