[llvm-branch-commits] [lldb] r182520 - Merging r182326:

[Bill Wendling]

Author: void
Date: Wed May 22 16:24:10 2013
New Revision: 182520

URL: http://llvm.org/viewvc/llvm-project?rev=182520&view=rev
Log:
Merging r182326:
------------------------------------------------------------------------
r182326 | enrico | 2013-05-20 15:49:13 -0700 (Mon, 20 May 2013) | 3 lines

<rdar://problem/13925626>

Replacing an assertion with an error - at least we won’t crash
------------------------------------------------------------------------

Modified:
    lldb/branches/release_33/   (props changed)
    lldb/branches/release_33/source/Core/ValueObjectVariable.cpp

Propchange: lldb/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 22 16:24:10 2013
@@ -1,2 +1,2 @@
 /lldb/branches/apple/python-GIL:156467-162159
-/lldb/trunk:182066,182153,182166,182301
+/lldb/trunk:182066,182153,182166,182301,182326

Modified: lldb/branches/release_33/source/Core/ValueObjectVariable.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_33/source/Core/ValueObjectVariable.cpp?rev=182520&r1=182519&r2=182520&view=diff
==============================================================================
--- lldb/branches/release_33/source/Core/ValueObjectVariable.cpp (original)
+++ lldb/branches/release_33/source/Core/ValueObjectVariable.cpp Wed May 22 16:24:10 2013
@@ -187,7 +187,7 @@ ValueObjectVariable::UpdateValue ()
             switch (value_type)
             {
             default:
-                assert(!"Unhandled expression result value kind...");
+                m_error.SetErrorStringWithFormat("Variable %s has an expression result value %d which is currently unhandled",variable->GetName().GetCString(),value_type);
                 break;
 
             case Value::eValueTypeScalar: