Index: source/Core/Address.cpp
===================================================================
--- source/Core/Address.cpp
+++ source/Core/Address.cpp
@@ -371,7 +371,7 @@
 {
     addr_t code_addr = GetLoadAddress (target);
     if (code_addr != LLDB_INVALID_ADDRESS)
-        code_addr = target->GetOpcodeLoadAddress (code_addr, GetAddressClass());
+        code_addr = target->GetOpcodeLoadAddress (code_addr, eAddressClassCode);
     return code_addr;
 }
 
@@ -381,7 +381,7 @@
     if (SetLoadAddress (load_addr, target))
     {
         if (target)
-            m_offset = target->GetOpcodeLoadAddress (m_offset, GetAddressClass());
+            m_offset = target->GetOpcodeLoadAddress (m_offset, eAddressClassCode);
         return true;
     }
     return false;