[cfe-commits] r60849 - in /cfe/trunk: lib/Sema/SemaExpr.cpp test/SemaCXX/address-of.cpp

[Douglas Gregor]

Author: dgregor
Date: Wed Dec 10 15:26:49 2008
New Revision: 60849

URL: http://llvm.org/viewvc/llvm-project?rev=60849&view=rev
Log:
Fix PR clang/3175: CheckAddressOfOperand does not handle references to class vars

Added:
    cfe/trunk/test/SemaCXX/address-of.cpp
Modified:
    cfe/trunk/lib/Sema/SemaExpr.cpp

Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=60849&r1=60848&r2=60849&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Wed Dec 10 15:26:49 2008
@@ -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");
   }

Added: cfe/trunk/test/SemaCXX/address-of.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/address-of.cpp?rev=60849&view=auto

==============================================================================
--- cfe/trunk/test/SemaCXX/address-of.cpp (added)
+++ cfe/trunk/test/SemaCXX/address-of.cpp Wed Dec 10 15:26:49 2008
@@ -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}}
+}