commit 18e3fd3ad671d039e45fb47bfd65b39f5e46d2c0
author Yaxun Liu <Yaxun.Liu@amd.com> Tue Jun 14 21:43:01 2016 +0000
committer Yaxun Liu <Yaxun.Liu@amd.com> Tue Jun 14 21:43:01 2016 +0000
tree caa9800168a070fc9dbf30462ca7586eb2164aff
parent 07543a8c2d036d39383c7d1d6a73c9bfea78d2af

[OpenCL] Enable -fblocks by default for OpenCL 2.0 and above.

Reviewed as part of http://reviews.llvm.org/D20444

llvm-svn: 272720

clang/lib/Frontend/CompilerInvocation.cpp

diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index b217db9..581dd81 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -1827,7 +1827,8 @@
 
   Opts.RTTI = Opts.CPlusPlus && !Args.hasArg(OPT_fno_rtti);
   Opts.RTTIData = Opts.RTTI && !Args.hasArg(OPT_fno_rtti_data);
-  Opts.Blocks = Args.hasArg(OPT_fblocks);
+  Opts.Blocks = Args.hasArg(OPT_fblocks) || (Opts.OpenCL
+    && Opts.OpenCLVersion >= 200);
   Opts.BlocksRuntimeOptional = Args.hasArg(OPT_fblocks_runtime_optional);
   Opts.Coroutines = Args.hasArg(OPT_fcoroutines);
   Opts.Modules = Args.hasArg(OPT_fmodules);