Merge pull request swiftlang#9277 from adrian-prantl/135576217

Properly convert file addresses to load addresses when resolving glob

Author: adrian-prantl

lldb/source/Core/ValueObjectVariable.cpp

@@ -231,19 +231,26 @@ bool ValueObjectVariable::UpdateValue() {
         if (type->GetForwardCompilerType()
                 .GetTypeSystem()
                 .dyn_cast_or_null<TypeSystemSwift>() &&
-            TypePayloadSwift(type->GetPayload()).IsFixedValueBuffer())
+            TypePayloadSwift(type->GetPayload()).IsFixedValueBuffer() &&
+            m_value.GetValueType() == Value::ValueType::FileAddress)
           if (auto process_sp = GetProcessSP())
             if (auto runtime = process_sp->GetLanguageRuntime(
                     compiler_type.GetMinimumLanguage())) {
               if (!runtime->IsStoredInlineInBuffer(compiler_type)) {
-                lldb::addr_t addr =
-                    m_value.GetScalar().ULongLong(LLDB_INVALID_ADDRESS);
-                if (addr != LLDB_INVALID_ADDRESS) {
-                  Target &target = process_sp->GetTarget();
-                  size_t ptr_size = process_sp->GetAddressByteSize();
-                  lldb::addr_t deref_addr;
-                  target.ReadMemory(addr, &deref_addr, ptr_size, m_error, true);
-                  m_value.GetScalar() = deref_addr;
+                if (auto *scs = variable->GetSymbolContextScope()) {
+                  if (auto module_sp = scs->CalculateSymbolContextModule()) {
+                    lldb::addr_t file_addr =
+                      m_value.GetScalar().ULongLong(LLDB_INVALID_ADDRESS);
+                    Address address(file_addr, module_sp->GetSectionList());
+                    Target &target = process_sp->GetTarget();
+                    size_t ptr_size = process_sp->GetAddressByteSize();
+                    lldb::addr_t deref_addr;
+                    lldb::addr_t load_addr = address.GetLoadAddress(&target);
+                    // FIXME: Add error handling!
+                    if (target.ReadMemory(load_addr, &deref_addr, ptr_size,
+                                          m_error, process_is_alive))
+                      m_value.GetScalar() = deref_addr;
+                  }
                 }
               }
           }

lldb/test/API/lang/swift/foundation_value_types/notification/TestSwiftFoundationTypeNotification.py

@@ -1,17 +1,34 @@
-# TestSwiftFoundationValueTypes.py
-#
-# This source file is part of the Swift.org open source project
-#
-# Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
-# Licensed under Apache License v2.0 with Runtime Library Exception
-#
-# See https://swift.org/LICENSE.txt for license information
-# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-#
-# ------------------------------------------------------------------------------
-import lldbsuite.test.lldbinline as lldbinline
+import lldb
 from lldbsuite.test.decorators import *
+import lldbsuite.test.lldbtest as lldbtest
+import lldbsuite.test.lldbutil as lldbutil
 
-lldbinline.MakeInlineTest(
-    __file__, globals(), decorators=
-    [skipUnlessDarwin,swiftTest])
+
+class TestSwiftFoundationTypeNotification(lldbtest.TestBase):
+
+    mydir = lldbtest.TestBase.compute_mydir(__file__)
+
+    @swiftTest
+    def test(self):
+        self.build()
+        target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
+            self, 'break here', lldb.SBFileSpec('main.swift'))
+        self.expect("log enable lldb types -v")
+        # global
+        self.expect("target variable -d run g_notification",
+                    substrs=['name = ', '"MyNotification"',
+                             'object = nil',
+                             'userInfo = 0 key/value pairs'])
+        self.expect("expression -d run -- g_notification",
+                    substrs=['name = ', '"MyNotification"',
+                             'object = nil',
+                             'userInfo = 0 key/value pairs'])
+        # local
+        self.expect("frame variable -d run -- notification",
+                    substrs=['name = ', '"MyNotification"',
+                             'object = nil',
+                             'userInfo = 0 key/value pairs'])
+        self.expect("expression -d run -- notification",
+                    substrs=['name = ', '"MyNotification"',
+                             'object = nil',
+                             'userInfo = 0 key/value pairs'])

lldb/test/API/lang/swift/foundation_value_types/notification/main.swift

@@ -1,23 +1,10 @@
-// main.swift
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-// -----------------------------------------------------------------------------
 import Foundation
 
 func main() {
   var notification = Notification(name: Notification.Name(rawValue: "MyNotification"), object: nil, userInfo: [:])
-  print("done!") //% self.expect("frame variable -d run -- notification", substrs=['name = ', '"MyNotification"', 'object = nil', 'userInfo = 0 key/value pairs'])
-   //% self.expect("expression -d run -- notification", substrs=['name = ', '"MyNotification"', 'object = nil', 'userInfo = 0 key/value pairs'])
+  print("break here!")
 }
 
 var g_notification = Notification(name: Notification.Name(rawValue: "MyNotification"), object: nil, userInfo: [:])
 
-main() //% self.expect("target variable -d run g_notification", substrs=['name = ', '"MyNotification"', 'object = nil', 'userInfo = 0 key/value pairs'])
-       //% self.expect("expression -d run -- g_notification", substrs=['name = ', '"MyNotification"', 'object = nil', 'userInfo = 0 key/value pairs'])
+main()