From: Sean Callanan <scallanan@apple.com>
Date: Mon, 20 Oct 2014 18:36:58 +0000 (+0000)
Subject: Don't allow the expression parser to magically
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35e678c7e0ba85242b530047a78216c91f88d249;p=platform%2Fupstream%2Fllvm.git

Don't allow the expression parser to magically
look through 'self' at its ivars.  It produces
surprising results.

<rdar://problem/18698760>

llvm-svn: 220220
---

diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp
index aaf2d5b..13f19a1 100644
--- a/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp
@@ -1275,7 +1275,6 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
             valobj = frame->GetValueForVariableExpressionPath(name_unique_cstr,
                                                               eNoDynamicValues,
                                                               StackFrame::eExpressionPathOptionCheckPtrVsMember |
-                                                              StackFrame::eExpressionPathOptionsAllowDirectIVarAccess |
                                                               StackFrame::eExpressionPathOptionsNoFragileObjcIvar |
                                                               StackFrame::eExpressionPathOptionsNoSyntheticChildren |
                                                               StackFrame::eExpressionPathOptionsNoSyntheticArrayRange,
diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp
index 5de6862..5514846 100644
--- a/lldb/source/Expression/ClangUserExpression.cpp
+++ b/lldb/source/Expression/ClangUserExpression.cpp
@@ -620,7 +620,6 @@ GetObjectPointer (lldb::StackFrameSP frame_sp,
     valobj_sp = frame_sp->GetValueForVariableExpressionPath(object_name.AsCString(),
                                                             lldb::eNoDynamicValues,
                                                             StackFrame::eExpressionPathOptionCheckPtrVsMember |
-                                                            StackFrame::eExpressionPathOptionsAllowDirectIVarAccess |
                                                             StackFrame::eExpressionPathOptionsNoFragileObjcIvar |
                                                             StackFrame::eExpressionPathOptionsNoSyntheticChildren |
                                                             StackFrame::eExpressionPathOptionsNoSyntheticArrayRange,