cling/patches/clang-ASTReaderDecl-friendDeclBug.diff
Axel Naumann 14c6595959 Update cling's patches to be relative to its LastKnownGood.
Simplify some of the patches by reverting some of the changed llvm / clang files to the original ones.


git-svn-id: http://root.cern.ch/svn/root/trunk@49363 27541ba8-7e3a-0410-8455-c3a389f83636
2013-04-26 11:45:17 +00:00

12 lines
587 B
Diff

--- /home/axel/build/llvm-orig/src/./tools/clang/lib/Serialization/ASTReaderDecl.cpp 2013-04-11 09:34:53.573169052 +0200
+++ ./tools/clang/lib/Serialization/ASTReaderDecl.cpp 2013-04-24 19:40:15.673487393 +0200
@@ -1264,7 +1264,7 @@
D->Friend = GetTypeSourceInfo(Record, Idx);
for (unsigned i = 0; i != D->NumTPLists; ++i)
D->getTPLists()[i] = Reader.ReadTemplateParameterList(F, Record, Idx);
- D->NextFriend = Record[Idx++];
+ D->NextFriend = ReadDeclID(Record, Idx);
D->UnsupportedFriend = (Record[Idx++] != 0);
D->FriendLoc = ReadSourceLocation(Record, Idx);
}