[llvm-branch-commits] [cfe-branch] r155934 - in /cfe/branches/release_31: ./ test/Rewriter/rewrite-modern-extern-c-func-decl.mm test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Tue May  1 15:21:01 2012
New Revision: 155934

URL: http://llvm.org/viewvc/llvm-project?rev=155934&view=rev
Log:
Merging r155278:
------------------------------------------------------------------------
r155278 | chapuni | 2012-04-21 02:39:58 -0700 (Sat, 21 Apr 2012) | 3 lines

clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm: Mark as XFAIL:mingw for now, due to predefined __declspec.

It could be tweaked to add -triple i686-win32, though.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_31/   (props changed)
    cfe/branches/release_31/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
    cfe/branches/release_31/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May  1 15:21:01 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:155076,155279,155342,155534-155535,155576,155670,155728
+/cfe/trunk:155076,155278-155279,155342,155534-155535,155576,155670,155728
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_31/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_31/test/Rewriter/rewrite-modern-extern-c-func-decl.mm?rev=155934&r1=155933&r2=155934&view=diff
==============================================================================
--- cfe/branches/release_31/test/Rewriter/rewrite-modern-extern-c-func-decl.mm (original)
+++ cfe/branches/release_31/test/Rewriter/rewrite-modern-extern-c-func-decl.mm Tue May  1 15:21:01 2012
@@ -2,6 +2,9 @@
 // RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-attributes -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 // rdar://11131490
 
+// XFAIL: mingw
+// FIXME: __declspec(X) is predefined on mingw.
+
 extern "C" __declspec(dllexport) void BreakTheRewriter(void) {
         __block int aBlockVariable = 0;
         void (^aBlock)(void) = ^ {

Propchange: cfe/branches/release_31/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May  1 15:21:01 2012
@@ -1,2 +1,2 @@
 /cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,155076,155279,155342,155534-155535,155576,155670,155728
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,155076,155278-155279,155342,155534-155535,155576,155670,155728