reverting this because it breaks some blocks cases, I'll send doug a testcase

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59850 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index faa7178f2547888f0817813c97ae75627d65eb31..ead873447bc50aba28858116b1a9359e1fa37694 100644 (file)
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -570,6 +570,9 @@ static void InitializeLanguageStandard(LangOptions &Options, LangKind LK,
   } else {
     Options.NeXTRuntime = Target->useNeXTRuntimeAsDefault();
   }
+
+  if (Options.CPlusPlus)
+    Options.Blocks = 0;   
 }
 
 static llvm::cl::opt<bool>