[cfe-commits] r168212 - in /cfe/trunk: lib/Driver/Types.cpp test/Driver/objc++-cpp-output.mm

[Chad Rosier]

Author: mcrosier
Date: Fri Nov 16 16:31:39 2012
New Revision: 168212

URL: http://llvm.org/viewvc/llvm-project?rev=168212&view=rev
Log:
[driver] Add the missing TY_PP_ObjCXX_Alias case to the isCXX function.

This was causing different behavior when using -x objective-c++-cpp-output as
compared to -x objc++-cpp-output.  Specifically, the driver was not adding the
-fcxx-exceptions flag in the latter case.
rdar://12680312

Modified:
    cfe/trunk/lib/Driver/Types.cpp
    cfe/trunk/test/Driver/objc++-cpp-output.mm

Modified: cfe/trunk/lib/Driver/Types.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Types.cpp?rev=168212&r1=168211&r2=168212&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Types.cpp (original)
+++ cfe/trunk/lib/Driver/Types.cpp Fri Nov 16 16:31:39 2012
@@ -113,7 +113,7 @@
     return false;
 
   case TY_CXX: case TY_PP_CXX:
-  case TY_ObjCXX: case TY_PP_ObjCXX:
+  case TY_ObjCXX: case TY_PP_ObjCXX: case TY_PP_ObjCXX_Alias:
   case TY_CXXHeader: case TY_PP_CXXHeader:
   case TY_ObjCXXHeader: case TY_PP_ObjCXXHeader:
   case TY_CUDA:

Modified: cfe/trunk/test/Driver/objc++-cpp-output.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/objc%2B%2B-cpp-output.mm?rev=168212&r1=168211&r2=168212&view=diff
==============================================================================
--- cfe/trunk/test/Driver/objc++-cpp-output.mm (original)
+++ cfe/trunk/test/Driver/objc++-cpp-output.mm Fri Nov 16 16:31:39 2012
@@ -1,4 +1,5 @@
 // RUN: %clang -x objc++-cpp-output -c %s -o /dev/null
+// RUN: %clang -x objc++-cpp-output -c %s -o /dev/null -### 2>&1 | FileCheck %s
 
 // PR13820
 // REQUIRES: LP64
@@ -9,3 +10,8 @@
 @end
 void f() {}
 class C {};
+
+// Make sure the driver is passing all the necessary exception flags.
+// CHECK: "-fobjc-exceptions"
+// CHECK: "-fcxx-exceptions"
+// CHECK: "-fexceptions"