2 files changed, 21 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index 84adc5fdcff..8bb02f9668c 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -169,9 +169,16 @@ public:
   Value *VisitShuffleVectorExpr(ShuffleVectorExpr *E);
   Value *VisitMemberExpr(MemberExpr *E) { 
     if (const EnumConstantDecl *EC = 
-          dyn_cast<EnumConstantDecl>(E->getMemberDecl()))
+          dyn_cast<EnumConstantDecl>(E->getMemberDecl())) {
+      
+      // We still need to emit the base.
+      if (E->isArrow())
+        CGF.EmitScalarExpr(E->getBase());
+      else
+        CGF.EmitLValue(E->getBase());
       return llvm::ConstantInt::get(VMContext, EC->getInitVal());
-
+    }
+    
     return EmitLoadOfLValue(E);
   }
     
diff --git a/clang/test/CodeGenCXX/member-expressions.cpp b/clang/test/CodeGenCXX/member-expressions.cpp
index 223bab55e64..76b81e06882 100644
--- a/clang/test/CodeGenCXX/member-expressions.cpp
+++ b/clang/test/CodeGenCXX/member-expressions.cpp
@@ -19,9 +19,20 @@ void f()
 }
 
 struct A {
+  A();
+  ~A();
   enum E { Foo };
 };
 
+A *g();
+
 void f(A *a) {
-  A::E e = a->Foo;
+  A::E e1 = a->Foo;
+  
+  // CHECK: call %struct.A* @_Z1gv()
+  A::E e2 = g()->Foo;
+  // CHECK: call void @_ZN1AC1Ev(
+  // CHECK: call void @_ZN1AD1Ev(
+  A::E e3 = A().Foo;
 }
+