r209059 - [objcmt] Don't wrap a PCH generation action with a ObjCMigrateAction one, it messes up the PCH file.

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Fri May 16 23:35:12 2014
New Revision: 209059

URL: http://llvm.org/viewvc/llvm-project?rev=209059&view=rev
Log:
[objcmt] Don't wrap a PCH generation action with a ObjCMigrateAction one, it messes up the PCH file.

rdar://16941811

Added:
    cfe/trunk/test/ARCMT/migrate-on-pch-and-module.m
Modified:
    cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp

Modified: cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp?rev=209059&r1=209058&r2=209059&view=diff
==============================================================================
--- cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp (original)
+++ cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp Fri May 16 23:35:12 2014
@@ -144,7 +144,8 @@ static FrontendAction *CreateFrontendAct
 #endif
   
 #ifdef CLANG_ENABLE_ARCMT
-  if (CI.getFrontendOpts().ProgramAction != frontend::MigrateSource) {
+  if (CI.getFrontendOpts().ProgramAction != frontend::MigrateSource &&
+      CI.getFrontendOpts().ProgramAction != frontend::GeneratePCH) {
     // Potentially wrap the base FE action in an ARC Migrate Tool action.
     switch (FEOpts.ARCMTAction) {
     case FrontendOptions::ARCMT_None:

Added: cfe/trunk/test/ARCMT/migrate-on-pch-and-module.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/migrate-on-pch-and-module.m?rev=209059&view=auto
==============================================================================
--- cfe/trunk/test/ARCMT/migrate-on-pch-and-module.m (added)
+++ cfe/trunk/test/ARCMT/migrate-on-pch-and-module.m Fri May 16 23:35:12 2014
@@ -0,0 +1,12 @@
+// RUN: rm -rf %t-mcp
+// RUN: %clang_cc1 -objcmt-migrate-subscripting -emit-pch -o %t.pch %s -isysroot %S/../Modules/Inputs/System -triple x86_64-apple-darwin10 -F %S/../Modules/Inputs -fmodules -fmodules-cache-path=%t-mcp -w
+// RUN: %clang_cc1 -objcmt-migrate-subscripting -include-pch %t.pch %s -migrate -o %t.remap -isysroot %S/../Modules/Inputs/System -triple x86_64-apple-darwin10 -F %S/../Modules/Inputs -fmodules -fmodules-cache-path=%t-mcp
+
+#ifndef HEADER
+#define HEADER
+
+ at import Module;
+
+#else
+
+#endif