Pull code from last commit. will put back soon.

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

diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 27c2e676e650224f8c29934e7957992344dd966c..18b106ad84127fe13ed597dddfbe486d8e35a58e 100644 (file)
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -476,13 +476,6 @@ static void InitializePredefinedMacros(Preprocessor &PP,
     DefineBuiltinMacro(Buf, "__int64=long long");
     DefineBuiltinMacro(Buf, "__declspec(X)=");
   }
-  if (PP.getLangOptions().Blocks) {
-    DefineBuiltinMacro(Buf, "__byref=__attribute__((__blocks__(byref)))");
-    DefineBuiltinMacro(Buf, "__block=__attribute__((__blocks__(byref)))");
-  } else {
-    DefineBuiltinMacro(Buf, "__byref=");
-    DefineBuiltinMacro(Buf, "__block=");
-  }
   // FIXME: Should emit a #line directive here.
 }
 

diff --git a/test/Parser/block-block-storageclass.c b/test/Parser/block-block-storageclass.c
index c15d731ec8cc372099ac800f97a7627974f706b2..c9be12f1f077aa8bb50a982758ffb8f00ca7f1d0 100644 (file)
--- a/test/Parser/block-block-storageclass.c
+++ b/test/Parser/block-block-storageclass.c
@@ -1,5 +1,5 @@
 // RUN: clang -fsyntax-only -verify -parse-noop %s
-
+#if 0
 #include <stdio.h>
 void _Block_byref_release(void*src){}
 
@@ -16,3 +16,4 @@ int main() {
 
    return X;
 }
+#endif