diff --git a/clang/CodeGen/CGExpr.cpp b/clang/CodeGen/CGExpr.cpp
index 4cb897fe5d12..84879bb28e9d 100644
--- a/clang/CodeGen/CGExpr.cpp
+++ b/clang/CodeGen/CGExpr.cpp
@@ -87,6 +87,7 @@ LValue CodeGenFunction::EmitLValue(const Expr *E) {
     return LValue::MakeAddr(llvm::UndefValue::get(Ty));
   }
 
+  case Expr::CallExprClass: return EmitCallExprLValue(cast<CallExpr>(E));
   case Expr::DeclRefExprClass: return EmitDeclRefLValue(cast<DeclRefExpr>(E));
   case Expr::ParenExprClass:return EmitLValue(cast<ParenExpr>(E)->getSubExpr());
   case Expr::PreDefinedExprClass:
@@ -455,6 +456,12 @@ RValue CodeGenFunction::EmitCallExpr(const CallExpr *E) {
   return EmitCallExpr(Callee, E);
 }
 
+LValue CodeGenFunction::EmitCallExprLValue(const CallExpr *E) {
+  // Can only get l-value for call expression returning aggregate type
+  RValue RV = EmitCallExpr(E);
+  return LValue::MakeAddr(RV.getAggregateAddr());
+}
+
 RValue CodeGenFunction::EmitCallExpr(llvm::Value *Callee, const CallExpr *E) {
   // The callee type will always be a pointer to function type, get the function
   // type.
diff --git a/clang/CodeGen/CodeGenFunction.h b/clang/CodeGen/CodeGenFunction.h
index 3b51d43de985..40c7414b9823 100644
--- a/clang/CodeGen/CodeGenFunction.h
+++ b/clang/CodeGen/CodeGenFunction.h
@@ -371,6 +371,9 @@ public:
   /// is 'Ty'.
   void EmitStoreThroughLValue(RValue Src, LValue Dst, QualType Ty);
   void EmitStoreThroughOCUComponentLValue(RValue Src, LValue Dst, QualType Ty);
+   
+  // Note: only availabe for agg return types
+  LValue EmitCallExprLValue(const CallExpr *E);
   
   LValue EmitDeclRefLValue(const DeclRefExpr *E);
   LValue EmitStringLiteralLValue(const StringLiteral *E);
diff --git a/clang/test/CodeGen/func-return-member.c b/clang/test/CodeGen/func-return-member.c
new file mode 100644
index 000000000000..f31a53afceeb
--- /dev/null
+++ b/clang/test/CodeGen/func-return-member.c
@@ -0,0 +1,23 @@
+// RUN: clang -emit-llvm < %s 2>&1 | not grep 'cannot codegen this l-value expression yet'
+
+struct frk { float _Complex c; int x; };
+struct faz { struct frk f; };
+struct fuz { struct faz f; };
+
+extern struct fuz foo(void);
+
+int X;
+struct frk F;
+float _Complex C;
+
+void bar(void) {
+  X = foo().f.f.x;
+}
+
+void bun(void) {
+  F = foo().f.f;
+}
+
+void ban(void) {
+  C = foo().f.f.c;
+}