Add Sema support for C++ classes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@52956 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 32d7a60..71f7717 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -14,6 +14,7 @@
#include "Sema.h"
#include "SemaUtil.h"
#include "clang/AST/ASTContext.h"
+#include "clang/AST/DeclCXX.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ExprCXX.h"
#include "clang/AST/ExprObjC.h"
@@ -130,6 +131,29 @@
return true;
return new DeclRefExpr(VD, VD->getType(), Loc);
}
+
+ if (CXXFieldDecl *FD = dyn_cast<CXXFieldDecl>(D)) {
+ if (CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(CurContext)) {
+ if (MD->isStatic())
+ // "invalid use of member 'x' in static member function"
+ return Diag(Loc, diag::err_invalid_member_use_in_static_method,
+ FD->getName());
+ if (cast<CXXRecordDecl>(MD->getParent()) != FD->getParent())
+ // "invalid use of nonstatic data member 'x'"
+ return Diag(Loc, diag::err_invalid_non_static_member_use,
+ FD->getName());
+
+ if (FD->isInvalidDecl())
+ return true;
+
+ // FIXME: Use DeclRefExpr or a new Expr for a direct CXXField reference.
+ ExprResult ThisExpr = ActOnCXXThis(SourceLocation());
+ return new MemberExpr(static_cast<Expr*>(ThisExpr.Val),
+ true, FD, Loc, FD->getType());
+ }
+
+ return Diag(Loc, diag::err_invalid_non_static_member_use, FD->getName());
+ }
if (isa<TypedefDecl>(D))
return Diag(Loc, diag::err_unexpected_typedef, II.getName());