Skip to content

Commit ef74078

Browse files
hamishknighthamishknight
committed
xxx
1 parent 3639d86 commit ef74078

File tree

9 files changed

+174
-112
lines changed

9 files changed

+174
-112
lines changed

‎include/swift/AST/CASTBridging.h

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,14 @@ SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
3838
void *_Nonnull raw; \
3939
} Bridged##Name;
4040

41+
// For nullable nodes, define both a nullable and non-null variant.
4142
#define AST_BRIDGING_WRAPPER_NULLABLE(Name) \
4243
typedef struct { \
4344
void *_Nullable raw; \
45+
} BridgedNullable##Name; \
46+
\
47+
typedef struct { \
48+
void *_Nonnull raw; \
4449
} Bridged##Name;
4550

4651
#include "swift/AST/ASTBridgingWrappers.def"
@@ -339,7 +344,7 @@ TopLevelCodeDecl_createExpr(BridgedASTContext cContext,
339344
SWIFT_NAME("BridgedReturnStmt.createParsed(_:returnKeywordLoc:expr:)")
340345
BridgedReturnStmt ReturnStmt_createParsed(BridgedASTContext cContext,
341346
BridgedSourceLoc cLoc,
342-
BridgedExpr expr);
347+
BridgedNullableExpr expr);
343348

