commit 541ba16defc1b89630cbdecdf1c09487bafd969f
author Douglas Gregor <dgregor@apple.com> Mon Oct 17 18:53:12 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Mon Oct 17 18:53:12 2011 +0000
tree 2945228480ab0dee8766cbe0c439e3611d3c23ea
parent 5acb0c98b363400f6ade0ae7250f0102224e806b

Controlling macros are identifiers, not declarations.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@142225 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Serialization/ASTReader.cpp

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 3a8e503..cf14c21 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -1400,7 +1400,8 @@
   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".