[llvm-branch-commits] [cfe-branch] r105053 - in /cfe/branches/Apple/whitney: lib/Sema/SemaAttr.cpp test/Parser/pragma-options.c

[Daniel Dunbar]

Author: ddunbar
Date: Fri May 28 18:07:31 2010
New Revision: 105053

URL: http://llvm.org/viewvc/llvm-project?rev=105053&view=rev
Log:
Merge r104998:
--
Author: Daniel Dunbar <daniel at zuster.org>
Date:   Fri May 28 19:43:33 2010 +0000

    Sema: Just ignore '#pragma options align=power' for now, this is no worse than
    what we used to be doing, and makes sure that paired '#pragma options
    align=reset' won't fail.

Modified:
    cfe/branches/Apple/whitney/lib/Sema/SemaAttr.cpp
    cfe/branches/Apple/whitney/test/Parser/pragma-options.c

Modified: cfe/branches/Apple/whitney/lib/Sema/SemaAttr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Sema/SemaAttr.cpp?rev=105053&r1=105052&r2=105053&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Sema/SemaAttr.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Sema/SemaAttr.cpp Fri May 28 18:07:31 2010
@@ -135,7 +135,6 @@
     return;
   }
 
-  // We don't support #pragma options align=power.
   switch (Kind) {
     // For all targets we support native and natural are the same.
     //
@@ -146,6 +145,12 @@
     Context->setAlignment(0);
     break;
 
+    // FIXME: We just ignore #pragma options align=power for now.
+  case POAK_Power:
+    Context->push(0);
+    Context->setAlignment(0);
+    break;
+
     // Note that '#pragma options align=packed' is not equivalent to attribute
     // packed, it has a different precedence relative to attribute aligned.
   case POAK_Packed:

Modified: cfe/branches/Apple/whitney/test/Parser/pragma-options.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/test/Parser/pragma-options.c?rev=105053&r1=105052&r2=105053&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/test/Parser/pragma-options.c (original)
+++ cfe/branches/Apple/whitney/test/Parser/pragma-options.c Fri May 28 18:07:31 2010
@@ -9,4 +9,4 @@
 #pragma options align=natural
 #pragma options align=reset
 #pragma options align=mac68k
-/* expected-warning {{unsupported alignment option}} */ #pragma options align=power
+#pragma options align=power