Merge commit '659e139d89ff' from swift/release/5.4 into swift/main

Author: git apple-llvm automerger

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -4180,7 +4180,7 @@ void SwiftASTContext::CacheDemangledTypeFailure(ConstString name) {
 /// What we should really do is only mangle AST types in DebugInfo, but that
 /// requires some more plumbing on the Swift side to properly handle generic
 /// specializations.
-swift::Type convertSILFunctionTypesToASTFunctionTypes(swift::Type t) {
+static swift::Type ConvertSILFunctionTypesToASTFunctionTypes(swift::Type t) {
   return t.transform([](swift::Type t) -> swift::Type {
     if (auto *silFn = t->getAs<swift::SILFunctionType>())
       return swift::FunctionType::get({}, t->getASTContext().TheEmptyTupleType);
@@ -4300,14 +4300,18 @@ swift::TypeBase *SwiftASTContext::ReconstructType(ConstString mangled_typename,
                    .getPointer();
 
   if (found_type) {
-    found_type =
-        convertSILFunctionTypesToASTFunctionTypes(found_type).getPointer();
-    CacheDemangledType(mangled_typename, found_type);
-    CompilerType result_type = ToCompilerType(found_type);
-    assert(&found_type->getASTContext() == ast_ctx);
+    swift::TypeBase *ast_type =
+        ConvertSILFunctionTypesToASTFunctionTypes(found_type).getPointer();
+    // This transformation is lossy: all SILFunction types are mapped
+    // to the same AST type. We thus cannot cache the result, since
+    // the mapping isn't bijective.
+    if (ast_type == found_type)
+      CacheDemangledType(mangled_typename, ast_type);
+    CompilerType result_type = ToCompilerType(ast_type);
+    assert(&ast_type->getASTContext() == ast_ctx);
     LOG_PRINTF(LIBLLDB_LOG_TYPES, "(\"%s\") -- found %s", mangled_cstr,
                result_type.GetTypeName().GetCString());
-    return found_type;
+    return ast_type;
   }
 
   LOG_PRINTF(LIBLLDB_LOG_TYPES, "(\"%s\") -- not found", mangled_cstr);

lldb/source/Plugins/TypeSystem/Swift/TypeSystemSwiftTypeRef.cpp

@@ -1420,6 +1420,12 @@ static bool ContainsSugaredParen(swift::Demangle::NodePointer node) {
 /// Compare two swift types from different type systems by comparing their
 /// (canonicalized) mangled name.
 template <> bool Equivalent<CompilerType>(CompilerType l, CompilerType r) {
+  // See comments in SwiftASTContext::ReconstructType(). For
+  // SILFunctionTypes the mapping isn't bijective.
+  auto *ast_ctx = llvm::cast<SwiftASTContext>(r.GetTypeSystem());
+  if (((void *)ast_ctx->ReconstructType(l.GetMangledTypeName())) ==
+      r.GetOpaqueQualType())
+    return true;
   ConstString lhs = l.GetMangledTypeName();
   ConstString rhs = r.GetMangledTypeName();
   if (lhs == ConstString("$sSiD") && rhs == ConstString("$sSuD"))

lldb/test/API/lang/swift/tagged_pointer/TestSwiftTaggedPointer.py

@@ -1,19 +1,31 @@
-# TestSwiftTaggedPointer.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
+import unittest2
 
-# This test depends on NSObject, so it is not available on non-Darwin
-# platforms.
-lldbinline.MakeInlineTest(__file__, globals(),
-                          decorators=[swiftTest,skipUnlessDarwin,
-                                      skipIf(bugnumber="rdar://problem/66842937")])
+
+class TestSwiftAnyType(lldbtest.TestBase):
+
+    mydir = lldbtest.TestBase.compute_mydir(__file__)
+
+    @swiftTest
+    # This test depends on NSObject, so it is not available on non-Darwin
+    # platforms.
+    @skipUnlessDarwin
+    def test(self):
+        self.build()
+        target, process, thread, bkpt = lldbutil.run_to_source_breakpoint(
+            self, 'break here', lldb.SBFileSpec('main.swift'))
+
+        self.expect('frame variable -d run -- a', substrs=['Int64(3)'])
+        self.expect('frame variable -d run -- b', substrs=['Int64(3)'])
+         
+        self.expect('frame variable -d run -- c', substrs=['"hi"'])
+        self.expect('frame variable -d run -- d', substrs=['"hi"'])
+         
+        self.expect('expr -d run -- a', substrs=['Int64(3)'])
+        self.expect('expr -d run -- b', substrs=['Int64(3)'])
+         
+        self.expect('expr -d run -- c', substrs=['"hi"'])
+        self.expect('expr -d run -- d', substrs=['"hi"'])

lldb/test/API/lang/swift/tagged_pointer/main.swift

@@ -1,14 +1,3 @@
-// main.swift
-//
-// 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 Foundation
 
 func main() {
@@ -18,17 +7,7 @@ func main() {
   var c: NSObject = "hi" as NSString
   var d: AnyObject = "hi" as NSString
 
-   //% self.expect('frame variable -d run -- a', substrs=['Int64(3)'])
-   //% self.expect('frame variable -d run -- b', substrs=['Int64(3)'])
-
-   //% self.expect('frame variable -d run -- c', substrs=['"hi"'])
-   //% self.expect('frame variable -d run -- d', substrs=['"hi"'])
-
-   //% self.expect('expr -d run -- a', substrs=['Int64(3)'])
-   //% self.expect('expr -d run -- b', substrs=['Int64(3)'])
-
-   //% self.expect('expr -d run -- c', substrs=['"hi"'])
-   //% self.expect('expr -d run -- d', substrs=['"hi"'])
+  print("break here")
 }
 
 main()