[Import as error] Error on non-prototyped function declarations

Author: milseman

include/swift/AST/DiagnosticsClangImporter.def

@@ -63,6 +63,8 @@ ERROR(swift_name_protocol_static, none, "swift_name cannot be used to define "
                                          "%select{static member|init}0 on "
                                          "protocol",
       (bool))
+ERROR(swift_name_no_prototype, none,
+      "swift_name cannot be used on a non-prototyped function declaration", ())
 
 WARNING(inconsistent_swift_name,none,
         "inconsistent Swift name for Objective-C %select{method|property}0 "

lib/ClangImporter/ImportDecl.cpp

@@ -2344,8 +2344,16 @@ namespace {
         return nullptr;
       }
 
+      if (!decl->hasPrototype()) {
+        // FIXME: source location...
+        Impl.SwiftContext.Diags.diagnose({}, diag::swift_name_no_prototype);
+        Impl.SwiftContext.Diags.diagnose({}, diag::note_while_importing,
+                                         decl->getName());
+        return nullptr;
+      }
+
       bool allowNSUIntegerAsInt =
-        Impl.shouldAllowNSUIntegerAsInt(isInSystemModule(dc), decl);
+          Impl.shouldAllowNSUIntegerAsInt(isInSystemModule(dc), decl);
 
       auto &SwiftCtx = Impl.SwiftContext;
       SourceLoc noLoc{};

test/IDE/Inputs/custom-modules/ImportAsMember.h

@@ -46,7 +46,7 @@ extern int IAMStruct1StaticGetProperty(void)
     __attribute__((swift_name("getter:Struct1.property()")));
 extern int IAMStruct1StaticSetProperty(int i)
     __attribute__((swift_name("setter:Struct1.property(i:)")));
-extern int IAMStruct1StaticGetOnlyProperty()
+extern int IAMStruct1StaticGetOnlyProperty(void)
     __attribute__((swift_name("getter:Struct1.getOnlyProperty()")));
 
 extern void IAMStruct1SelfComesLast(double x, struct IAMStruct1 s)

test/IDE/Inputs/custom-modules/InferImportAsMember.h

@@ -51,38 +51,38 @@ extern void IAMStruct1SetNonPropertyNoGet(struct IAMStruct1 s, double x);
 
 /// Various static functions that can't quite be imported as properties.
 // Too many parameters
-extern float IAMStruct1StaticGetNonPropertyNumParams();
+extern float IAMStruct1StaticGetNonPropertyNumParams(void);
 extern void IAMStruct1StaticSetNonPropertyNumParams(float a,
                                               float b);
 extern void IAMStruct1StaticGetNonPropertyNumParamsGetter(double d);
 
 // Set type doesn't match get type
-extern float IAMStruct1StaticGetNonPropertyType();
+extern float IAMStruct1StaticGetNonPropertyType(void);
 extern void IAMStruct1StaticSetNonPropertyType(double x);
 
 // Didn't find self on setter
-extern float IAMStruct1StaticGetNonPropertyNoSelf();
+extern float IAMStruct1StaticGetNonPropertyNoSelf(void);
 extern void IAMStruct1StaticSetNonPropertyNoSelf(double x, double y);
 
 // No set only properties
 extern void IAMStruct1StaticSetNonPropertyNoGet(double x);
 
 /// Static method
-extern double IAMStruct1StaticMethod();
-extern double IAMStruct1TLAThreeLetterAcronym();
+extern double IAMStruct1StaticMethod(void);
+extern double IAMStruct1TLAThreeLetterAcronym(void);
 
 /// Static computed properties
-extern double IAMStruct1StaticGetProperty();
+extern double IAMStruct1StaticGetProperty(void);
 extern double IAMStruct1StaticSetProperty(double);
-extern double IAMStruct1StaticGetOnlyProperty();
+extern double IAMStruct1StaticGetOnlyProperty(void);
 
 /// Omit needless words
 extern double IAMStruct1ONWNeedlessTypeArgLabel(double Double);
 
 /// Fuzzy
-extern struct IAMStruct1 IAMFuzzyStruct1Create();
-extern struct IAMStruct1 IAMFuzzyStruct1CreateWithFuzzyName();
-extern struct IAMStruct1 IAMFuzzyStruct1CreateFuzzyName();
+extern struct IAMStruct1 IAMFuzzyStruct1Create(void);
+extern struct IAMStruct1 IAMFuzzyStruct1CreateWithFuzzyName(void);
+extern struct IAMStruct1 IAMFuzzyStruct1CreateFuzzyName(void);
 
 extern double __IAMStruct1IgnoreMe(struct IAMStruct1 s);
 
@@ -104,7 +104,7 @@ const TDStruct TDStructCreateWithFloat(float Float);
 typedef const struct __attribute__((objc_bridge(id))) __IAMClass *IAMClassRef;
 typedef IAMClassRef IAMOtherName;
 
-extern unsigned IAMClassGetTypeID();
+extern unsigned IAMClassGetTypeID(void);
 extern IAMClassRef IAMClassCreate(double i);
 extern void IAMClassInvert(IAMOtherName iamOtherName);