Author: epilk Date: Tue Apr 2 12:48:07 2019 New Revision: 357515 URL: http://llvm.org/viewvc/llvm-project?rev=357515&view=rev Log: [CodeGen] Fix a regression by emitting lambda expressions in EmitLValue
This ability was removed in r351487, but it's needed when a lambda appears as an OpaqueValueExpr subexpression of a PseudoObjectExpr. rdar://49030379 Differential revision: https://reviews.llvm.org/D60099 Added: cfe/trunk/test/CodeGenObjCXX/property-lvalue-lambda.mm Modified: cfe/trunk/lib/CodeGen/CGExpr.cpp Modified: cfe/trunk/lib/CodeGen/CGExpr.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExpr.cpp?rev=357515&r1=357514&r2=357515&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGExpr.cpp (original) +++ cfe/trunk/lib/CodeGen/CGExpr.cpp Tue Apr 2 12:48:07 2019 @@ -1294,6 +1294,8 @@ LValue CodeGenFunction::EmitLValue(const return EmitCXXBindTemporaryLValue(cast<CXXBindTemporaryExpr>(E)); case Expr::CXXUuidofExprClass: return EmitCXXUuidofLValue(cast<CXXUuidofExpr>(E)); + case Expr::LambdaExprClass: + return EmitAggExprToLValue(E); case Expr::ExprWithCleanupsClass: { const auto *cleanups = cast<ExprWithCleanups>(E); Added: cfe/trunk/test/CodeGenObjCXX/property-lvalue-lambda.mm URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/property-lvalue-lambda.mm?rev=357515&view=auto ============================================================================== --- cfe/trunk/test/CodeGenObjCXX/property-lvalue-lambda.mm (added) +++ cfe/trunk/test/CodeGenObjCXX/property-lvalue-lambda.mm Tue Apr 2 12:48:07 2019 @@ -0,0 +1,47 @@ +// RUN: %clang_cc1 -fblocks -disable-llvm-passes -triple x86_64-apple-darwin10 -std=c++17 -emit-llvm -o - %s | FileCheck %s + +typedef void (^blk_t)(); +typedef void (*fnptr_t)(); + +@interface X +@property blk_t blk; +@property fnptr_t fnptr; +@end + +template <class T> +blk_t operator+(blk_t lhs, T) { return lhs; } + +template <class T> +fnptr_t operator+(fnptr_t lhs, T) { return lhs; } + +// CHECK-LABEL: define void @_Z2t1P1X +void t1(X *x) { + // Check that we call lambda.operator blk_t(), and that we send that result to + // the setter. + + // CHECK: [[CALL:%.*]] = call void ()* @"_ZZ2t1P1XENK3$_0cvU13block_pointerFvvEEv" + // CHECK: call void{{.*}}@objc_msgSend{{.*}}({{.*}} void ()* [[CALL]]) + x.blk = [] {}; + + // CHECK: [[CALL2:%.*]] = call void ()* @"_ZZ2t1P1XENK3$_1cvPFvvEEv" + // CHECK: call void{{.*}}@objc_msgSend{{.*}}({{.*}} void ()* [[CALL2]]) + x.fnptr = [] {}; +} + +// CHECK-LABEL: define void @_Z2t2P1X +void t2(X *x) { + // Test the case when the lambda isn't unique. (see OpaqueValueExpr::isUnique) + // FIXME: This asserts if the lambda isn't trivially copy/movable. + + // [x setBlk: operator+([x blk], [] {})] + + // CHECK: call void{{.*}}@objc_msgSend{{.*}} + // CHECK: [[PLUS:%.*]] = call void ()* @"_ZplIZ2t2P1XE3$_2EU13block_pointerFvvES4_T_" + // CHECK: call void{{.*}}@objc_msgSend{{.*}}({{.*}} [[PLUS]]) + x.blk += [] {}; + + // CHECK: call void{{.*}}@objc_msgSend{{.*}} + // CHECK: [[PLUS:%.*]] = call void ()* @"_ZplIZ2t2P1XE3$_3EPFvvES4_T_" + // CHECK: call void{{.*}}@objc_msgSend{{.*}}({{.*}} [[PLUS]]) + x.fnptr += [] {}; +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits