[Lldb-commits] [lldb] r162122 - in /lldb/branches/apple/python-GIL: source/Commands/CommandObjectCommands.cpp source/Expression/ClangExpressionDeclMap.cpp tools/debugserver/scripts/diagnose-termination.d

[Johnny Chen]

Author: johnny
Date: Fri Aug 17 15:02:44 2012
New Revision: 162122

URL: http://llvm.org/viewvc/llvm-project?rev=162122&view=rev
Log:
Merge changes from ToT trunk.

Added:
    lldb/branches/apple/python-GIL/tools/debugserver/scripts/diagnose-termination.d
      - copied unchanged from r162121, lldb/trunk/tools/debugserver/scripts/diagnose-termination.d
Modified:
    lldb/branches/apple/python-GIL/source/Commands/CommandObjectCommands.cpp
    lldb/branches/apple/python-GIL/source/Expression/ClangExpressionDeclMap.cpp

Modified: lldb/branches/apple/python-GIL/source/Commands/CommandObjectCommands.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/apple/python-GIL/source/Commands/CommandObjectCommands.cpp?rev=162122&r1=162121&r2=162122&view=diff
==============================================================================
--- lldb/branches/apple/python-GIL/source/Commands/CommandObjectCommands.cpp (original)
+++ lldb/branches/apple/python-GIL/source/Commands/CommandObjectCommands.cpp Fri Aug 17 15:02:44 2012
@@ -792,10 +792,12 @@
 "\n"
 "EXAMPLES\n"
 "\n"
-"The following example with define a regular expression command named 'f' that\n"
+"The following example will define a regular expression command named 'f' that\n"
 "will call 'finish' if there are no arguments, or 'frame select <frame-idx>' if\n"
 "a number follows 'f':\n"
-"(lldb) command regex f s/^$/finish/ 's/([0-9]+)/frame select %1/'\n"
+"\n"
+"    (lldb) command regex f s/^$/finish/ 's/([0-9]+)/frame select %1/'\n"
+"\n"
                     );
     }
     

Modified: lldb/branches/apple/python-GIL/source/Expression/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/apple/python-GIL/source/Expression/ClangExpressionDeclMap.cpp?rev=162122&r1=162121&r2=162122&view=diff
==============================================================================
--- lldb/branches/apple/python-GIL/source/Expression/ClangExpressionDeclMap.cpp (original)
+++ lldb/branches/apple/python-GIL/source/Expression/ClangExpressionDeclMap.cpp Fri Aug 17 15:02:44 2012
@@ -1501,6 +1501,12 @@
         
         if (m_found_entities.ContainsVariable (member_sp))
         {
+            if (!member_sp->GetValueObject())
+            {
+                err.SetErrorString("Variable being materialized doesn't have a frozen version");
+                return false;
+            }
+            
             RegisterInfo *reg_info = member_sp->GetRegisterInfo ();
             if (reg_info)
             {