aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/CodeGen/CGExprComplex.cpp3
-rw-r--r--lib/CodeGen/CGExprScalar.cpp3
-rw-r--r--test/CodeGenCXX/references.cpp3
3 files changed, 9 insertions, 0 deletions
diff --git a/lib/CodeGen/CGExprComplex.cpp b/lib/CodeGen/CGExprComplex.cpp
index 3e28490f6f..618e446bf1 100644
--- a/lib/CodeGen/CGExprComplex.cpp
+++ b/lib/CodeGen/CGExprComplex.cpp
@@ -255,6 +255,9 @@ VisitImaginaryLiteral(const ImaginaryLiteral *IL) {
ComplexPairTy ComplexExprEmitter::VisitCallExpr(const CallExpr *E) {
+ if (E->getCallReturnType()->isReferenceType())
+ return EmitLoadOfLValue(E);
+
return CGF.EmitCallExpr(E).getComplexVal();
}
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 8cd84ecdb4..e14d40c3b6 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -223,6 +223,9 @@ public:
Value *EmitCastExpr(const Expr *E, QualType T);
Value *VisitCallExpr(const CallExpr *E) {
+ if (E->getCallReturnType()->isReferenceType())
+ return EmitLoadOfLValue(E);
+
return CGF.EmitCallExpr(E).getScalarVal();
}
diff --git a/test/CodeGenCXX/references.cpp b/test/CodeGenCXX/references.cpp
index aee395251e..e5db446fae 100644
--- a/test/CodeGenCXX/references.cpp
+++ b/test/CodeGenCXX/references.cpp
@@ -38,6 +38,7 @@ void test_bool() {
f(true);
bool_reference_return() = true;
+ a = bool_reference_return();
}
void test_scalar() {
@@ -53,6 +54,7 @@ void test_scalar() {
f((vec4){1,2,3,4}[0]);
int_reference_return() = 10;
+ a = int_reference_return();
}
void test_complex() {
@@ -62,6 +64,7 @@ void test_complex() {
f(10i);
complex_int_reference_return() = 10i;
+ a = complex_int_reference_return();
}
void test_aggregate() {