Make isWeakDecl available as a method on ValueDecl.
llvm-svn: 145845
diff --git a/clang/include/clang/AST/Decl.h b/clang/include/clang/AST/Decl.h
index 28a01cf..c8120eb 100644
--- a/clang/include/clang/AST/Decl.h
+++ b/clang/include/clang/AST/Decl.h
@@ -508,6 +508,12 @@
QualType getType() const { return DeclType; }
void setType(QualType newType) { DeclType = newType; }
+ /// \brief Determine whether this symbol is weakly-imported,
+ /// or declared with the weak or weak-ref attr.
+ bool isWeak() const {
+ return hasAttr<WeakAttr>() || hasAttr<WeakRefAttr>() || isWeakImported();
+ }
+
// Implement isa/cast/dyncast/etc.
static bool classof(const Decl *D) { return classofKind(D->getKind()); }
static bool classof(const ValueDecl *D) { return true; }
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 81fe7e3..438bef5 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -580,15 +580,9 @@
return Value.Base.dyn_cast<const Expr*>() && !Value.Frame;
}
-static bool IsWeakDecl(const ValueDecl *Decl) {
- return Decl->hasAttr<WeakAttr>() ||
- Decl->hasAttr<WeakRefAttr>() ||
- Decl->isWeakImported();
-}
-
static bool IsWeakLValue(const LValue &Value) {
const ValueDecl *Decl = GetLValueBaseDecl(Value);
- return Decl && IsWeakDecl(Decl);
+ return Decl && Decl->isWeak();
}
static bool EvalPointerValueAsBool(const CCValue &Value, bool &Result) {
@@ -607,7 +601,7 @@
// a weak declaration it can be null at runtime.
Result = true;
const ValueDecl *Decl = Value.getLValueBase().dyn_cast<const ValueDecl*>();
- return !Decl || !IsWeakDecl(Decl);
+ return !Decl || !Decl->isWeak();
}
static bool HandleConversionToBool(const CCValue &Val, bool &Result) {
@@ -866,7 +860,7 @@
// Never evaluate the initializer of a weak variable. We can't be sure that
// this is the definition which will be used.
- if (IsWeakDecl(VD))
+ if (VD->isWeak())
return false;
const Expr *Init = VD->getAnyInitializer();
