Add 'DeclStmt::DoDestroy()' which doesn't actually recurse over its child expressions (via StmtIterator), as those expressions are owned by the Decls and Types (which are destroyed elsewhere). This fixes a crasher reported in <rdar://problem/7487294>.
llvm-svn: 91990
This commit is contained in:
parent
d2ab38e3f4
commit
00d19ee130
|
@ -294,6 +294,9 @@ class DeclStmt : public Stmt {
|
||||||
DeclGroupRef DG;
|
DeclGroupRef DG;
|
||||||
SourceLocation StartLoc, EndLoc;
|
SourceLocation StartLoc, EndLoc;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
virtual void DoDestroy(ASTContext &Ctx);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
DeclStmt(DeclGroupRef dg, SourceLocation startLoc,
|
DeclStmt(DeclGroupRef dg, SourceLocation startLoc,
|
||||||
SourceLocation endLoc) : Stmt(DeclStmtClass), DG(dg),
|
SourceLocation endLoc) : Stmt(DeclStmtClass), DG(dg),
|
||||||
|
|
|
@ -32,6 +32,7 @@ DeclGroup::DeclGroup(unsigned numdecls, Decl** decls) : NumDecls(numdecls) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void DeclGroup::Destroy(ASTContext& C) {
|
void DeclGroup::Destroy(ASTContext& C) {
|
||||||
|
// Decls are destroyed by the DeclContext.
|
||||||
this->~DeclGroup();
|
this->~DeclGroup();
|
||||||
C.Deallocate((void*) this);
|
C.Deallocate((void*) this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -426,6 +426,14 @@ Stmt::child_iterator DeclStmt::child_end() {
|
||||||
return StmtIterator(DG.end(), DG.end());
|
return StmtIterator(DG.end(), DG.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DeclStmt::DoDestroy(ASTContext &C) {
|
||||||
|
// Don't use StmtIterator to iterate over the Decls, as that can recurse
|
||||||
|
// into VLA size expressions (which are owned by the VLA). Further, Decls
|
||||||
|
// are owned by the DeclContext, and will be destroyed with them.
|
||||||
|
if (DG.isDeclGroup())
|
||||||
|
DG.getDeclGroup().Destroy(C);
|
||||||
|
}
|
||||||
|
|
||||||
// NullStmt
|
// NullStmt
|
||||||
Stmt::child_iterator NullStmt::child_begin() { return child_iterator(); }
|
Stmt::child_iterator NullStmt::child_begin() { return child_iterator(); }
|
||||||
Stmt::child_iterator NullStmt::child_end() { return child_iterator(); }
|
Stmt::child_iterator NullStmt::child_end() { return child_iterator(); }
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
// RUN: c-index-test -test-load-source local %s 2>&1 | FileCheck %s
|
||||||
|
|
||||||
|
// This is invalid source. Previously a double-free caused this
|
||||||
|
// example to crash c-index-test.
|
||||||
|
|
||||||
|
int foo(int x) {
|
||||||
|
int y[x * 3];
|
||||||
|
help
|
||||||
|
};
|
||||||
|
|
||||||
|
// CHECK: 8:3: error: use of undeclared identifier 'help'
|
||||||
|
// CHECK: help
|
||||||
|
// CHECK: 12:102: error: expected '}'
|
Loading…
Reference in New Issue