diff options
| author | Douglas Gregor <dgregor@apple.com> | 2009-05-22 22:45:36 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2009-05-22 22:45:36 +0000 |
| commit | 75fdb2377604e53678102076991bea345ace4692 (patch) | |
| tree | e6bfa678e090d50a153be63036ed779b9dc516a6 /lib/Frontend/PCHReaderStmt.cpp | |
| parent | 66ef111b167833c197cded0a1befab4a483d7d6d (diff) | |
Fix lots of PCH crashes caused by the new assertions in
llvm::SmallVector, using data() instead of &[0]. The PCH testsuite now
runs cleanly (again).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72292 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/PCHReaderStmt.cpp')
| -rw-r--r-- | lib/Frontend/PCHReaderStmt.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Frontend/PCHReaderStmt.cpp b/lib/Frontend/PCHReaderStmt.cpp index 03c5d25a7b..10059f609b 100644 --- a/lib/Frontend/PCHReaderStmt.cpp +++ b/lib/Frontend/PCHReaderStmt.cpp @@ -274,7 +274,8 @@ unsigned PCHStmtReader::VisitDeclStmt(DeclStmt *S) { for (unsigned N = Record.size(); Idx != N; ++Idx) Decls.push_back(Reader.GetDecl(Record[Idx])); S->setDeclGroup(DeclGroupRef(DeclGroup::Create(*Reader.getContext(), - &Decls[0], Decls.size()))); + Decls.data(), + Decls.size()))); } return 0; } @@ -369,7 +370,7 @@ unsigned PCHStmtReader::VisitStringLiteral(StringLiteral *E) { // Read string data llvm::SmallVector<char, 16> Str(&Record[Idx], &Record[Idx] + Len); - E->setStrData(*Reader.getContext(), &Str[0], Len); + E->setStrData(*Reader.getContext(), Str.data(), Len); Idx += Len; // Read source locations @@ -585,7 +586,7 @@ unsigned PCHStmtReader::VisitDesignatedInitExpr(DesignatedInitExpr *E) { } } } - E->setDesignators(&Designators[0], Designators.size()); + E->setDesignators(Designators.data(), Designators.size()); return NumSubExprs; } |