diff options
| -rw-r--r-- | lib/CodeGen/CGCall.cpp | 4 | ||||
| -rw-r--r-- | lib/CodeGen/CGExpr.cpp | 3 | ||||
| -rw-r--r-- | test/CodeGenObjCXX/arc-references.mm | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index 102793b48a..f7cb5492a8 100644 --- a/lib/CodeGen/CGCall.cpp +++ b/lib/CodeGen/CGCall.cpp @@ -1434,9 +1434,11 @@ void CodeGenFunction::EmitCallArg(CallArgList &args, const Expr *E, assert(type->isReferenceType() == E->isGLValue() && "reference binding to unmaterialized r-value!"); - if (type->isReferenceType()) + if (E->isGLValue()) { + assert(E->getObjectKind() == OK_Ordinary); return args.add(EmitReferenceBindingToExpr(E, /*InitializedDecl=*/0), type); + } if (hasAggregateLLVMType(type) && !E->getType()->isAnyComplexType() && isa<ImplicitCastExpr>(E) && diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index 59b8fefb49..d26d787da6 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -2150,8 +2150,7 @@ LValue CodeGenFunction::EmitOpaqueValueLValue(const OpaqueValueExpr *e) { LValue CodeGenFunction::EmitMaterializeTemporaryExpr( const MaterializeTemporaryExpr *E) { - RValue RV = EmitReferenceBindingToExpr(E->GetTemporaryExpr(), - /*InitializedDecl=*/0); + RValue RV = EmitReferenceBindingToExpr(E, /*InitializedDecl=*/0); return MakeAddrLValue(RV.getScalarVal(), E->getType()); } diff --git a/test/CodeGenObjCXX/arc-references.mm b/test/CodeGenObjCXX/arc-references.mm index 3d0313d13a..b1a12e4511 100644 --- a/test/CodeGenObjCXX/arc-references.mm +++ b/test/CodeGenObjCXX/arc-references.mm @@ -61,8 +61,9 @@ void sink(__strong A* &&); // CHECK: define void @_Z5test5RU8__strongP11objc_object void test5(__strong id &x) { - // CHECK: [[OBJ_ID:%[a-zA-Z0-9]+]] = call i8* @objc_retain - // CHECK-NEXT: [[OBJ_A:%[a-zA-Z0-9]+]] = bitcast i8* [[OBJ_ID]] to [[A:%[a-zA-Z0-9]+]]* + // CHECK: [[REFTMP:%.*]] = alloca {{%.*}}*, align 8 + // CHECK: [[OBJ_ID:%.*]] = call i8* @objc_retain( + // CHECK-NEXT: [[OBJ_A:%.*]] = bitcast i8* [[OBJ_ID]] to [[A:%[a-zA-Z0-9]+]]* // CHECK-NEXT: store [[A]]* [[OBJ_A]], [[A]]** [[REFTMP:%[a-zA-Z0-9]+]] // CHECK-NEXT: call void @_Z4sinkOU8__strongP1A sink(x); |