diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-10-17 18:53:12 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-10-17 18:53:12 +0000 |
| commit | 7d75bf652b0f6ddc0d5173dfccbd48ac5120d914 (patch) | |
| tree | f285601a1ad202f905b504a3ffea71f9600eef58 /clang/lib/Serialization/ASTReader.cpp | |
| parent | 652985764e7f9985ae051fc7edb7cd02be3f3e72 (diff) | |
| download | bcm5719-llvm-7d75bf652b0f6ddc0d5173dfccbd48ac5120d914.tar.gz bcm5719-llvm-7d75bf652b0f6ddc0d5173dfccbd48ac5120d914.zip | |
Controlling macros are identifiers, not declarations.
llvm-svn: 142225
Diffstat (limited to 'clang/lib/Serialization/ASTReader.cpp')
| -rw-r--r-- | clang/lib/Serialization/ASTReader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 3a8e5036a8d..cf14c211fef 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -1400,7 +1400,8 @@ HeaderFileInfoTrait::ReadData(const internal_key_type, const unsigned char *d, HFI.Resolved = (Flags >> 1) & 0x01; HFI.IndexHeaderMapHeader = Flags & 0x01; HFI.NumIncludes = ReadUnalignedLE16(d); - HFI.ControllingMacroID = Reader.getGlobalDeclID(M, ReadUnalignedLE32(d)); + HFI.ControllingMacroID = Reader.getGlobalIdentifierID(M, + ReadUnalignedLE32(d)); if (unsigned FrameworkOffset = ReadUnalignedLE32(d)) { // The framework offset is 1 greater than the actual offset, // since 0 is used as an indicator for "no framework name". |
