Update

Author: DataCorrupted

include/swift/AST/DiagnosticsSema.def

@@ -114,7 +114,7 @@ ERROR(could_not_find_imported_enum_case,none,
 
 NOTE(did_you_mean_raw_type,none,
      "did you mean to specify a raw type on the enum declaration?", ())
-     
+
 NOTE(did_you_mean_generic_param_as_conformance,none,
      "did you mean to declare %0 as a protocol conformance for %1?", (DeclName, Type))
 
@@ -1273,7 +1273,7 @@ REMARK(transitive_dependency_behavior,none,
        "%1 has %select{a required|an optional|an ignored}2 "
        "transitive dependency on '%0'",
        (StringRef, Identifier, unsigned))
-       
+
 REMARK(explicit_interface_build_skipped,none,
        "Skipped rebuilding module at %0 - up-to-date",
        (StringRef))
@@ -1527,7 +1527,7 @@ ERROR(optional_self_not_unwrapped,none,
       "to make control flow explicit", ())
 NOTE(optional_self_chain,none,
      "reference 'self?.' explicitly", ())
-    
+
 ERROR(missing_unwrap_optional_try,none,
       "value of optional type %0 not unwrapped; did you mean to use 'try!' "
       "or chain with '?'?",
@@ -1538,7 +1538,7 @@ NOTE(missing_forced_downcast, none,
      "did you mean to use 'as!' to force downcast?", ())
 NOTE(missing_optional_downcast, none,
      "did you mean to use 'as?' to conditionally downcast?", ())
-     
+
 WARNING(coercion_may_fail_warning,none,
         "coercion from %0 to %1 may fail; use 'as?' or 'as!' instead",
         (Type, Type))
@@ -3984,7 +3984,7 @@ NOTE(automatic_protocol_synthesis_unsupported,none,
     "automatic synthesis of %0 is not supported for %kindonly1 declarations",
     (const ProtocolDecl *, const NominalTypeDecl *))
 NOTE(comparable_synthesis_raw_value_not_allowed, none,
-     "enum declares raw type %0, preventing synthesized conformance of %1 to %2", 
+     "enum declares raw type %0, preventing synthesized conformance of %1 to %2",
      (Type, Type, Type))
 
 // Dynamic Self
@@ -4232,7 +4232,7 @@ ERROR(attr_rawlayout_cannot_have_alignment_attr,none,
       "type with @_rawLayout cannot also have an @_alignment attribute", ())
 ERROR(attr_rawlayout_invalid_count_type,none,
       "@_rawLayout count must either be integer literal or a generic argument", ())
-      
+
 // lazy
 ERROR(lazy_not_on_let,none,
       "'lazy' cannot be used on a let", ())
@@ -4576,15 +4576,15 @@ ERROR(unordered_adjacent_operators,none,
 ERROR(missing_builtin_precedence_group,none,
       "broken standard library: missing builtin precedence group %0",
       (Identifier))
-WARNING(nan_comparison, none, 
+WARNING(nan_comparison, none,
        "comparison with '.nan' using %0 is always %select{false|true}1, use "
        "'%2.isNaN' to check if '%3' %select{is not a number|is a number}1",
        (Identifier, bool, StringRef, StringRef))
-WARNING(nan_comparison_without_isnan, none, 
-       "comparison with '.nan' using %0 is always %select{false|true}1", 
+WARNING(nan_comparison_without_isnan, none,
+       "comparison with '.nan' using %0 is always %select{false|true}1",
        (Identifier, bool))
-WARNING(nan_comparison_both_nan, none, 
-       "'.nan' %0 '.nan' is always %select{false|true}1", 
+WARNING(nan_comparison_both_nan, none,
+       "'.nan' %0 '.nan' is always %select{false|true}1",
        (StringRef, bool))
 
 // If you change this, also change enum TryKindForDiagnostics.
@@ -4672,7 +4672,7 @@ ERROR(could_not_infer_pack_element,none,
 NOTE(note_in_opening_pack_element,none,
       "in inferring pack element #%0 of '%1'", (unsigned,StringRef))
 
-      
+
 ERROR(type_of_expression_is_ambiguous,none,
       "type of expression is ambiguous without a type annotation", ())
 
@@ -4728,7 +4728,7 @@ ERROR(should_use_empty_dictionary_literal,none,
 WARNING(duplicated_literal_keys_in_dictionary_literal, none,
         "dictionary literal of type %0 has duplicate entries for %1 literal key%select{ %3|}2",
         (Type, StringRef, bool, StringRef))
-NOTE(duplicated_key_declared_here, none, 
+NOTE(duplicated_key_declared_here, none,
      "duplicate key declared here", ())
 
 // Generic specializations
@@ -5462,7 +5462,7 @@ ERROR(thrown_type_not_error,none,
       "thrown type %0 does not conform to the 'Error' protocol", (Type))
 
 ERROR(typed_thrown_in_objc_forbidden,none,
-      "typed throw can't be applied to @objc functions", ())
+      "@objc functions cannot have typed throw", ())
 
 //------------------------------------------------------------------------------
 // MARK: Concurrency
@@ -5603,7 +5603,7 @@ NOTE(property_requires_actor,none,
       "initializer for %kind0 is %1",
       (const VarDecl *, ActorIsolation))
 ERROR(isolated_default_argument_context,none,
-      "%0 default value in a %1 context", 
+      "%0 default value in a %1 context",
       (ActorIsolation, ActorIsolation))
 ERROR(conflicting_default_argument_isolation,none,
       "default argument cannot be both %0 and %1",
@@ -6359,7 +6359,7 @@ ERROR(differentiable_function_type_void_result,
       "differentiable inout parameter, i.e. a non-'@noDerivative' parameter "
       "whose type conforms to 'Differentiable'",
       ())
-ERROR(differentiable_function_type_no_differentiability_parameters, 
+ERROR(differentiable_function_type_no_differentiability_parameters,
       none,
       "'@differentiable' function type requires at least one differentiability "
       "parameter, i.e. a non-'@noDerivative' parameter whose type conforms to "
@@ -8357,7 +8357,7 @@ ERROR(safe_and_unsafe_attr,none,
       "%kindbase0 cannot be both @safe and @unsafe", (const Decl *))
 
 GROUPED_WARNING(unsafe_superclass,StrictMemorySafety,none,
-     "%kindbase0 has superclass involving unsafe type %1", 
+     "%kindbase0 has superclass involving unsafe type %1",
      (const ValueDecl *, Type))
 
 GROUPED_WARNING(conformance_involves_unsafe,StrictMemorySafety,none,
@@ -8674,7 +8674,7 @@ GROUPED_WARNING(
 ERROR(extensible_attr_on_frozen_type,none,
       "cannot use '@extensible' together with '@frozen'", ())
 
-ERROR(extensible_attr_on_internal_type,none, 
+ERROR(extensible_attr_on_internal_type,none,
       "'@extensible' attribute can only be applied to public or package "
       "declarations, but %0 is "
       "%select{private|fileprivate|internal|%error|%error|%error}1",

lib/Sema/TypeCheckDecl.cpp

@@ -2572,9 +2572,8 @@ InterfaceTypeRequest::evaluate(Evaluator &eval, ValueDecl *D) const {
         auto thrownTypeRepr = AFD->getThrownTypeRepr();
         SourceLoc loc =
             (thrownTypeRepr) ? thrownTypeRepr->getLoc() : AFD->getLoc();
-        if (AFD->getAttrs().hasAttribute<ObjCAttr>()) {
-          Context.Diags.diagnose(loc, diag::typed_thrown_in_objc_forbidden,
-                                 thrownTy);
+        if (AFD->getAttrs().hasAttribute<ObjCAttr>() && thrownTy) {
+          Context.Diags.diagnose(loc, diag::typed_thrown_in_objc_forbidden);
         } else if (!checkConformance(thrownTyInContext, errorProto)) {
           Context.Diags.diagnose(loc, diag::thrown_type_not_error, thrownTy);
         }

test/decl/func/typed_throws.swift

@@ -221,4 +221,4 @@ enum ObjCError: Int, Error {
   case Others
 }
 @objc func objcTypedThrow() throws(ObjCError) -> () {}
-// expected-error@-1 {{typed throw can't be applied to @objc functions}}
+// expected-error@-1 {{@objc functions cannot have typed throw}}