averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85980 from Xazax-hun/recursive-enums-fix

Browse Source 
[cxx-interop] Fix crashing on recursive enums
This commit is contained in:
Gábor Horváth
2025-12-12 16:45:12 +00:00
committed by GitHub
parent 472937e57d 181122edf9
commit 0fcf2e1ce8
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/PrintAsClang/DeclAndTypePrinter.h
View File

@@ -15,10 +15,12 @@
#include "OutputLanguageMode.h"
#include "PrintClangFunction.h"
#include "swift/AST/Decl.h"
#include "swift/AST/Module.h"
#include "swift/AST/Type.h"
// for OptionalTypeKind
#include "swift/AST/TypeRepr.h"
#include "swift/ClangImporter/ClangImporter.h"
#include "llvm/ADT/StringSet.h"
@@ -56,6 +58,7 @@ public:
private:
class Implementation;
friend class Implementation;
friend class DeclAndTypeClangFunctionPrinter;
ModuleDecl &M;
raw_ostream &os;
@@ -69,6 +72,7 @@ private:
bool requiresExposedAttribute;
llvm::StringSet<> &exposedModules;
OutputLanguageMode outputLang;
llvm::DenseMap<Type, std::optional<ClangRepresentation>> typeRepresentations;
/// The name 'CFTypeRef'.
///

18
lib/PrintAsClang/PrintClangFunction.cpp
View File

@@ -1895,13 +1895,27 @@ ClangRepresentation DeclAndTypeClangFunctionPrinter::getTypeRepresentation(
PrimitiveTypeMapping &typeMapping,
SwiftToClangInteropContext &interopContext, DeclAndTypePrinter &declPrinter,
const ModuleDecl *emittedModule, Type ty) {
auto [it, inserted] = declPrinter.typeRepresentations.try_emplace(ty);
// If we already seen the type but do not have a representation yet assume
// representable for now. This can happen for recursive types like:
//
// public enum E {
// case foo([E?])
// }
//
// We make a decision about these types when the function that first
// encountered them returns.
if (!inserted)
return it->second ? (*it->second) : ClangRepresentation::representable;
CFunctionSignatureTypePrinterModifierDelegate delegate;
CFunctionSignatureTypePrinter typePrinter(
llvm::nulls(), llvm::nulls(), typeMapping, OutputLanguageMode::Cxx,
interopContext, delegate, emittedModule, declPrinter,
FunctionSignatureTypeUse::TypeReference);
return typePrinter.visit(ty, OptionalTypeKind::OTK_None,
/*isInOutParam=*/false);
auto result = typePrinter.visit(ty, OptionalTypeKind::OTK_None,
/*isInOutParam=*/false);
declPrinter.typeRepresentations[ty] = result;
return result;
}
void DeclAndTypeClangFunctionPrinter::printTypeName(

12
test/Interop/SwiftToCxx/enums/recursive-enum.swift Normal file
View File

@@ -0,0 +1,12 @@
// RUN: %empty-directory(%t)
// RUN: %target-swift-frontend %s -module-name Enums -clang-header-expose-decls=all-public -typecheck -verify -emit-clang-header-path %t/enums.h
// RUN: %FileCheck %s < %t/enums.h
// RUN: %check-interop-cxx-header-in-clang(%t/enums.h -Wno-unused-private-field -Wno-unused-function -DSWIFT_CXX_INTEROP_HIDE_STL_OVERLAY)
public enum E {
case foo([E?])
}
// CHECK: class SWIFT_SYMBOL("s:5Enums1EO") E final {
// CHECK: SWIFT_INLINE_THUNK swift::Array<swift::Optional<E>> getFoo() const;