summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST/ExprConstant.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-02-01 02:39:43 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-02-01 02:39:43 +0000
commit47b349328b511b407d0b9c7519bde087073edb9f (patch)
tree5ccf8ab7b76990a1ef1f24ba1d65021651242270 /clang/lib/AST/ExprConstant.cpp
parent2415586faacce72742020c4221719cb87f2081b6 (diff)
downloadbcm5719-llvm-47b349328b511b407d0b9c7519bde087073edb9f.tar.gz
bcm5719-llvm-47b349328b511b407d0b9c7519bde087073edb9f.zip
constexpr: require 'this' to point to an object in a constexpr method call.
llvm-svn: 149467
Diffstat (limited to 'clang/lib/AST/ExprConstant.cpp')
-rw-r--r--clang/lib/AST/ExprConstant.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 8897667592b..0f8de63bba1 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -127,7 +127,8 @@ namespace {
// The order of this enum is important for diagnostics.
enum CheckSubobjectKind {
- CSK_Base, CSK_Derived, CSK_Field, CSK_ArrayToPointer, CSK_ArrayIndex
+ CSK_Base, CSK_Derived, CSK_Field, CSK_ArrayToPointer, CSK_ArrayIndex,
+ CSK_This
};
/// A path from a glvalue to a subobject of that glvalue.
@@ -2362,6 +2363,9 @@ public:
} else
return Error(E);
+ if (This && !This->checkSubobject(Info, E, CSK_This))
+ return false;
+
const FunctionDecl *Definition = 0;
Stmt *Body = FD->getBody(Definition);
APValue Result;
OpenPOWER on IntegriCloud