diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-08-11 17:37:35 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-08-11 17:37:35 +0000 |
| commit | faa3449a0f8b61ff25bd6aba78c50cabab213c24 (patch) | |
| tree | 2642f0be60bb15f3696c09f3029d7eb6d411c571 | |
| parent | e1e13bf568a7e37c95eda6fcfa626659a06e67b1 (diff) | |
IRGen support for functions returning objc object
types. Fixes PR7865.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@110832 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CodeGenFunction.cpp | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaStmt.cpp | 9 | ||||
| -rw-r--r-- | test/CodeGenObjC/return-objc-object.mm | 19 | ||||
| -rw-r--r-- | test/SemaObjC/deref-interface.m | 1 |
4 files changed, 21 insertions, 10 deletions
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp index f883bec4ff..58d56ef0df 100644 --- a/lib/CodeGen/CodeGenFunction.cpp +++ b/lib/CodeGen/CodeGenFunction.cpp @@ -77,7 +77,7 @@ const llvm::Type *CodeGenFunction::ConvertType(QualType T) { bool CodeGenFunction::hasAggregateLLVMType(QualType T) { return T->isRecordType() || T->isArrayType() || T->isAnyComplexType() || - T->isMemberFunctionPointerType(); + T->isMemberFunctionPointerType() || T->isObjCObjectType(); } void CodeGenFunction::EmitReturnBlock() { diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index c3adb6c801..3690eeef53 100644 --- a/lib/Sema/SemaStmt.cpp +++ b/lib/Sema/SemaStmt.cpp @@ -30,15 +30,6 @@ using namespace clang; Sema::OwningStmtResult Sema::ActOnExprStmt(FullExprArg expr) { Expr *E = expr->takeAs<Expr>(); assert(E && "ActOnExprStmt(): missing expression"); - if (E->getType()->isObjCObjectType()) { - if (LangOpts.ObjCNonFragileABI) - Diag(E->getLocEnd(), diag::err_indirection_requires_nonfragile_object) - << E->getType(); - else - Diag(E->getLocEnd(), diag::err_direct_interface_unsupported) - << E->getType(); - return StmtError(); - } // C99 6.8.3p2: The expression in an expression statement is evaluated as a // void expression for its side effects. Conversion to void allows any // operand, even incomplete types. diff --git a/test/CodeGenObjC/return-objc-object.mm b/test/CodeGenObjC/return-objc-object.mm new file mode 100644 index 0000000000..95cce23a86 --- /dev/null +++ b/test/CodeGenObjC/return-objc-object.mm @@ -0,0 +1,19 @@ +// RUN: %clang_cc1 -triple x86_64 -emit-llvm -o - %s | FileCheck %s + +@protocol P1 @end +@interface NSOperationQueue +{ + char ch[64]; + double d; +} +@end + +NSOperationQueue &f(); +NSOperationQueue<P1> &f1(); + +void call_once() { + f(); + f1(); +} +// CHECK: call %0* @_Z1fv() +// CHECK: call %0* @_Z2f1v() diff --git a/test/SemaObjC/deref-interface.m b/test/SemaObjC/deref-interface.m index c7096bd59a..642350b138 100644 --- a/test/SemaObjC/deref-interface.m +++ b/test/SemaObjC/deref-interface.m @@ -1,4 +1,5 @@ // RUN: %clang_cc1 -fobjc-nonfragile-abi -verify -fsyntax-only %s +// XFAIL: * @interface NSView - (id)initWithView:(id)realView; |