commit 31310a21fb2a9f13950f864f681c86080b05d5b2
author Sebastian Redl <sebastian.redl@getdesigned.at> Mon Feb 01 20:16:42 2010 +0000
committer Sebastian Redl <sebastian.redl@getdesigned.at> Mon Feb 01 20:16:42 2010 +0000
tree 38d3c90c066260cc56b899305d21f9c702b3e74f
parent 21b91a35fb95d7a8b5bdc8634ff8f2231e4d0a1c

In C++, an initializer on a variable doesn't necessarily mean it's the definition. With that in mind, rename getDefinition to getAnyInitializer (to distinguish it from getInit) and reimplement it in terms of isThisDeclarationADefinition. Update all code to use this new function.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@94999 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/ExprConstant.cpp

diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index d64e6f1..a0b2aa9 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -263,8 +263,7 @@
     if (!VD->getType()->isReferenceType())
       return APValue(E);
     // FIXME: Check whether VD might be overridden!
-    const VarDecl *Def = 0;
-    if (const Expr *Init = VD->getDefinition(Def))
+    if (const Expr *Init = VD->getAnyInitializer())
       return Visit(const_cast<Expr *>(Init));
   }
 
@@ -880,8 +879,7 @@
   if (Info.Ctx.getCanonicalType(E->getType()).getCVRQualifiers() 
                                                         == Qualifiers::Const) {
     if (const VarDecl *VD = dyn_cast<VarDecl>(D)) {
-      const VarDecl *Def = 0;
-      if (const Expr *Init = VD->getDefinition(Def)) {
+      if (const Expr *Init = VD->getAnyInitializer()) {
         if (APValue *V = VD->getEvaluatedValue()) {
           if (V->isInt())
             return Success(V->getInt(), E);