Merge pull request swiftlang#2014 from adrian-prantl/binding-main

Bind generic types in the expression evaluator if dybamic types are requested

Author: adrian-prantl

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

@@ -581,7 +581,7 @@ static void AddRequiredAliases(Block *block, lldb::StackFrameSP &stack_frame_sp,
 static llvm::Optional<llvm::Error> AddVariableInfo(
     lldb::VariableSP variable_sp, lldb::StackFrameSP &stack_frame_sp,
     SwiftASTContextForExpressions &ast_context,
-    SwiftLanguageRuntime *language_runtime,
+    SwiftLanguageRuntime *runtime,
     llvm::SmallDenseSet<const char *, 8> &processed_variables,
     llvm::SmallVectorImpl<SwiftASTManipulator::VariableInfo> &local_variables,
     lldb::DynamicValueType use_dynamic) {
@@ -615,6 +615,11 @@ static llvm::Optional<llvm::Error> AddVariableInfo(
       return {};
     }
     var_type = valobj_sp->GetCompilerType();
+    if (use_dynamic > lldb::eNoDynamicValues) {
+      if (auto *stack_frame = stack_frame_sp.get())
+        var_type =
+            runtime->BindGenericTypeParameters(*stack_frame, var_type);
+    }
   }
 
   if (!var_type.IsValid())

lldb/test/API/lang/swift/clangimporter/headermap_conflict/TestSwiftHeadermapConflict.py

@@ -25,7 +25,6 @@ class TestSwiftHeadermapConflict(TestBase):
     def setUp(self):
         TestBase.setUp(self)
 
-    @skipIf #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
     @skipIf(bugnumber="rdar://60396797",
             setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin

lldb/test/API/lang/swift/expression/static/TestSwiftExpressionsInClassFunctions.py

@@ -28,32 +28,27 @@ def setUp(self):
         TestBase.setUp(self)
 
     def check_expression(self, expression, expected_result, use_summary=True):
-        value = self.frame().EvaluateExpression(expression)
+        opts = lldb.SBExpressionOptions()
+        opts.SetFetchDynamicValue(lldb.eDynamicCanRunTarget)
+        value = self.frame().EvaluateExpression(expression, opts)
         self.assertTrue(value.IsValid(), expression + "returned a valid value")
         if use_summary:
             answer = value.GetSummary()
         else:
             answer = value.GetValue()
-        report_str = "%s expected: %s got: %s" % (
-            expression, expected_result, answer)
-        self.assertTrue(answer == expected_result, report_str)
+        report_str = value.GetError()
+        self.assertEquals(answer, expected_result, report_str)
 
 
-    @expectedFailureAll #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
     @swiftTest
     def test_expressions_in_class_functions(self):
         """Test expressions in class func contexts"""
         self.build()
-        exe_name = "a.out"
-        exe = self.getBuildArtifact(exe_name)
-
-        # Create the target
-        target = self.dbg.CreateTarget(exe)
+        target = self.dbg.CreateTarget(self.getBuildArtifact())
         self.assertTrue(target, VALID_TARGET)
 
-        breakpoints = [None]
-
         # Set the breakpoints
+        breakpoints = [None]
         for i in range(1, 8):
             breakpoints.append(
                 target.BreakpointCreateBySourceRegex(
@@ -64,7 +59,6 @@ def test_expressions_in_class_functions(self):
 
         # Launch the process, and do not stop at the entry point.
         process = target.LaunchSimple(None, None, os.getcwd())
-
         self.assertTrue(process, PROCESS_IS_VALID)
 
         # Check each context

lldb/unittests/Symbol/TestSwiftASTContext.cpp

@@ -145,7 +145,6 @@ TEST_F(TestSwiftASTContext, ResourceDir) {
   llvm::sys::path::append(tc_rdir, "/Xcode.app/Contents/Developer/Toolchains/"
                                    "XcodeDefault.xctoolchain/usr/lib/swift");
 
-  llvm::StringRef rdir;
   auto GetResourceDir = [&](const char *triple_string,
                             llvm::StringRef sdk_path) {
     llvm::Triple host("x86_64-apple-macosx10.14");
@@ -157,7 +156,7 @@ TEST_F(TestSwiftASTContext, ResourceDir) {
         std::string(toolchain), std::string(cl_tools));
   };
 
-  EXPECT_EQ(GetResourceDir({"x86_64-apple-macosx10.14"}, macosx_sdk),
+  EXPECT_EQ(GetResourceDir("x86_64-apple-macosx10.14", macosx_sdk),
             tc_rdir.str());
   EXPECT_EQ(GetResourceDir("x86_64-apple-darwin", macosx_sdk), tc_rdir);
   EXPECT_EQ(GetResourceDir("aarch64-apple-ios11.3", ios_sdk), tc_rdir);