From 5d3f1282e043c22e9e5ab28f3890c0d3dd2536d4 Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jonas@devlieghere.com>
Date: Thu, 24 Oct 2019 17:48:40 -0700
Subject: [PATCH 1/2] [TableGen] Fix default and description of
UseAllCompilerFlags
This tablegen entry was copy/pasted with the wrong default and
description. This fixes that.
---
lldb/source/Target/TargetProperties.td | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lldb/source/Target/TargetProperties.td b/lldb/source/Target/TargetProperties.td
index 7a06711dd7944..ff99220aecec4 100644
--- a/lldb/source/Target/TargetProperties.td
+++ b/lldb/source/Target/TargetProperties.td
@@ -170,8 +170,8 @@ let Definition = "target" in {
DefaultStringValue<"">,
Desc<"Additional -Xcc flags to be passed to the Swift ClangImporter.">;
def UseAllCompilerFlags: Property<"use-all-compiler-flags", "Boolean">,
- DefaultStringValue<"">,
- Desc<"The path to the SDK used to build the current target.">;
+ DefaultTrue,
+ Desc<"Try to use compiler flags for all modules when setting up the Swift expression parser, not just the main executable.">;
def SDKPath: Property<"sdk-path", "FileSpec">,
DefaultStringValue<"">,
Desc<"The path to the SDK used to build the current target.">;
From 4fd27f257481056d7b4adb74ef1b35cb161f81c0 Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jonas@devlieghere.com>
Date: Tue, 29 Oct 2019 14:57:34 -0700
Subject: [PATCH 2/2] Revert "[Test] Fix
TestSwiftDynamicTypeResolutionImportConflict"
This reverts commit e786708a27fa9a7789fff7715db522847774dc62.
---
.../TestSwiftDynamicTypeResolutionImportConflict.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lldb/packages/Python/lldbsuite/test/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py b/lldb/packages/Python/lldbsuite/test/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py
index ebf1febb7bfb6..cbd4415b5a037 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/TestSwiftDynamicTypeResolutionImportConflict.py
@@ -61,9 +61,12 @@ def test(self):
self.expect("fr v -d no-dynamic-values -- input",
substrs=['(Dylib.LibraryProtocol) input'])
self.expect("fr v -d run-target -- input",
- substrs=['(a.FromMainModule) input'])
+ substrs=['(Dylib.LibraryProtocol) input'])
+ # FIXME: substrs=['(main.FromMainModule) input'])
self.expect("expr -d run-target -- input",
- substrs=['(a.FromMainModule) $R0'])
+ "test that the expression evaluator can recover",
+ substrs=['(Dylib.LibraryProtocol) $R0'])
+ # FIXME: substrs=['(main.FromMainModule) input'])
if __name__ == '__main__':
import atexit