Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2201,6 +2201,18 @@ bool DWARFASTParserClang::CompleteRecordType(const DWARFDIE &die,
for (DelayedAddObjCClassProperty &property : delayed_properties)
property.Finalize();
}
} else if (Language::LanguageIsObjC(
static_cast<LanguageType>(die.GetAttributeValueAsUnsigned(
DW_AT_APPLE_runtime_class, eLanguageTypeUnknown)))) {
/// The forward declaration was C++ but the definition is Objective-C.
/// We currently don't handle such situations. In such cases, keep the
/// forward declaration without a definition to avoid violating Clang AST
/// invariants.
LLDB_LOG(GetLog(LLDBLog::Expressions),
"WARNING: Type completion aborted because forward declaration for "
"'{0}' is C++ while definition is Objective-C.",
llvm::StringRef(die.GetName()));
return {};
}

if (!bases.empty()) {
Expand Down
70 changes: 70 additions & 0 deletions lldb/test/Shell/SymbolFile/DWARF/objcxx-forward-decls.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# REQUIRES: system-darwin

# In this test we have two CUs with conflicting forward declaration
# depending on the CU language (one is C++ and the other is Objective-C++).
# We are then stopped in the C++ CU and try to print the type, at which
# point LLDB will try to make it into an Clang AST node. If LLDB were to
# interpret the type as C++ instead of Objective-C, we'd violate Clang
# invariants and crash.
#
# RUN: split-file %s %t
# RUN: %clangxx_host -c -g -x objective-c++ %t/request.m -o %t/request_objc.o
# RUN: %clangxx_host -c -g %t/main.cpp -o %t/main.o
# RUN: %clangxx_host %t/main.o %t/request_objc.o -framework Foundation -o %t/a.out
#
# RUN: %lldb %t/a.out \
# RUN: -o "breakpoint set -p return -X main" \
# RUN: -o run \
# RUN: -o "frame variable r" \
# RUN: -o exit | FileCheck %s
#
# RUN: dsymutil %t/a.out
#
# RUN: %lldb %t/a.out \
# RUN: -o "breakpoint set -p return -X main" \
# RUN: -o run \
# RUN: -o "frame variable r" \
# RUN: -o exit | FileCheck %s --check-prefix=CHECK-DSYM

# CHECK: (lldb) frame variable r
# CHECK-NEXT: (Request) ::r = (m_request = "Hello, World!")

# CHECK-DSYM: (lldb) frame variable r
# CHECK-DSYM-NEXT: (Request) ::r = (m_request = "Hello, World!")

#--- lib.h
#ifndef LIB_H_IN
#define LIB_H_IN

#ifdef __OBJC__
@class NSString;
#else
class NSString;
#endif

struct Request {
NSString * m_request = nullptr;
};

#endif // _H_IN

#--- main.cpp
#include "lib.h"

void process(Request *);

Request r;

int main() {
process(&r);
return 0;
}

#--- request.m
#import <Foundation/Foundation.h>

#include "lib.h"

void process(Request * r) {
r->m_request = @"Hello, World!";
}
Loading