diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index a36bcf5..8cbbca3 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -2876,8 +2876,11 @@
           << "register variable" << op->getSourceRange();
         return QualType();
       }
-    } else if (isa<OverloadedFunctionDecl>(dcl))
+    } else if (isa<OverloadedFunctionDecl>(dcl)) {
       return Context.OverloadTy;
+    } else if (isa<FieldDecl>(dcl)) {
+      // Okay: we can take the address of a field.
+    }
     else 
       assert(0 && "Unknown/unexpected decl type");
   }
diff --git a/test/SemaCXX/address-of.cpp b/test/SemaCXX/address-of.cpp
new file mode 100644
index 0000000..5451f32
--- /dev/null
+++ b/test/SemaCXX/address-of.cpp
@@ -0,0 +1,31 @@
+// RUN: clang -fsyntax-only -verify %S
+// PR clang/3175
+
+void bar(int*);
+
+class c {
+  int var;
+  static int svar;
+  void foo() { 
+    bar(&var); 
+    bar(&svar);  
+  }
+
+  static void wibble() {
+    bar(&var); // expected-error{{invalid use of member 'var' in static member function}}
+    bar(&svar); 
+  }
+};
+
+enum E {
+  Enumerator
+};
+
+void test() {
+  (void)&Enumerator; // expected-error{{address expression must be an lvalue or a function designator}}
+}
+
+template<int N>
+void test2() {
+  (void)&N; // expected-error{{address expression must be an lvalue or a function designator}}
+}