Merge pull request #40305 from compnerd/semitruck

gardening: make c++98-compat-extra-semi an error

Author: compnerd

CMakeLists.txt

@@ -494,6 +494,12 @@ if(CMAKE_C_COMPILER_ID MATCHES Clang)
   add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror=gnu>)
 endif()
 
+# Make some warnings errors as they are commonly occurring and flood the build
+# with unnecessary noise.
+if(CMAKE_C_COMPILER_ID MATCHES Clang)
+  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Werror=c++98-compat-extra-semi>)
+endif()
+
 # Use dispatch as the system scheduler by default.
 # For convenience, we set this to false when concurrency is disabled.
 set(SWIFT_CONCURRENCY_USES_DISPATCH FALSE)

include/swift/AST/ExtInfo.h

@@ -221,7 +221,7 @@ convertRepresentation(FunctionTypeRepresentation rep) {
     return SILFunctionTypeRepresentation::CFunctionPointer;
   }
   llvm_unreachable("Unhandled FunctionTypeRepresentation!");
-};
+}
 
 inline Optional<FunctionTypeRepresentation>
 convertRepresentation(SILFunctionTypeRepresentation rep) {
@@ -241,7 +241,7 @@ convertRepresentation(SILFunctionTypeRepresentation rep) {
     return None;
   }
   llvm_unreachable("Unhandled SILFunctionTypeRepresentation!");
-};
+}
 
 /// Can this calling convention result in a function being called indirectly
 /// through the runtime.

include/swift/AST/IRGenRequests.h

@@ -35,13 +35,13 @@ class TBDGenDescriptor;
 
 namespace irgen {
   class IRGenModule;
-};
+}
 
 namespace Lowering {
   class TypeConverter;
-};
+}
 
-}; // namespace swift
+} // namespace swift
 
 namespace llvm {
 class GlobalVariable;
@@ -51,9 +51,9 @@ class TargetMachine;
 
 namespace orc {
 class ThreadSafeModule;
-}; // namespace orc
+} // namespace orc
 
-}; // namespace llvm
+} // namespace llvm
 
 namespace swift {
 

include/swift/AST/Stmt.h

@@ -1396,7 +1396,7 @@ inline void simple_display(llvm::raw_ostream &out, Stmt *S) {
     out << Stmt::getKindName(S->getKind());
   else
     out << "(null)";
-};
+}
 
 } // end namespace swift
 

include/swift/AST/TypeAlignments.h

@@ -124,7 +124,7 @@ LLVM_DECLARE_TYPE_ALIGNMENT(swift::SILFunctionType,
 LLVM_DECLARE_TYPE_ALIGNMENT(swift::Stmt, swift::StmtAlignInBits)
 LLVM_DECLARE_TYPE_ALIGNMENT(swift::BraceStmt, swift::StmtAlignInBits)
 
-LLVM_DECLARE_TYPE_ALIGNMENT(swift::ASTContext, swift::ASTContextAlignInBits);
+LLVM_DECLARE_TYPE_ALIGNMENT(swift::ASTContext, swift::ASTContextAlignInBits)
 LLVM_DECLARE_TYPE_ALIGNMENT(swift::DeclContext, swift::DeclContextAlignInBits)
 LLVM_DECLARE_TYPE_ALIGNMENT(swift::FileUnit, swift::DeclContextAlignInBits)
 LLVM_DECLARE_TYPE_ALIGNMENT(swift::DifferentiableAttr, swift::PointerAlignInBits)
@@ -153,7 +153,7 @@ LLVM_DECLARE_TYPE_ALIGNMENT(swift::AttributeBase, swift::AttrAlignInBits)
 
 LLVM_DECLARE_TYPE_ALIGNMENT(swift::TypeRepr, swift::TypeReprAlignInBits)
 
-LLVM_DECLARE_TYPE_ALIGNMENT(swift::CaseLabelItem, swift::PatternAlignInBits);
+LLVM_DECLARE_TYPE_ALIGNMENT(swift::CaseLabelItem, swift::PatternAlignInBits)
 
 static_assert(alignof(void*) >= 2, "pointer alignment is too small");
 

include/swift/AST/Types.h

@@ -1416,7 +1416,7 @@ class BuiltinRawPointerType : public BuiltinType {
     return T->getKind() == TypeKind::BuiltinRawPointer;
   }
 };
-DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinRawPointerType, BuiltinType);
+DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinRawPointerType, BuiltinType)
 
 /// BuiltinRawContinuationType - The builtin raw unsafe continuation type.
 /// In C, this is a non-null AsyncTask*.  This pointer is completely
@@ -1431,7 +1431,7 @@ class BuiltinRawUnsafeContinuationType : public BuiltinType {
     return T->getKind() == TypeKind::BuiltinRawUnsafeContinuation;
   }
 };
-DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinRawUnsafeContinuationType, BuiltinType);
+DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinRawUnsafeContinuationType, BuiltinType)
 
 /// BuiltinExecutorType - The builtin executor-ref type.  In C, this
 /// is the ExecutorRef struct type.
@@ -1444,7 +1444,7 @@ class BuiltinExecutorType : public BuiltinType {
     return T->getKind() == TypeKind::BuiltinExecutor;
   }
 };
-DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinExecutorType, BuiltinType);
+DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinExecutorType, BuiltinType)
 
 /// BuiltinJobType - The builtin job type.  In C, this is a
 /// non-null Job*.  This pointer is completely unmanaged (the unscheduled
