[llvm-branch-commits] [cfe-branch] r123635 - in /cfe/branches/Apple/whitney/lib/Serialization: ASTReader.cpp ASTWriter.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Mon Jan 17 09:44:29 2011
New Revision: 123635

URL: http://llvm.org/viewvc/llvm-project?rev=123635&view=rev
Log:
Merge r123510:
--
Author: Argyrios Kyrtzidis <akyrtzi at gmail.com>
Date:   Sat Jan 15 02:56:16 2011 +0000

    Store/retrieve -fshort-enums for PCH, fixes rdar://8854933.

Modified:
    cfe/branches/Apple/whitney/lib/Serialization/ASTReader.cpp
    cfe/branches/Apple/whitney/lib/Serialization/ASTWriter.cpp

Modified: cfe/branches/Apple/whitney/lib/Serialization/ASTReader.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Serialization/ASTReader.cpp?rev=123635&r1=123634&r2=123635&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Serialization/ASTReader.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Serialization/ASTReader.cpp Mon Jan 17 09:44:29 2011
@@ -2621,6 +2621,7 @@
     PARSE_LANGOPT(AccessControl);
     PARSE_LANGOPT(CharIsSigned);
     PARSE_LANGOPT(ShortWChar);
+    PARSE_LANGOPT(ShortEnums);
     LangOpts.setGCMode((LangOptions::GCMode)Record[Idx++]);
     LangOpts.setVisibilityMode((Visibility)Record[Idx++]);
     LangOpts.setStackProtectorMode((LangOptions::StackProtectorMode)

Modified: cfe/branches/Apple/whitney/lib/Serialization/ASTWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Serialization/ASTWriter.cpp?rev=123635&r1=123634&r2=123635&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Serialization/ASTWriter.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Serialization/ASTWriter.cpp Mon Jan 17 09:44:29 2011
@@ -884,6 +884,9 @@
   Record.push_back(LangOpts.CharIsSigned); // Whether char is a signed or
                                            // unsigned type
   Record.push_back(LangOpts.ShortWChar);  // force wchar_t to be unsigned short
+  Record.push_back(LangOpts.ShortEnums);  // Should the enum type be equivalent
+                                          // to the smallest integer type with
+                                          // enough room.
   Record.push_back(LangOpts.getGCMode());
   Record.push_back(LangOpts.getVisibilityMode());
   Record.push_back(LangOpts.getStackProtectorMode());