diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp
index fce4f111a99e..84adc5fdcff1 100644
--- a/clang/lib/CodeGen/CGExprScalar.cpp
+++ b/clang/lib/CodeGen/CGExprScalar.cpp
@@ -167,7 +167,14 @@ public:
 
   Value *VisitArraySubscriptExpr(ArraySubscriptExpr *E);
   Value *VisitShuffleVectorExpr(ShuffleVectorExpr *E);
-  Value *VisitMemberExpr(Expr *E)           { return EmitLoadOfLValue(E); }
+  Value *VisitMemberExpr(MemberExpr *E) { 
+    if (const EnumConstantDecl *EC = 
+          dyn_cast<EnumConstantDecl>(E->getMemberDecl()))
+      return llvm::ConstantInt::get(VMContext, EC->getInitVal());
+
+    return EmitLoadOfLValue(E);
+  }
+    
   Value *VisitExtVectorElementExpr(Expr *E) { return EmitLoadOfLValue(E); }
   Value *VisitCompoundLiteralExpr(CompoundLiteralExpr *E) {
     return EmitLoadOfLValue(E);
diff --git a/clang/test/CodeGenCXX/member-expressions.cpp b/clang/test/CodeGenCXX/member-expressions.cpp
index f90b80733905..223bab55e64a 100644
--- a/clang/test/CodeGenCXX/member-expressions.cpp
+++ b/clang/test/CodeGenCXX/member-expressions.cpp
@@ -17,3 +17,11 @@ void f()
 }
 
 }
+
+struct A {
+  enum E { Foo };
+};
+
+void f(A *a) {
+  A::E e = a->Foo;
+}