Merge pull request #8330 from apple/jan_svoboda/reduce-upstream-diff

[clang] Reduce upstream diff

Author: jansvoboda11

clang/include/clang/APINotes/APINotesReader.h

@@ -61,12 +61,12 @@ class APINotesReader {
     llvm::SmallVector<std::pair<llvm::VersionTuple, T>, 1> Results;
 
     /// The index of the result that is the "selected" set based on the desired
-    /// Swift version, or \c Results.size() if nothing matched.
-    unsigned Selected;
+    /// Swift version, or null if nothing matched.
+    std::optional<unsigned> Selected;
 
   public:
     /// Form an empty set of versioned information.
-    VersionedInfo(std::nullopt_t) : Selected(0) {}
+    VersionedInfo(std::nullopt_t) : Selected(std::nullopt) {}
 
     /// Form a versioned info set given the desired version and a set of
     /// results.
@@ -75,17 +75,14 @@ class APINotesReader {
         llvm::SmallVector<std::pair<llvm::VersionTuple, T>, 1> Results);
 
     /// Retrieve the selected index in the result set.
-    std::optional<unsigned> getSelected() const {
-      if (Selected == Results.size())
-        return std::nullopt;
-      return Selected;
-    }
+    std::optional<unsigned> getSelected() const { return Selected; }
 
     /// Return the number of versioned results we know about.
     unsigned size() const { return Results.size(); }
 
     /// Access all versioned results.
     const std::pair<llvm::VersionTuple, T> *begin() const {
+      assert(!Results.empty());
       return Results.begin();
     }
     const std::pair<llvm::VersionTuple, T> *end() const {
@@ -94,6 +91,7 @@ class APINotesReader {
 
     /// Access a specific versioned result.
     const std::pair<llvm::VersionTuple, T> &operator[](unsigned index) const {
+      assert(index < Results.size());
       return Results[index];
     }
   };

clang/include/clang/APINotes/APINotesWriter.h

@@ -22,10 +22,6 @@
 
 #include <memory>
 
-namespace llvm {
-  class raw_ostream;
-}
-
 namespace clang {
 class FileEntry;
 

clang/include/clang/APINotes/Types.h

@@ -148,16 +148,10 @@ class CommonTypeInfo : public CommonEntityInfo {
     return SwiftBridge;
   }
 
-  void setSwiftBridge(const std::optional<std::string> &SwiftType) {
+  void setSwiftBridge(std::optional<std::string> SwiftType) {
     SwiftBridge = SwiftType;
   }
 
-  void setSwiftBridge(const std::optional<llvm::StringRef> &SwiftType) {
-    SwiftBridge = SwiftType
-                      ? std::optional<std::string>(std::string(*SwiftType))
-                      : std::nullopt;
-  }
-
   const std::optional<std::string> &getNSErrorDomain() const {
     return NSErrorDomain;
   }
@@ -767,15 +761,9 @@ inline bool operator==(const TypedefInfo &LHS, const TypedefInfo &RHS) {
 inline bool operator!=(const TypedefInfo &LHS, const TypedefInfo &RHS) {
   return !(LHS == RHS);
 }
-} // namespace api_notes
-} // namespace clang
 
-#include "llvm/ADT/ArrayRef.h"
-
-namespace clang {
-namespace api_notes {
 /// The file extension used for the source representation of API notes.
-static const char SOURCE_APINOTES_EXTENSION[] = "apinotes";
+static const constexpr char SOURCE_APINOTES_EXTENSION[] = "apinotes";
 
 /// Opaque context ID used to refer to an Objective-C class or protocol or a C++
 /// namespace.

clang/include/clang/Basic/Attr.td

@@ -2653,47 +2653,6 @@ def Regparm : TypeAttr {
   let ASTNode = 0;
 }
 
-def SwiftImportAsNonGeneric : InheritableAttr {
-  // This attribute has no spellings as it is only ever created implicitly
-  // from API notes.
-  let Spellings = [];
-  let SemaHandler = 0;
-  let Documentation = [InternalOnly];
-}
-
-def SwiftImportPropertyAsAccessors : InheritableAttr { 
-  // This attribute has no spellings as it is only ever created implicitly
-  // from API notes.
-  let Spellings = [];
-  let SemaHandler = 0;
-  let Documentation = [InternalOnly];
-}
-
-def SwiftVersioned : Attr {
-  // This attribute has no spellings as it is only ever created implicitly
-  // from API notes.
-  let Spellings = [];
-  let Args = [VersionArgument<"Version">, AttrArgument<"AttrToAdd">,
-              BoolArgument<"IsReplacedByActive">];
-  let SemaHandler = 0;
-  let Documentation = [InternalOnly];
-}
-
-def SwiftVersionedRemoval : Attr {
-  // This attribute has no spellings as it is only ever created implicitly
-  // from API notes.
-  let Spellings = [];
-  let Args = [VersionArgument<"Version">, UnsignedArgument<"RawKind">,
-              BoolArgument<"IsReplacedByActive">];
-  let SemaHandler = 0;
-  let Documentation = [InternalOnly];
-  let AdditionalMembers = [{
-    attr::Kind getAttrKindToRemove() const {
-      return static_cast<attr::Kind>(getRawKind());
-    }
-  }];
-}
-
 def SwiftAsyncName : InheritableAttr {
   let Spellings = [GNU<"swift_async_name">];
   let Args = [StringArgument<"Name">];
@@ -2741,6 +2700,22 @@ def SwiftError : InheritableAttr {
   let Documentation = [SwiftErrorDocs];
 }
 
+def SwiftImportAsNonGeneric : InheritableAttr {
+  // This attribute has no spellings as it is only ever created implicitly
+  // from API notes.
+  let Spellings = [];
+  let SemaHandler = 0;
+  let Documentation = [InternalOnly];
+}
+
+def SwiftImportPropertyAsAccessors : InheritableAttr { 
+  // This attribute has no spellings as it is only ever created implicitly
+  // from API notes.
+  let Spellings = [];
+  let SemaHandler = 0;
+  let Documentation = [InternalOnly];
+}
+
 def SwiftName : InheritableAttr {
   let Spellings = [GNU<"swift_name">];
   let Args = [StringArgument<"Name">];
@@ -2762,6 +2737,31 @@ def SwiftPrivate : InheritableAttr {
   let SimpleHandler = 1;
 }
 
+def SwiftVersioned : Attr {
+  // This attribute has no spellings as it is only ever created implicitly
+  // from API notes.
+  let Spellings = [];
+  let Args = [VersionArgument<"Version">, AttrArgument<"AttrToAdd">,
+              BoolArgument<"IsReplacedByActive">];
+  let SemaHandler = 0;
+  let Documentation = [InternalOnly];
+}
+
+def SwiftVersionedRemoval : Attr {
+  // This attribute has no spellings as it is only ever created implicitly
+  // from API notes.
+  let Spellings = [];
+  let Args = [VersionArgument<"Version">, UnsignedArgument<"RawKind">,
+              BoolArgument<"IsReplacedByActive">];
+  let SemaHandler = 0;
+  let Documentation = [InternalOnly];
+  let AdditionalMembers = [{
+    attr::Kind getAttrKindToRemove() const {
+      return static_cast<attr::Kind>(getRawKind());
+    }
+  }];
+}
+
 def NoDeref : TypeAttr {
   let Spellings = [Clang<"noderef">];
   let Documentation = [NoDerefDocs];

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -4614,8 +4614,8 @@ def warn_attr_swift_name_decl_missing_params
     InGroup<SwiftNameAttribute>;
 
 def err_attr_swift_error_no_error_parameter : Error<
-  "%0 attribute can only be applied to a %select{function|method}1 "
-  "with an error parameter">;
+  "%0 attribute can only be applied to a %select{function|method}1 with an "
+  "error parameter">;
 def err_attr_swift_error_return_type : Error<
   "%0 attribute with '%1' convention can only be applied to a "
   "%select{function|method}2 returning %select{an integral type|a pointer}3">;
@@ -10876,7 +10876,7 @@ let CategoryName = "API Notes Issue" in {
 def err_incompatible_replacement_type : Error<
   "API notes replacement type %0 has a different size from original type %1">;
 
-}
+} // end of API Notes category
 
 let CategoryName = "OpenMP Issue" in {
 // OpenMP support.

clang/include/clang/Basic/LangOptions.def

@@ -423,6 +423,7 @@ LANGOPT(ApplePragmaPack, 1, 0, "Apple gcc-compatible #pragma pack handling")
 LANGOPT(XLPragmaPack, 1, 0, "IBM XL #pragma pack handling")
 
 LANGOPT(RetainCommentsFromSystemHeaders, 1, 0, "retain documentation comments from system headers in the AST")
+
 LANGOPT(APINotes, 1, 0, "use external API notes")
 LANGOPT(APINotesModules, 1, 0, "use module-based external API notes")
 LANGOPT(NeededByPCHOrCompilationUsesPCH, 1, 0, "compilation involves pch")

clang/include/clang/Basic/TokenKinds.def

@@ -337,6 +337,7 @@ KEYWORD(__objc_yes                  , KEYALL)
 KEYWORD(__objc_no                   , KEYALL)
 KEYWORD(__ptrauth                   , KEYALL)
 
+
 // C++ 2.11p1: Keywords.
 KEYWORD(asm                         , KEYCXX|KEYGNU)
 KEYWORD(bool                        , BOOLSUPPORT|KEYC23)

clang/include/clang/CodeGen/BackendUtil.h

@@ -11,7 +11,6 @@
 
 #include "clang/Basic/LLVM.h"
 #include "llvm/IR/ModuleSummaryIndex.h"
-#include "llvm/Support/VirtualFileSystem.h"
 #include <memory>
 
 namespace llvm {

clang/include/clang/CodeGen/ConstantInitBuilder.h

@@ -30,6 +30,7 @@ class PointerAuthSchema;
 class QualType;
 
 namespace CodeGen {
+
 class CodeGenModule;
 
 /// A convenience builder class for complex constant initializers,

clang/include/clang/Driver/Action.h

@@ -77,6 +77,7 @@ class Action {
     LinkerWrapperJobClass,
     StaticLibJobClass,
     BinaryAnalyzeJobClass,
+
     JobClassFirst = DepscanJobClass,
     JobClassLast = BinaryAnalyzeJobClass
   };