forked from OSchip/llvm-project
modern objective-c translator: Fixes translation of
__typeof which is a regression by reverting r154360. // rdar://11233924 llvm-svn: 154679
This commit is contained in:
parent
6d3f11142d
commit
3a5d552cd7
|
@ -5357,10 +5357,13 @@ Stmt *RewriteModernObjC::RewriteFunctionBodyOrGlobalInitializer(Stmt *S) {
|
|||
if (CStyleCastExpr *CE = dyn_cast<CStyleCastExpr>(S)) {
|
||||
RewriteCastExpr(CE);
|
||||
}
|
||||
#if 0
|
||||
// FIXME. Cannot safely rewrite ImplicitCasts. This is the 2nd failed
|
||||
// attempt: (id)((__typeof(z))_Block_copy((const void *)(z)));
|
||||
if (ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(S)) {
|
||||
RewriteImplicitCastObjCExpr(ICE);
|
||||
}
|
||||
#if 0
|
||||
|
||||
if (ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(S)) {
|
||||
CastExpr *Replacement = new (Context) CastExpr(ICE->getType(),
|
||||
ICE->getSubExpr(),
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
|
||||
// RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
|
||||
// rdar://11202764
|
||||
// XFAIL: *
|
||||
|
||||
typedef void(^BL)(void);
|
||||
|
||||
|
|
|
@ -0,0 +1,46 @@
|
|||
// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
|
||||
// RUN: FileCheck -check-prefix LP --input-file=%t-rw.cpp %s
|
||||
// RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -Wno-attributes -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
|
||||
|
||||
extern "C" {
|
||||
extern "C" void *_Block_copy(const void *aBlock);
|
||||
extern "C" void _Block_release(const void *aBlock);
|
||||
}
|
||||
|
||||
int main() {
|
||||
__attribute__((__blocks__(byref))) int a = 42;
|
||||
int save_a = a;
|
||||
|
||||
void (^b)(void) = ^{
|
||||
((__typeof(^{ a = 2; }))_Block_copy((const void *)(^{ a = 2; })));
|
||||
};
|
||||
|
||||
((__typeof(b))_Block_copy((const void *)(b)));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// CHECK-LP: ((void (^)(void))_Block_copy((const void *)(b)))
|
||||
|
||||
// radar 7628153
|
||||
void f() {
|
||||
int a;
|
||||
__typeof__(a) aVal = a;
|
||||
char *a1t = (char *)@encode(__typeof__(a));
|
||||
__typeof__(aVal) bVal;
|
||||
char *a2t = (char *)@encode(__typeof__(bVal));
|
||||
__typeof__(bVal) cVal = bVal;
|
||||
char *a3t = (char *)@encode(__typeof__(cVal));
|
||||
|
||||
}
|
||||
|
||||
// rdar://11239324
|
||||
void x() {
|
||||
id y;
|
||||
void (^z)() = ^{ };
|
||||
y = (id)((__typeof(z))_Block_copy((const void *)(z)));
|
||||
}
|
||||
|
||||
// CHECK-LP: int aVal = a;
|
||||
|
||||
// CHECK-LP: int bVal;
|
Loading…
Reference in New Issue