[Lldb-commits] [lldb] r155451 - in /lldb/branches/lldb-platform-work: ./ include/lldb/Core/ source/Core/ source/Interpreter/ source/Plugins/ObjectFile/Mach-O/ source/Plugins/SymbolFile/DWARF/ source/Symbol/ test/expression_command/call-function/ test/expression_command/formatters/ test/functionalities/data-formatter/data-formatter-stl/libcxx/list/ test/functionalities/data-formatter/data-formatter-stl/libcxx/map/ test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/ test/functionalities/data-formatter/d...
Johnny Chen
johnny.chen at apple.com
Tue Apr 24 10:39:56 PDT 2012
Author: johnny
Date: Tue Apr 24 12:39:56 2012
New Revision: 155451
URL: http://llvm.org/viewvc/llvm-project?rev=155451&view=rev
Log:
Merge changes from ToT:
svn merge -r 155398:155423 https://johnny@llvm.org/svn/llvm-project/lldb/trunk .
Modified:
lldb/branches/lldb-platform-work/ (props changed)
lldb/branches/lldb-platform-work/include/lldb/Core/Module.h
lldb/branches/lldb-platform-work/source/Core/Module.cpp
lldb/branches/lldb-platform-work/source/Core/Value.cpp
lldb/branches/lldb-platform-work/source/Interpreter/CommandInterpreter.cpp
lldb/branches/lldb-platform-work/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
lldb/branches/lldb-platform-work/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
lldb/branches/lldb-platform-work/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
lldb/branches/lldb-platform-work/source/Symbol/CompileUnit.cpp
lldb/branches/lldb-platform-work/test/expression_command/call-function/TestCallStdStringFunction.py
lldb/branches/lldb-platform-work/test/expression_command/formatters/TestFormatters.py
lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
lldb/branches/lldb-platform-work/test/python_api/formatters/TestFormattersSBAPI.py
lldb/branches/lldb-platform-work/test/python_api/formatters/main.cpp
Propchange: lldb/branches/lldb-platform-work/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 24 12:39:56 2012
@@ -1 +1 @@
-/lldb/trunk:154224-155398
+/lldb/trunk:154224-155423
Modified: lldb/branches/lldb-platform-work/include/lldb/Core/Module.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/include/lldb/Core/Module.h?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/include/lldb/Core/Module.h (original)
+++ lldb/branches/lldb-platform-work/include/lldb/Core/Module.h Tue Apr 24 12:39:56 2012
@@ -1016,6 +1016,9 @@
void
LogMessage (Log *log, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
+ void
+ LogMessageVerboseBacktrace (Log *log, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
+
void
ReportWarning (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
Modified: lldb/branches/lldb-platform-work/source/Core/Module.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Core/Module.cpp?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Core/Module.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Core/Module.cpp Tue Apr 24 12:39:56 2012
@@ -879,6 +879,24 @@
}
}
+void
+Module::LogMessageVerboseBacktrace (Log *log, const char *format, ...)
+{
+ if (log)
+ {
+ StreamString log_message;
+ GetDescription(&log_message, lldb::eDescriptionLevelFull);
+ log_message.PutCString (": ");
+ va_list args;
+ va_start (args, format);
+ log_message.PrintfVarArg (format, args);
+ va_end (args);
+ if (log->GetVerbose())
+ Host::Backtrace (log_message, 1024);
+ log->PutCString(log_message.GetString().c_str());
+ }
+}
+
bool
Module::GetModified (bool use_cached_only)
{
Modified: lldb/branches/lldb-platform-work/source/Core/Value.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Core/Value.cpp?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Core/Value.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Core/Value.cpp Tue Apr 24 12:39:56 2012
@@ -492,9 +492,20 @@
case eValueTypeHostAddress:
address = m_value.ULongLong(LLDB_INVALID_ADDRESS);
+ address_type = eAddressTypeHost;
+ if (exe_ctx)
+ {
+ Target *target = exe_ctx->GetTargetPtr();
+ if (target)
+ {
+ data.SetByteOrder(target->GetArchitecture().GetByteOrder());
+ data.SetAddressByteSize(target->GetArchitecture().GetAddressByteSize());
+ break;
+ }
+ }
+ // fallback to host settings
data.SetByteOrder(lldb::endian::InlHostByteOrder());
data.SetAddressByteSize(sizeof(void *));
- address_type = eAddressTypeHost;
break;
}
Modified: lldb/branches/lldb-platform-work/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Interpreter/CommandInterpreter.cpp?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Interpreter/CommandInterpreter.cpp Tue Apr 24 12:39:56 2012
@@ -2272,20 +2272,23 @@
if (!success || !tmp_result.Succeeded())
{
+ const char *error_msg = tmp_result.GetErrorData();
+ if (error_msg == NULL || error_msg[0] == '\0')
+ error_msg = "<unknown error>.\n";
if (stop_on_error)
{
- result.AppendErrorWithFormat("Aborting reading of commands after command #%d: '%s' failed.\n",
- idx, cmd);
+ result.AppendErrorWithFormat("Aborting reading of commands after command #%d: '%s' failed with %s",
+ idx, cmd, error_msg);
result.SetStatus (eReturnStatusFailed);
m_debugger.SetAsyncExecution (old_async_execution);
return;
}
else if (print_results)
{
- result.AppendMessageWithFormat ("Command #%d '%s' failed with error: %s.\n",
+ result.AppendMessageWithFormat ("Command #%d '%s' failed with %s",
idx + 1,
cmd,
- tmp_result.GetErrorData());
+ error_msg);
}
}
Modified: lldb/branches/lldb-platform-work/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Tue Apr 24 12:39:56 2012
@@ -17,6 +17,7 @@
#include "lldb/Core/FileSpecList.h"
#include "lldb/Core/Module.h"
#include "lldb/Core/PluginManager.h"
+#include "lldb/Core/RangeMap.h"
#include "lldb/Core/Section.h"
#include "lldb/Core/StreamFile.h"
#include "lldb/Core/StreamString.h"
@@ -756,6 +757,27 @@
const bool is_core = GetType() == eTypeCoreFile;
//bool dump_sections = false;
ModuleSP module_sp (GetModule());
+ // First look up any LC_ENCRYPTION_INFO load commands
+ typedef RangeArray<uint32_t, uint32_t, 8> EncryptedFileRanges;
+ EncryptedFileRanges encrypted_file_ranges;
+ for (i=0; i<m_header.ncmds; ++i)
+ {
+ const uint32_t load_cmd_offset = offset;
+ if (m_data.GetU32(&offset, &load_cmd, 2) == NULL)
+ break;
+
+ if (load_cmd.cmd == LoadCommandEncryptionInfo)
+ {
+ EncryptedFileRanges::Entry entry;
+ entry.SetRangeBase(m_data.GetU32(&offset));
+ entry.SetByteSize(m_data.GetU32(&offset));
+ encrypted_file_ranges.Append(entry);
+ }
+ offset = load_cmd_offset + load_cmd.cmdsize;
+ }
+
+ offset = MachHeaderSizeFromMagic(m_header.magic);
+
for (i=0; i<m_header.ncmds; ++i)
{
const uint32_t load_cmd_offset = offset;
@@ -785,7 +807,7 @@
SectionSP segment_sp;
if (segment_name || is_core)
{
- segment_sp.reset(new Section (module_sp, // Module to which this section belongs
+ segment_sp.reset(new Section (module_sp, // Module to which this section belongs
++segID << 8, // Section ID is the 1 based segment index shifted right by 8 bits as not to collide with any of the 256 section IDs that are possible
segment_name, // Name of this section
eSectionTypeContainer, // This section is a container of other sections.
@@ -1020,8 +1042,12 @@
sect64.offset == 0 ? 0 : sect64.size,
sect64.flags));
// Set the section to be encrypted to match the segment
- section_sp->SetIsEncrypted (segment_is_encrypted);
+
+ bool section_is_encrypted = false;
+ if (!segment_is_encrypted && load_cmd.filesize != 0)
+ section_is_encrypted = encrypted_file_ranges.FindEntryThatContains(sect64.offset) != NULL;
+ section_sp->SetIsEncrypted (segment_is_encrypted || section_is_encrypted);
segment_sp->GetChildren().AddSection(section_sp);
if (segment_sp->IsFake())
@@ -2236,10 +2262,14 @@
else
{
// Make a synthetic symbol to describe the trampoline stub
+ Mangled stub_symbol_mangled_name(stub_symbol->GetMangled());
if (sym_idx >= num_syms)
+ {
sym = symtab->Resize (++num_syms);
+ stub_symbol = NULL; // this pointer no longer valid
+ }
sym[sym_idx].SetID (synthetic_sym_id++);
- sym[sym_idx].GetMangled() = stub_symbol->GetMangled();
+ sym[sym_idx].GetMangled() = stub_symbol_mangled_name;
sym[sym_idx].SetType (eSymbolTypeTrampoline);
sym[sym_idx].SetIsSynthetic (true);
sym[sym_idx].GetAddress() = so_addr;
Modified: lldb/branches/lldb-platform-work/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp Tue Apr 24 12:39:56 2012
@@ -172,9 +172,9 @@
LogSP log (LogChannelDWARF::GetLogIfAny(DWARF_LOG_DEBUG_INFO | DWARF_LOG_LOOKUPS));
if (log)
{
- m_dwarf2Data->GetObjectFile()->GetModule()->LogMessage (log.get(),
- "DWARFCompileUnit::ExtractDIEsIfNeeded () for compile unit at .debug_info[0x%8.8x]",
- GetOffset());
+ m_dwarf2Data->GetObjectFile()->GetModule()->LogMessageVerboseBacktrace (log.get(),
+ "DWARFCompileUnit::ExtractDIEsIfNeeded () for compile unit at .debug_info[0x%8.8x]",
+ GetOffset());
}
}
Modified: lldb/branches/lldb-platform-work/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp Tue Apr 24 12:39:56 2012
@@ -1995,19 +1995,12 @@
LogSP log (LogChannelDWARF::GetLogIfAny(DWARF_LOG_DEBUG_INFO|DWARF_LOG_TYPE_COMPLETION));
if (log)
{
- GetObjectFile()->GetModule()->LogMessage (log.get(),
- "0x%8.8llx: %s '%s' resolving forward declaration...",
- MakeUserID(die->GetOffset()),
- DW_TAG_value_to_name(tag),
- type->GetName().AsCString());
-
- if (log->GetVerbose())
- {
- StreamString strm;
- Host::Backtrace (strm, 1024);
- if (strm.GetData())
- log->PutCString(strm.GetData());
- }
+ GetObjectFile()->GetModule()->LogMessageVerboseBacktrace (log.get(),
+ "0x%8.8llx: %s '%s' resolving forward declaration...",
+ MakeUserID(die->GetOffset()),
+ DW_TAG_value_to_name(tag),
+ type->GetName().AsCString());
+
}
assert (clang_type);
DWARFDebugInfoEntry::Attributes attributes;
Modified: lldb/branches/lldb-platform-work/source/Symbol/CompileUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Symbol/CompileUnit.cpp?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Symbol/CompileUnit.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Symbol/CompileUnit.cpp Tue Apr 24 12:39:56 2012
@@ -298,7 +298,7 @@
// "file_spec" has an empty directory, then only compare the basenames
// when finding file indexes
std::vector<uint32_t> file_indexes;
- bool file_spec_matches_cu_file_spec = FileSpec::Equal(file_spec, this, !file_spec.GetDirectory().IsEmpty());
+ bool file_spec_matches_cu_file_spec = FileSpec::Equal(file_spec, *this, !file_spec.GetDirectory().IsEmpty());
// If we are not looking for inlined functions and our file spec doesn't
// match then we are done...
Modified: lldb/branches/lldb-platform-work/test/expression_command/call-function/TestCallStdStringFunction.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/expression_command/call-function/TestCallStdStringFunction.py?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/expression_command/call-function/TestCallStdStringFunction.py (original)
+++ lldb/branches/lldb-platform-work/test/expression_command/call-function/TestCallStdStringFunction.py Tue Apr 24 12:39:56 2012
@@ -20,14 +20,12 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@dsym_test
- @expectedFailurei386
def test_with_dsym(self):
"""Test calling std::String member function."""
self.buildDsym()
self.call_function()
@dwarf_test
- @expectedFailurei386
def test_with_dwarf(self):
"""Test calling std::String member function."""
self.buildDsym()
Modified: lldb/branches/lldb-platform-work/test/expression_command/formatters/TestFormatters.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/expression_command/formatters/TestFormatters.py?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/expression_command/formatters/TestFormatters.py (original)
+++ lldb/branches/lldb-platform-work/test/expression_command/formatters/TestFormatters.py Tue Apr 24 12:39:56 2012
@@ -20,14 +20,12 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@dsym_test
- @expectedFailurei386
def test_with_dsym(self):
"""Test expr + formatters for good interoperability."""
self.buildDsym()
self.do_my_test()
@dwarf_test
- @expectedFailurei386
def test_with_dwarf(self):
"""Test expr + formatters for good interoperability."""
self.buildDsym()
Modified: lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py (original)
+++ lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py Tue Apr 24 12:39:56 2012
@@ -13,14 +13,12 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@dsym_test
- @expectedFailurei386
def test_with_dsym_and_run_command(self):
"""Test data formatter commands."""
self.buildDsym()
self.data_formatter_commands()
@dwarf_test
- @expectedFailurei386
def test_with_dwarf_and_run_command(self):
"""Test data formatter commands."""
self.buildDwarf()
Modified: lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py (original)
+++ lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py Tue Apr 24 12:39:56 2012
@@ -13,14 +13,12 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@dsym_test
- @expectedFailurei386
def test_with_dsym_and_run_command(self):
"""Test data formatter commands."""
self.buildDsym()
self.data_formatter_commands()
@dwarf_test
- @expectedFailurei386
def test_with_dwarf_and_run_command(self):
"""Test data formatter commands."""
self.buildDwarf()
Modified: lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py (original)
+++ lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py Tue Apr 24 12:39:56 2012
@@ -13,14 +13,12 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@dsym_test
- @expectedFailurei386
def test_with_dsym_and_run_command(self):
"""Test data formatter commands."""
self.buildDsym()
self.data_formatter_commands()
@dwarf_test
- @expectedFailurei386
def test_with_dwarf_and_run_command(self):
"""Test data formatter commands."""
self.buildDwarf()
Modified: lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py (original)
+++ lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py Tue Apr 24 12:39:56 2012
@@ -13,14 +13,12 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@dsym_test
- @expectedFailurei386
def test_with_dsym_and_run_command(self):
"""Test data formatter commands."""
self.buildDsym()
self.data_formatter_commands()
@dwarf_test
- @expectedFailurei386
def test_with_dwarf_and_run_command(self):
"""Test data formatter commands."""
self.buildDwarf()
Modified: lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py (original)
+++ lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py Tue Apr 24 12:39:56 2012
@@ -13,14 +13,12 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@dsym_test
- @expectedFailurei386
def test_with_dsym_and_run_command(self):
"""Test data formatter commands."""
self.buildDsym()
self.data_formatter_commands()
@dwarf_test
- @expectedFailurei386
def test_with_dwarf_and_run_command(self):
"""Test data formatter commands."""
self.buildDwarf()
Modified: lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py (original)
+++ lldb/branches/lldb-platform-work/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py Tue Apr 24 12:39:56 2012
@@ -13,14 +13,12 @@
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
@dsym_test
- @expectedFailurei386
def test_with_dsym_and_run_command(self):
"""Test data formatter commands."""
self.buildDsym()
self.data_formatter_commands()
@dwarf_test
- @expectedFailurei386
def test_with_dwarf_and_run_command(self):
"""Test data formatter commands."""
self.buildDwarf()
Modified: lldb/branches/lldb-platform-work/test/python_api/formatters/TestFormattersSBAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/python_api/formatters/TestFormattersSBAPI.py?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/python_api/formatters/TestFormattersSBAPI.py (original)
+++ lldb/branches/lldb-platform-work/test/python_api/formatters/TestFormattersSBAPI.py Tue Apr 24 12:39:56 2012
@@ -76,27 +76,27 @@
self.expect("frame variable foo.A",
substrs = ['0x00000001'])
self.expect("frame variable foo.E", matching=False,
- substrs = ['0x00000000b8cca70a'])
+ substrs = ['b8cca70a'])
category.AddTypeFormat(lldb.SBTypeNameSpecifier("long"),format)
self.expect("frame variable foo.A",
substrs = ['0x00000001'])
self.expect("frame variable foo.E",
- substrs = ['0x00000000b8cca70a'])
+ substrs = ['b8cca70a'])
format.format = lldb.eFormatOctal
category.AddTypeFormat(lldb.SBTypeNameSpecifier("int"),format)
self.expect("frame variable foo.A",
substrs = ['01'])
self.expect("frame variable foo.E",
- substrs = ['0x00000000b8cca70a'])
+ substrs = ['b8cca70a'])
category.DeleteTypeFormat(lldb.SBTypeNameSpecifier("int"))
category.DeleteTypeFormat(lldb.SBTypeNameSpecifier("long"))
self.expect("frame variable foo.A", matching=False,
substrs = ['01'])
self.expect("frame variable foo.E", matching=False,
- substrs = ['0x00000000b8cca70a'])
+ substrs = ['b8cca70a'])
summary = lldb.SBTypeSummary.CreateWithSummaryString("the hello world you'll never see")
summary.SetSummaryString('hello world')
Modified: lldb/branches/lldb-platform-work/test/python_api/formatters/main.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/test/python_api/formatters/main.cpp?rev=155451&r1=155450&r2=155451&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/test/python_api/formatters/main.cpp (original)
+++ lldb/branches/lldb-platform-work/test/python_api/formatters/main.cpp Tue Apr 24 12:39:56 2012
@@ -28,12 +28,14 @@
foo.C = 'e';
foo.D = 6.28;
foo.E = 3100419850;
+ foo.F = 0;
FooType bar;
bar.A = 1;
bar.B = 3.14;
bar.C = 'e';
bar.D = 6.28;
bar.E = 3100419850;
+ bar.F = 0;
JustAStruct* foo_ptr = &foo;
std::vector<int> int_vector;
return 0; // Set break point at this line.
More information about the lldb-commits
mailing list