Skip to content

Commit 3c2cd5c

Browse files
committed
[upstreaming] Revert check_swift parameter to IsPossibleDynamicType
1 parent 7f7cb0c commit 3c2cd5c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,8 @@ ObjCLanguage::GetPossibleFormattersMatches(ValueObject &valobj,
887887
bool canBeObjCDynamic =
888888
compiler_type.IsPossibleDynamicType(nullptr, check_cpp, check_objc);
889889

890-
if (canBeObjCDynamic) {
890+
bool is_clang_type = llvm::isa<ClangASTContext>(compiler_type.GetTypeSystem());
891+
if (canBeObjCDynamic && is_clang_type) {
891892
do {
892893
lldb::ProcessSP process_sp = valobj.GetProcessSP();
893894
if (!process_sp)

lldb/source/Plugins/Language/Swift/SwiftLanguage.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -886,9 +886,8 @@ std::vector<ConstString> SwiftLanguage::GetPossibleFormattersMatches(
886886

887887
const bool check_cpp = false;
888888
const bool check_objc = false;
889-
const bool check_swift = true;
890889
bool canBeSwiftDynamic = compiler_type.IsPossibleDynamicType(
891-
nullptr, check_cpp, check_objc, check_swift);
890+
nullptr, check_cpp, check_objc);
892891

893892
if (canBeSwiftDynamic) {
894893
do {

0 commit comments

Comments
 (0)