Merge remote-tracking branch 'origin/swift-4.1-branch' into stable
diff --git a/packages/Python/lldbsuite/test/lang/swift/stepping/TestSwiftStepping.py b/packages/Python/lldbsuite/test/lang/swift/stepping/TestSwiftStepping.py
index 55c58c8..dcc69c0 100644
--- a/packages/Python/lldbsuite/test/lang/swift/stepping/TestSwiftStepping.py
+++ b/packages/Python/lldbsuite/test/lang/swift/stepping/TestSwiftStepping.py
@@ -294,6 +294,12 @@
# finish off the line.
if stop_on_caller:
thread.StepOver()
+
+ # Step over the assignment.
+ stop_on_partial_apply = self.hit_correct_line(thread, "var cd_maker =", False)
+ if stop_on_partial_apply:
+ thread.StepOver()
+
self.hit_correct_line(thread, "doSomethingWithFunction(cd_maker, 10)")
thread.StepInto()
diff --git a/packages/Python/lldbsuite/test/lang/swift/struct_change_rerun/TestSwiftStructChangeRerun.py b/packages/Python/lldbsuite/test/lang/swift/struct_change_rerun/TestSwiftStructChangeRerun.py
index c29f3d9..ec28d35 100644
--- a/packages/Python/lldbsuite/test/lang/swift/struct_change_rerun/TestSwiftStructChangeRerun.py
+++ b/packages/Python/lldbsuite/test/lang/swift/struct_change_rerun/TestSwiftStructChangeRerun.py
@@ -26,6 +26,7 @@
mydir = TestBase.compute_mydir(__file__)
@decorators.skipIf(debug_info=decorators.no_match("dsym"))
+ @decorators.expectedFailureAll(bugnumber="rdar://35459092")
@decorators.swiftTest
def test_swift_struct_change_rerun(self):
"""Test that we display self correctly for an inline-initialized struct"""
diff --git a/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp b/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp
index 491775d..2a92eb9 100644
--- a/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp
+++ b/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp
@@ -1178,7 +1178,7 @@
m_swift_ast_context->GetLanguageOptions().EnableThrowWithoutTry = true;
}
- m_swift_ast_context->GetIRGenOptions().Optimize = false;
+ m_swift_ast_context->GetIRGenOptions().OptMode = swift::OptimizationMode::NoOptimization;
m_swift_ast_context->GetIRGenOptions().Verify =
false; // normally we'd like to verify, but unfortunately the verifier's
// error mode is abort().