344349
SWIFT_NAME("BridgedSequenceExpr.createParsed(_:exprs:)")
345350
BridgedSequenceExpr SequenceExpr_createParsed(BridgedASTContext cContext,
@@ -410,7 +415,7 @@ SWIFT_NAME("BridgedIfStmt.createParsed(_:ifKeywordLoc:condition:thenStmt:"
410415
BridgedIfStmt IfStmt_createParsed(BridgedASTContext cContext,
411416
BridgedSourceLoc cIfLoc, BridgedExpr cond,
412417
BridgedStmt then, BridgedSourceLoc cElseLoc,
413-
BridgedStmt elseStmt);
418+
BridgedNullableStmt elseStmt);
414419

415420
SWIFT_NAME("BridgedBraceStmt.createParsed(_:lBraceLoc:elements:rBraceLoc:)")
416421
BridgedBraceStmt BraceStmt_createParsed(BridgedASTContext cContext,
@@ -424,8 +429,8 @@ BridgedParamDecl ParamDecl_createParsed(
424429
BridgedASTContext cContext, BridgedDeclContext cDeclContext,
425430
BridgedSourceLoc cSpecifierLoc, BridgedIdentifier cFirstName,
426431
BridgedSourceLoc cFirstNameLoc, BridgedIdentifier cSecondName,
427-
BridgedSourceLoc cSecondNameLoc, BridgedTypeRepr type,
428-
BridgedExpr defaultValue);
432+
BridgedSourceLoc cSecondNameLoc, BridgedNullableTypeRepr type,
433+
BridgedNullableExpr defaultValue);
429434

430435
SWIFT_NAME("BridgedConstructorDecl.setParsedBody(self:_:)")
431436
void ConstructorDecl_setParsedBody(BridgedConstructorDecl decl,
@@ -446,11 +451,11 @@ BridgedFuncDecl FuncDecl_createParsed(
446451
BridgedASTContext cContext, BridgedDeclContext cDeclContext,
447452
BridgedSourceLoc cStaticLoc, BridgedSourceLoc cFuncKeywordLoc,
448453
BridgedIdentifier cName, BridgedSourceLoc cNameLoc,
449-
BridgedGenericParamList genericParamList,
454+
BridgedNullableGenericParamList genericParamList,
450455
BridgedParameterList parameterList, BridgedSourceLoc cAsyncLoc,
451-
BridgedSourceLoc cThrowsLoc, BridgedTypeRepr thrownType,
452-
BridgedTypeRepr returnType,
453-
BridgedTrailingWhereClause opaqueGenericWhereClause);
456+
BridgedSourceLoc cThrowsLoc, BridgedNullableTypeRepr thrownType,
457+
BridgedNullableTypeRepr returnType,
458+
BridgedNullableTrailingWhereClause opaqueGenericWhereClause);
454459

455460
SWIFT_NAME(
456461
"BridgedConstructorDecl.createParsed(_:declContext:initKeywordLoc:"
@@ -459,10 +464,10 @@ SWIFT_NAME(
459464
BridgedConstructorDecl ConstructorDecl_createParsed(
460465
BridgedASTContext cContext, BridgedDeclContext cDeclContext,
461466
BridgedSourceLoc cInitKeywordLoc, BridgedSourceLoc cFailabilityMarkLoc,
462-
_Bool isIUO, BridgedGenericParamList genericParams,
467+
_Bool isIUO, BridgedNullableGenericParamList genericParams,
463468
BridgedParameterList parameterList, BridgedSourceLoc cAsyncLoc,
464-
BridgedSourceLoc cThrowsLoc, BridgedTypeRepr thrownType,
465-
BridgedTrailingWhereClause genericWhereClause);
469+
BridgedSourceLoc cThrowsLoc, BridgedNullableTypeRepr thrownType,
470+
BridgedNullableTrailingWhereClause genericWhereClause);
466471

467472
SWIFT_NAME(
468473
"BridgedDestructorDecl.createParsed(_:declContext:deinitKeywordLoc:)")
@@ -493,9 +498,9 @@ SWIFT_NAME(
493498
BridgedTypeAliasDecl TypeAliasDecl_createParsed(
494499
BridgedASTContext cContext, BridgedDeclContext cDeclContext,
495500
BridgedSourceLoc cAliasKeywordLoc, BridgedIdentifier cName,
496-
BridgedSourceLoc cNameLoc, BridgedGenericParamList genericParamList,
501+
BridgedSourceLoc cNameLoc, BridgedNullableGenericParamList genericParamList,
497502
BridgedSourceLoc cEqualLoc, BridgedTypeRepr underlyingType,
498-
BridgedTrailingWhereClause genericWhereClause);
503+
BridgedNullableTrailingWhereClause genericWhereClause);
499504

500505
SWIFT_NAME("BridgedNominalTypeDecl.setParsedMembers(self:_:)")
501506
void NominalTypeDecl_setParsedMembers(BridgedNominalTypeDecl decl,
@@ -511,9 +516,9 @@ SWIFT_NAME(
511516
BridgedNominalTypeDecl EnumDecl_createParsed(
512517
BridgedASTContext cContext, BridgedDeclContext cDeclContext,
513518
BridgedSourceLoc cEnumKeywordLoc, BridgedIdentifier cName,
514-
BridgedSourceLoc cNameLoc, BridgedGenericParamList genericParamList,
519+
BridgedSourceLoc cNameLoc, BridgedNullableGenericParamList genericParamList,
515520
BridgedArrayRef cInheritedTypes,
516-
BridgedTrailingWhereClause genericWhereClause,
521+
BridgedNullableTrailingWhereClause genericWhereClause,
517522
BridgedSourceRange cBraceRange);
518523

519524
SWIFT_NAME(
@@ -527,18 +532,18 @@ SWIFT_NAME("BridgedEnumElementDecl.createParsed(_:declContext:name:nameLoc:"
527532
BridgedEnumElementDecl EnumElementDecl_createParsed(
528533
BridgedASTContext cContext, BridgedDeclContext cDeclContext,
529534
BridgedIdentifier cName, BridgedSourceLoc cNameLoc,
530-
BridgedParameterList parameterList, BridgedSourceLoc cEqualsLoc,
531-
BridgedExpr opaqueRawValue);
535+
BridgedNullableParameterList parameterList, BridgedSourceLoc cEqualsLoc,
536+
BridgedNullableExpr opaqueRawValue);
532537

533538
SWIFT_NAME("BridgedStructDecl.createParsed(_:declContext:structKeywordLoc:name:"
534539
"nameLoc:genericParamList:inheritedTypes:genericWhereClause:"
535540
"braceRange:)")
536541
BridgedNominalTypeDecl StructDecl_createParsed(
537542
BridgedASTContext cContext, BridgedDeclContext cDeclContext,
538543
BridgedSourceLoc cStructKeywordLoc, BridgedIdentifier cName,
539-
BridgedSourceLoc cNameLoc, BridgedGenericParamList genericParamList,
544+
BridgedSourceLoc cNameLoc, BridgedNullableGenericParamList genericParamList,
540545
BridgedArrayRef cInheritedTypes,
541-
BridgedTrailingWhereClause genericWhereClause,
546+
BridgedNullableTrailingWhereClause genericWhereClause,
542547
BridgedSourceRange cBraceRange);
543548

544549
SWIFT_NAME(
@@ -547,9 +552,9 @@ SWIFT_NAME(
547552
BridgedNominalTypeDecl ClassDecl_createParsed(
548553
BridgedASTContext cContext, BridgedDeclContext cDeclContext,
549554
BridgedSourceLoc cClassKeywordLoc, BridgedIdentifier cName,
550-
BridgedSourceLoc cNameLoc, BridgedGenericParamList genericParamList,
555+
BridgedSourceLoc cNameLoc, BridgedNullableGenericParamList genericParamList,
551556
BridgedArrayRef cInheritedTypes,
552-
BridgedTrailingWhereClause genericWhereClause,
557+
BridgedNullableTrailingWhereClause genericWhereClause,
553558
BridgedSourceRange cBraceRange, _Bool isActor);
554559

555560
SWIFT_NAME(
@@ -561,7 +566,7 @@ BridgedNominalTypeDecl ProtocolDecl_createParsed(
561566
BridgedSourceLoc cProtocolKeywordLoc, BridgedIdentifier cName,
562567
BridgedSourceLoc cNameLoc, BridgedArrayRef cPrimaryAssociatedTypeNames,
563568
BridgedArrayRef cInheritedTypes,
564-
BridgedTrailingWhereClause genericWhereClause,
569+
BridgedNullableTrailingWhereClause genericWhereClause,
565570
BridgedSourceRange cBraceRange);
566571

567572
SWIFT_NAME("BridgedAssociatedTypeDecl.createParsed(_:declContext:"
@@ -571,8 +576,8 @@ BridgedAssociatedTypeDecl AssociatedTypeDecl_createParsed(
571576
BridgedASTContext cContext, BridgedDeclContext cDeclContext,
572577
BridgedSourceLoc cAssociatedtypeKeywordLoc, BridgedIdentifier cName,
573578
BridgedSourceLoc cNameLoc, BridgedArrayRef cInheritedTypes,
574-
BridgedTypeRepr opaqueDefaultType,
575-
BridgedTrailingWhereClause genericWhereClause);
579+
BridgedNullableTypeRepr opaqueDefaultType,
580+
BridgedNullableTrailingWhereClause genericWhereClause);
576581

577582
SWIFT_NAME(
578583
"BridgedExtensionDecl.createParsed(_:declContext:extensionKeywordLoc:"
@@ -581,7 +586,7 @@ BridgedExtensionDecl ExtensionDecl_createParsed(
581586
BridgedASTContext cContext, BridgedDeclContext cDeclContext,
582587
BridgedSourceLoc cExtensionKeywordLoc, BridgedTypeRepr opaqueExtendedType,
583588
BridgedArrayRef cInheritedTypes,
584-
BridgedTrailingWhereClause genericWhereClause,
589+
BridgedNullableTrailingWhereClause genericWhereClause,
585590
BridgedSourceRange cBraceRange);
586591

587592
typedef enum ENUM_EXTENSIBILITY_ATTR(closed) {
@@ -648,7 +653,8 @@ SWIFT_NAME("BridgedGenericParamList.createParsed(_:leftAngleLoc:parameters:"
648653
"genericWhereClause:rightAngleLoc:)")
649654
BridgedGenericParamList GenericParamList_createParsed(
650655
BridgedASTContext cContext, BridgedSourceLoc cLeftAngleLoc,
651-
BridgedArrayRef cParameters, BridgedTrailingWhereClause genericWhereClause,
656+
BridgedArrayRef cParameters,
657+
BridgedNullableTrailingWhereClause genericWhereClause,
652658
BridgedSourceLoc cRightAngleLoc);
653659

654660
SWIFT_NAME(
@@ -657,7 +663,7 @@ SWIFT_NAME(
657663
BridgedGenericTypeParamDecl GenericTypeParamDecl_createParsed(
658664
BridgedASTContext cContext, BridgedDeclContext cDeclContext,
659665
BridgedSourceLoc cEachLoc, BridgedIdentifier cName,
660-
BridgedSourceLoc cNameLoc, BridgedTypeRepr opaqueInheritedType,
666+
BridgedSourceLoc cNameLoc, BridgedNullableTypeRepr opaqueInheritedType,
661667
size_t index);
662668

663669
SWIFT_NAME(
@@ -720,13 +726,11 @@ BridgedTypeRepr DictionaryTypeRepr_createParsed(BridgedASTContext cContext,
720726

721727
SWIFT_NAME("BridgedFunctionTypeRepr.createParsed(_:argsType:asyncLoc:throwsLoc:"
722728
"thrownType:arrowLoc:resultType:)")
723-
BridgedTypeRepr FunctionTypeRepr_createParsed(BridgedASTContext cContext,
724-
BridgedTypeRepr argsTy,
725-
BridgedSourceLoc cAsyncLoc,
726-
BridgedSourceLoc cThrowsLoc,
727-
BridgedTypeRepr thrownType,
728-
BridgedSourceLoc cArrowLoc,
729-
BridgedTypeRepr resultType);
729+
BridgedTypeRepr FunctionTypeRepr_createParsed(
730+
BridgedASTContext cContext, BridgedTypeRepr argsTy,
731+
BridgedSourceLoc cAsyncLoc, BridgedSourceLoc cThrowsLoc,
732+
BridgedNullableTypeRepr thrownType, BridgedSourceLoc cArrowLoc,
733+
BridgedTypeRepr resultType);
730734

731735
SWIFT_NAME("BridgedGenericIdentTypeRepr.createParsed(_:name:nameLoc:"
732736
"genericArgs:leftAngleLoc:rightAngleLoc:)")

0 commit comments

Comments
 (0)