← Back to branch summary

~ubuntu-branches/ubuntu/trusty/llvm-toolchain-snapshot/trusty-201310232150

« back to all changes in this revision

Viewing changes to lldb/source/DataFormatters/NSDictionary.cpp

  • Committer: Package Import Robot
  • Author(s): Sylvestre Ledru
  • Date: 2013-05-27 15:01:57 UTC
  • mfrom: (0.10.1) (0.9.1) (0.8.1) (0.7.1) (0.6.1) (0.5.2)
  • Revision ID: package-import@ubuntu.com-20130527150157-tdkrsjpuvht7v0qx
Tags: 1:3.4~svn182733-1~exp1
http://bugs.debian.org/708677
* New snapshot release (3.4 release)
* Add a symlink of libLLVM-3.4.so.1 to usr/lib/llvm-3.4/lib/libLLVM-3.4.so
    to fix make the llvm-config-3.4 --libdir work (Closes: #708677)
  * Various packages rename to allow co installations:
    * libclang1 => libclang1-3.4
    * libclang1-dbg => libclang1-3.4-dbg
    * libclang-dev => libclang-3.4-dev
    * libclang-common-dev => libclang-common-3.4-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
lldb/source/DataFormatters/NSDictionary.cpp
255
255
m_data_64(NULL),
256
256
m_pair_type()
257
257
{
258
 
    if (valobj_sp)
259
 
        Update();
260
258
}
261
259
 
262
260
lldb_private::formatters::NSDictionaryISyntheticFrontEnd::~NSDictionaryISyntheticFrontEnd ()
297
295
    ValueObjectSP valobj_sp = m_backend.GetSP();
298
296
    if (!valobj_sp)
299
297
        return false;
300
 
    if (!valobj_sp)
301
 
        return false;
302
298
    m_exe_ctx_ref = valobj_sp->GetExecutionContextRef();
303
299
    Error error;
304
 
    if (valobj_sp->IsPointerType())
305
 
    {
306
 
        valobj_sp = valobj_sp->Dereference(error);
307
 
        if (error.Fail() || !valobj_sp)
308
 
            return false;
309
 
    }
310
300
    error.Clear();
311
301
    lldb::ProcessSP process_sp(valobj_sp->GetProcessSP());
312
302
    if (!process_sp)
313
303
        return false;
314
304
    m_ptr_size = process_sp->GetAddressByteSize();
315
305
    m_order = process_sp->GetByteOrder();
316
 
    uint64_t data_location = valobj_sp->GetAddressOf() + m_ptr_size;
 
306
    uint64_t data_location = valobj_sp->GetValueAsUnsigned(0) + m_ptr_size;
317
307
    if (m_ptr_size == 4)
318
308
    {
319
309
        m_data_32 = new DataDescriptor_32();
427
417
m_data_64(NULL),
428
418
m_pair_type()
429
419
{
430
 
    if (valobj_sp)
431
 
        Update ();
432
420
}
433
421
 
434
422
lldb_private::formatters::NSDictionaryMSyntheticFrontEnd::~NSDictionaryMSyntheticFrontEnd ()
469
457
    m_data_64 = NULL;
470
458
    if (!valobj_sp)
471
459
        return false;
472
 
    if (!valobj_sp)
473
 
        return false;
474
460
    m_exe_ctx_ref = valobj_sp->GetExecutionContextRef();
475
461
    Error error;
476
 
    if (valobj_sp->IsPointerType())
477
 
    {
478
 
        valobj_sp = valobj_sp->Dereference(error);
479
 
        if (error.Fail() || !valobj_sp)
480
 
            return false;
481
 
    }
482
462
    error.Clear();
483
463
    lldb::ProcessSP process_sp(valobj_sp->GetProcessSP());
484
464
    if (!process_sp)
485
465
        return false;
486
466
    m_ptr_size = process_sp->GetAddressByteSize();
487
467
    m_order = process_sp->GetByteOrder();
488
 
    uint64_t data_location = valobj_sp->GetAddressOf() + m_ptr_size;
 
468
    uint64_t data_location = valobj_sp->GetValueAsUnsigned(0) + m_ptr_size;
489
469
    if (m_ptr_size == 4)
490
470
    {
491
471
        m_data_32 = new DataDescriptor_32();