Skip to content

Commit

Permalink
[lldb][ObjC] Don't query objective-c runtime for decls in C++ contexts (
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael137 authored Jun 19, 2024
1 parent 7ef2bd4 commit dadf960
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ void ClangASTSource::FindExternalVisibleDecls(
FindDeclInModules(context, name);
}

if (!context.m_found_type) {
if (!context.m_found_type && m_ast_context->getLangOpts().ObjC) {
FindDeclInObjCRuntime(context, name);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,11 @@ def test(self):
(_, process, _, _) = lldbutil.run_to_name_breakpoint(self, "main")

self.assertState(process.GetState(), lldb.eStateStopped)

# Tests that we can use builtin Objective-C identifiers.
self.expect("expr id", error=False)

# Tests that we can lookup Objective-C decls in the ObjC runtime plugin.
self.expect_expr(
"NSString *c; c == nullptr", result_value="true", result_type="bool"
)
21 changes: 21 additions & 0 deletions lldb/test/Shell/Expr/TestObjCInCXXContext.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// UNSUPPORTED: system-linux, system-windows

// Tests that we don't consult the the Objective-C runtime
// plugin when in a purely C++ context.
//
// RUN: %clangxx_host %p/Inputs/objc-cast.cpp -g -o %t
// RUN: %lldb %t \
// RUN: -o "b main" -o run \
// RUN: -o "expression --language objective-c -- NSString * a; a" \
// RUN: -o "expression --language objective-c++ -- NSString * b; b" \
// RUN: -o "expression NSString" \
// RUN: 2>&1 | FileCheck %s

// CHECK: (lldb) expression --language objective-c -- NSString * a; a
// CHECK-NEXT: (NSString *){{.*}}= nil

// CHECK: (lldb) expression --language objective-c++ -- NSString * b; b
// CHECK-NEXT: (NSString *){{.*}}= nil

// CHECK: (lldb) expression NSString
// CHECK-NEXT: error:{{.*}} use of undeclared identifier 'NSString'

0 comments on commit dadf960

Please sign in to comment.