summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/PCHReader.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2009-05-22 22:45:36 +0000
committerDouglas Gregor <dgregor@apple.com>2009-05-22 22:45:36 +0000
commit038c338949d808eab5ebf20bb3185f860b2ae858 (patch)
treefabd401925818bbde6f78b843517076adcf2b91e /clang/lib/Frontend/PCHReader.cpp
parent92f3d1ff1c365cd02a6c1338ff4bdad9a60ad9f0 (diff)
downloadbcm5719-llvm-038c338949d808eab5ebf20bb3185f860b2ae858.tar.gz
bcm5719-llvm-038c338949d808eab5ebf20bb3185f860b2ae858.zip
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). llvm-svn: 72292
Diffstat (limited to 'clang/lib/Frontend/PCHReader.cpp')
-rw-r--r--clang/lib/Frontend/PCHReader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Frontend/PCHReader.cpp b/clang/lib/Frontend/PCHReader.cpp
index 4da4538f3e5..46f4fb72542 100644
--- a/clang/lib/Frontend/PCHReader.cpp
+++ b/clang/lib/Frontend/PCHReader.cpp
@@ -117,7 +117,7 @@ public:
for (unsigned I = 1; I != N; ++I)
Args.push_back(Reader.DecodeIdentifierInfo(ReadUnalignedLE32(d)));
- return SelTable.getSelector(N, &Args[0]);
+ return SelTable.getSelector(N, Args.data());
}
data_type ReadData(Selector, const unsigned char* d, unsigned DataLen) {
@@ -946,7 +946,7 @@ void PCHReader::ReadMacroRecord(uint64_t Offset) {
MI->setIsFunctionLike();
if (isC99VarArgs) MI->setIsC99Varargs();
if (isGNUVarArgs) MI->setIsGNUVarargs();
- MI->setArgumentList(&MacroArgs[0], MacroArgs.size(),
+ MI->setArgumentList(MacroArgs.data(), MacroArgs.size(),
PP.getPreprocessorAllocator());
}
@@ -1710,7 +1710,7 @@ QualType PCHReader::ReadTypeRecord(uint64_t Offset) {
llvm::SmallVector<ObjCProtocolDecl*, 4> Protos;
for (unsigned I = 0; I != NumProtos; ++I)
Protos.push_back(cast<ObjCProtocolDecl>(GetDecl(Record[Idx++])));
- return Context->getObjCQualifiedInterfaceType(ItfD, &Protos[0], NumProtos);
+ return Context->getObjCQualifiedInterfaceType(ItfD, Protos.data(), NumProtos);
}
case pch::TYPE_OBJC_QUALIFIED_ID: {
@@ -1719,7 +1719,7 @@ QualType PCHReader::ReadTypeRecord(uint64_t Offset) {
llvm::SmallVector<ObjCProtocolDecl*, 4> Protos;
for (unsigned I = 0; I != NumProtos; ++I)
Protos.push_back(cast<ObjCProtocolDecl>(GetDecl(Record[Idx++])));
- return Context->getObjCQualifiedIdType(&Protos[0], NumProtos);
+ return Context->getObjCQualifiedIdType(Protos.data(), NumProtos);
}
}
// Suppress a GCC warning
OpenPOWER on IntegriCloud