commit a3747a9d31e88b89bbb1d7ba219746caabb14397
author Siva Chandra <sivachandra@google.com> Mon May 04 19:43:34 2015 +0000
committer Siva Chandra <sivachandra@google.com> Mon May 04 19:43:34 2015 +0000
tree 15a508d971b408dddaf5ba2cf9b68e54bfb3363c
parent 4fe30a06b18ce70e4c8f42b473d1786464515ace

[ValueObject] Do not return address of eValueTypeHostAddress values.

Summary:
This fixes TestRegisterVariables for clang and hence it is enabled in this commit.


Test Plan: dotest.py -C clang -p TestRegisterVariables

Reviewers: clayborg

Reviewed By: clayborg

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D9421

llvm-svn: 236447

lldb/source/Core/ValueObject.cpp

diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index 29a4d40..b2f4610 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -1821,13 +1821,14 @@
 
     case Value::eValueTypeLoadAddress: 
     case Value::eValueTypeFileAddress:
-    case Value::eValueTypeHostAddress:
         {
             if(address_type)
                 *address_type = m_value.GetValueAddressType ();
             return m_value.GetScalar().ULongLong(LLDB_INVALID_ADDRESS);
         }
         break;
+    case Value::eValueTypeHostAddress:
+        break;
     }
     if (address_type)
         *address_type = eAddressTypeInvalid;
@@ -3785,7 +3786,7 @@
     const bool scalar_is_load_address = false;
     addr_t addr = GetAddressOf (scalar_is_load_address, &address_type);
     error.Clear();
-    if (addr != LLDB_INVALID_ADDRESS)
+    if (addr != LLDB_INVALID_ADDRESS && address_type != eAddressTypeHost)
     {
         switch (address_type)
         {
@@ -3799,7 +3800,6 @@
 
         case eAddressTypeFile:
         case eAddressTypeLoad:
-        case eAddressTypeHost:
             {
                 ClangASTType clang_type = GetClangType();
                 if (clang_type)
@@ -3816,6 +3816,8 @@
                 }
             }
             break;
+        default:
+            break;
         }
     }
     else