Merge pull request #5034 from adrian-prantl/31066897

Resuscitate TestSwiftStaticLinking.py

Author: adrian-prantl

lldb/test/API/lang/swift/static_linking/macOS/A.swift

@@ -1,19 +1,7 @@
-// A.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
 
 @objc public class A: NSObject {
-	public func foo() -> Int {
+	@objc public func foo() -> Int {
 	  return 4  // Set breakpoint here
 	}
-}
+}

lldb/test/API/lang/swift/static_linking/macOS/B.swift

@@ -1,19 +1,7 @@
-// B.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
 
 @objc public class B: NSObject {
-	public func bar() -> Int {
+	@objc public func bar() -> Int {
 	  return 8  // Set breakpoint here
 	}
-}
+}

lldb/test/API/lang/swift/static_linking/macOS/Makefile

@@ -4,35 +4,30 @@
 # will be wrong.  WE use 'first' so that the normal 'make' command (without
 # a target) selects the first (but not 'all') target so we avoid the undesired
 # default behavior.
-first: main
+EXE:=a.out
+all: $(EXE)
 
 SWIFT_OBJC_INTEROP=1
-
 include Makefile.rules
 
 # Add back the SDK settings to the swift flags.  Normally this happens
 # automatically, but since we're overriding the normal swiftc invocation,
 # we're not specifying SWIFT_SOURCES, and thus don't get the SDK.
 SWIFTFLAGS+=-sdk "$(SWIFTSDKROOT)"
 
-# To use the path commented out below, which is what we'd really want to do,
-# we'd also need to require that the Swift standard library be built along
-# with the compiler.  I'd like to avoid that requirement.
-# SWIFT_LIB_DIR=$(dir $(SWIFTC))../lib
-SWIFT_LIB_DIR="$(shell xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx"
-
-main: objc_main.m A.o B.o
-	$(CC) $(CFLAGS) $< -fobjc-arc -o main A.o B.o -L $(SWIFT_LIB_DIR) -Xlinker -add_ast_path -Xlinker A.swiftmodule -Xlinker -add_ast_path -Xlinker B.swiftmodule -Xlinker -rpath -Xlinker $(SWIFT_LIB_DIR)
+$(EXE): objc_main.m A.o B.o
+	$(CC) $(CFLAGS) -c -I. $< -fobjc-arc -o $(BUILDDIR)/objc_main.o
+	$(SWIFTC) $(SWIFTFLAGS) -o $@ $(BUILDDIR)/objc_main.o $(BUILDDIR)/A.o $(BUILDDIR)/B.o -L$(BUILDDIR) -Xlinker -add_ast_path -Xlinker A.swiftmodule -Xlinker -add_ast_path -Xlinker B.swiftmodule
 ifneq "$(CODESIGN)" ""
 	$(CODESIGN) -s - "$@"
 endif
 
-
-A.o: A.swift
-	$(SWIFTC) $(SWIFTFLAGS) -c -parse-as-library -module-name A -emit-module-path A.swiftmodule -emit-objc-header-path A-Swift.h -output-file-map output_map $<
-
-B.o: B.swift
-	$(SWIFTC) $(SWIFTFLAGS) -c -parse-as-library -module-name B -emit-module-path B.swiftmodule -emit-objc-header-path B-Swift.h -output-file-map output_map $< -o $@
-
-clean::
-	rm -f *.o main *-Swift.h *.swiftmodule *.swiftdoc
+%.o: %.swift
+	$(MAKE) -f $(MAKEFILE_RULES) \
+		DYLIB_NAME=$(patsubst %.o,%,$@) \
+		SWIFT_SOURCES=$(patsubst %.o,%.swift,$@) \
+		SWIFT_OBJC_HEADER=$(patsubst %.o,%-swift.h,$@) \
+		MODULENAME=$(patsubst %.o,%,$@) \
+		$(patsubst %.o,%.swiftmodule,$@) \
+		$(patsubst %.o,%-Swift.h,$@) \
+		$@

lldb/test/API/lang/swift/static_linking/macOS/TestSwiftStaticLinkingMacOS.py

@@ -1,22 +1,8 @@
-# TestSwiftStaticLinkingMacOS.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
-#
-# ------------------------------------------------------------------------------
 """
 Test that macOS can statically link two separately-compiled Swift modules
 with one Objective-C module, link them through the clang driver, and still
 access debug info for each of the Swift modules.
 """
-from __future__ import print_function
-
-
 # System imports
 import os
 
@@ -35,67 +21,33 @@ class SwiftStaticLinkingMacOSTestCase(TestBase):
 
     def expect_self_var_available_at_breakpoint(
             self, process, breakpoint, module_name):
-        # Frame #0 should be at the given breakpoint
-        threads = lldbutil.get_threads_stopped_at_breakpoint(
-            process, breakpoint)
-
-        self.assertEquals(1, len(threads))
-
         patterns = [
             # Ensure we report a self with an address.
-            r"self\s*=\s*0x[0-9a-fA-F]+",
+            r"=\s*0x[0-9a-fA-F]+",
             # Ensure we think it is an NSObject.
             r"ObjectiveC.NSObject"]
         substrs = [
             "(%s.%s)" % (module_name, module_name)
         ]
-        self.expect("frame variable self", patterns=patterns,
+        self.expect("expr self", patterns=patterns,
                     substrs=substrs)
 
     @skipUnlessDarwin
-    @skipIf(bugnumber="<rdar://problem/31066897>")
     def test_variables_print_from_both_swift_modules(self):
         """Test that variables from two modules can be accessed."""
         self.build()
 
-        # I could not find a reasonable way to say "skipUnless(archs=[])".
-        # That would probably be worth adding.
-        if self.getArchitecture() != 'x86_64':
-            self.skipTest("This test requires x86_64 as the architecture "
-                          "for the inferior")
-
-        exe_name = "main"
-        src_a = lldb.SBFileSpec("A.swift")
-        line_a = 5
-        src_b = lldb.SBFileSpec("B.swift")
-        line_b = 5
-        exe = self.getBuildArtifact(exe_name)
-
         # Create the target
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, lldbtest.VALID_TARGET)
-
-        # Set the breakpoints
-        # breakpoint_a = target.BreakpointCreateBySourceRegex(
-        #     'Set breakpoint here', src_a)
-        breakpoint_a = target.BreakpointCreateByLocation(
-            src_a, line_a)
-        self.assertTrue(breakpoint_a.GetNumLocations() > 0,
-                        lldbtest.VALID_BREAKPOINT)
+        target, process, _, breakpoint_a = lldbutil.run_to_line_breakpoint(
+            self, lldb.SBFileSpec("A.swift"), 5)
 
         # breakpoint_b = target.BreakpointCreateBySourceRegex(
         #     'Set breakpoint here', src_b)
         breakpoint_b = target.BreakpointCreateByLocation(
-            src_b, line_b)
+            lldb.SBFileSpec("B.swift"), 5)
         self.assertTrue(breakpoint_b.GetNumLocations() > 0,
                         lldbtest.VALID_BREAKPOINT)
 
-        # Launch the process, and do not stop at the entry point.
-        envp = ['DYLD_FRAMEWORK_PATH=.']
-        process = target.LaunchSimple(None, envp, os.getcwd())
-
-        self.assertTrue(process, lldbtest.PROCESS_IS_VALID)
-
         # We should be at breakpoint in module A.
         self.expect_self_var_available_at_breakpoint(
             process, breakpoint_a, "A")