@@ -1458,7 +1458,7 @@ class BuiltinJobType : public BuiltinType {
     return T->getKind() == TypeKind::BuiltinJob;
   }
 };
-DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinJobType, BuiltinType);
+DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinJobType, BuiltinType)
 
 /// BuiltinDefaultActorStorageType - The type of the stored property
 /// that's added implicitly to default actors.  No C equivalent because
@@ -1474,7 +1474,7 @@ class BuiltinDefaultActorStorageType : public BuiltinType {
     return T->getKind() == TypeKind::BuiltinDefaultActorStorage;
   }
 };
-DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinDefaultActorStorageType, BuiltinType);
+DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinDefaultActorStorageType, BuiltinType)
 
 /// BuiltinNativeObjectType - The builtin opaque object-pointer type.
 /// Useful for keeping an object alive when it is otherwise being
@@ -1488,7 +1488,7 @@ class BuiltinNativeObjectType : public BuiltinType {
     return T->getKind() == TypeKind::BuiltinNativeObject;
   }
 };
-DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinNativeObjectType, BuiltinType);
+DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinNativeObjectType, BuiltinType)
 
 /// A type that contains an owning reference to a heap object packed with
 /// additional bits. The type uses a bit to discriminate native Swift objects
@@ -1502,7 +1502,7 @@ class BuiltinBridgeObjectType : public BuiltinType {
     return T->getKind() == TypeKind::BuiltinBridgeObject;
   }
 };
-DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinBridgeObjectType, BuiltinType);
+DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinBridgeObjectType, BuiltinType)
 
 /// BuiltinUnsafeValueBufferType - The builtin opaque fixed-size value
 /// buffer type, into which storage for an arbitrary value can be
@@ -1521,7 +1521,7 @@ class BuiltinUnsafeValueBufferType : public BuiltinType {
     return T->getKind() == TypeKind::BuiltinUnsafeValueBuffer;
   }
 };
-DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinUnsafeValueBufferType, BuiltinType);
+DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinUnsafeValueBufferType, BuiltinType)
 
 /// A builtin vector type.
 class BuiltinVectorType : public BuiltinType, public llvm::FoldingSetNode {
@@ -1752,7 +1752,7 @@ class BuiltinIntegerLiteralType : public AnyBuiltinIntegerType {
 
   BuiltinIntegerWidth getWidth() const = delete;
 };
-DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinIntegerLiteralType, AnyBuiltinIntegerType);
+DEFINE_EMPTY_CAN_TYPE_WRAPPER(BuiltinIntegerLiteralType, AnyBuiltinIntegerType)
 
 inline BuiltinIntegerWidth AnyBuiltinIntegerType::getWidth() const {
   if (auto intTy = dyn_cast<BuiltinIntegerType>(this)) {
@@ -4119,7 +4119,7 @@ substOpaqueTypesWithUnderlyingTypes(ProtocolConformanceRef ref, Type origType,
                                     TypeExpansionContext context);
 namespace Lowering {
   class TypeConverter;
-};
+}
 
 /// SILFunctionType - The lowered type of a function value, suitable
 /// for use by SIL.

include/swift/Basic/Fingerprint.h

@@ -24,7 +24,7 @@ namespace llvm {
 namespace yaml {
 class IO;
 }
-}; // namespace llvm
+} // namespace llvm
 
 namespace swift {
 
@@ -118,7 +118,7 @@ class Fingerprint final {
 };
 
 void simple_display(llvm::raw_ostream &out, const Fingerprint &fp);
-}; // namespace swift
+} // namespace swift
 
 namespace swift {
 
@@ -134,11 +134,11 @@ template <> struct StableHasher::Combiner<Fingerprint> {
   }
 };
 
-}; // namespace swift
+} // namespace swift
 
 namespace llvm {
 class raw_ostream;
 raw_ostream &operator<<(raw_ostream &OS, const swift::Fingerprint &fp);
-}; // namespace llvm
+} // namespace llvm
 
 #endif // SWIFT_BASIC_FINGERPRINT_H

include/swift/Runtime/InstrumentsSupport.h

@@ -60,6 +60,6 @@ size_t _swift_indexToSize(size_t idx);
 SWIFT_RUNTIME_EXPORT
 void _swift_zone_init(void);
 
-};
+}
 
 #endif

lib/APIDigester/ModuleAnalyzerNodes.cpp

@@ -179,7 +179,7 @@ SDKNodeDeclImport::SDKNodeDeclImport(SDKNodeInitInfo Info):
   SDKNodeDecl(Info, SDKNodeKind::DeclImport) {}
 
 SDKNodeDeclAssociatedType::SDKNodeDeclAssociatedType(SDKNodeInitInfo Info):
-  SDKNodeDecl(Info, SDKNodeKind::DeclAssociatedType) {};
+  SDKNodeDecl(Info, SDKNodeKind::DeclAssociatedType) {}
 
 SDKNodeDeclSubscript::SDKNodeDeclSubscript(SDKNodeInitInfo Info):
   SDKNodeDeclAbstractFunc(Info, SDKNodeKind::DeclSubscript),

lib/AST/ASTContext.cpp

@@ -1742,7 +1742,7 @@ namespace {
   static StringRef
   pathStringFromFrameworkSearchPath(const SearchPathOptions::FrameworkSearchPath &next) {
     return next.Path;
-  };
+  }
 }
 
 std::vector<std::string> ASTContext::getDarwinImplicitFrameworkSearchPaths()