Skip to content

Commit 7f8786f

Browse files
author
git apple-llvm automerger
committed
Merge commit '3c0b016e9df8' from swift/release/6.1 into stable/20240723
2 parents 4f2ec7c + 823c6c7 commit 7f8786f

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include "SwiftExpressionParser.h"
1414

15+
#include "Plugins/Language/Swift/LogChannelSwift.h"
1516
#include "Plugins/TypeSystem/Swift/SwiftASTContext.h"
1617
#include "SwiftASTManipulator.h"
1718
#include "SwiftDiagnostic.h"
@@ -810,6 +811,9 @@ SwiftExpressionParser::GetASTContext(DiagnosticManager &diagnostic_manager) {
810811
m_swift_ast_ctx.GetLanguageOptions().EnableDollarIdentifiers = true;
811812
m_swift_ast_ctx.GetLanguageOptions().EnableAccessControl =
812813
(repl || playground);
814+
LLDB_LOG(lldb_private::GetSwiftHealthLog(), "Language option EnableAccessControl = {0}",
815+
m_swift_ast_ctx.GetLanguageOptions().EnableAccessControl);
816+
813817
m_swift_ast_ctx.GetLanguageOptions().EnableTargetOSChecking = false;
814818

815819
auto should_disable_objc_runtime = [&]() {
@@ -825,15 +829,23 @@ SwiftExpressionParser::GetASTContext(DiagnosticManager &diagnostic_manager) {
825829
};
826830
if (should_disable_objc_runtime())
827831
m_swift_ast_ctx.GetLanguageOptions().EnableObjCInterop = false;
832+
LLDB_LOG(lldb_private::GetSwiftHealthLog(), "Language option EnableObjCInterop = {0}",
833+
m_swift_ast_ctx.GetLanguageOptions().EnableObjCInterop);
828834

829835
m_swift_ast_ctx.GetLanguageOptions().Playground = repl || playground;
836+
LLDB_LOG(lldb_private::GetSwiftHealthLog(), "Language option Playground = {0}",
837+
m_swift_ast_ctx.GetLanguageOptions().Playground);
838+
830839
m_swift_ast_ctx.GetIRGenOptions().Playground = repl || playground;
831840

832841
// For the expression parser and REPL we want to relax the
833842
// requirement that you put "try" in front of every expression that
834843
// might throw.
835844
if (repl || !playground)
836845
m_swift_ast_ctx.GetLanguageOptions().EnableThrowWithoutTry = true;
846+
LLDB_LOG(lldb_private::GetSwiftHealthLog(), "Language option EnableThrowWithoutTry = {0}",
847+
m_swift_ast_ctx.GetLanguageOptions().EnableThrowWithoutTry);
848+
837849

838850
m_swift_ast_ctx.GetIRGenOptions().OutputKind =
839851
swift::IRGenOutputKind::Module;

0 commit comments

Comments
 (0)