Prevent pre-include of clang-upc.h if pre-processed input file is

specified.
clangupc · Apr 9, 2014 · 3364b0b · 3364b0b
1 parent 7b03b32
commit 3364b0b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -1479,7 +1479,9 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK,
   Opts.Optimize = Opt != 0;
   Opts.OptimizeSize = OptSize != 0;
 
-  if (Opts.UPC && !Args.hasArg(OPT_fno_upc_pre_include))
+  // By default enable UPC pre-include
+  if (Opts.UPC && !Args.hasArg(OPT_fno_upc_pre_include) &&
+      (IK != IK_PreprocessedUPC))
     Opts.UPCPreInclude = true;
 
   if (Opts.UPC &&