Merge pull request #41550 from benlangmuir/make-next-less-sad

Pre-fix some build failures that we'll see with newer llvm

Author: benlangmuir

include/swift/ABI/TypeIdentity.h

@@ -19,6 +19,7 @@
 #define SWIFT_ABI_TYPEIDENTITY_H
 
 #include "swift/Basic/LLVM.h"
+#include <llvm/ADT/Optional.h>
 #include <llvm/ADT/StringRef.h>
 
 namespace swift {

include/swift/Basic/DiverseStack.h

@@ -395,8 +395,7 @@ class DiverseValueBuffer {
 public:
   DiverseValueBuffer(const T &value) {
     size_t size = value.allocated_size();
-    data.reserve(size);
-    data.set_size(size);
+    data.resize_for_overwrite(size);
     memcpy(data.data(), reinterpret_cast<const void *>(&value), size);
   }
 

include/swift/Basic/Fingerprint.h

@@ -15,6 +15,7 @@
 
 #include "swift/Basic/StableHasher.h"
 #include "llvm/ADT/Hashing.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
 

include/swift/Basic/SourceLoc.h

@@ -20,6 +20,7 @@
 #include "swift/Basic/Debug.h"
 #include "swift/Basic/LLVM.h"
 #include "llvm/ADT/DenseMapInfo.h"
+#include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/SMLoc.h"
 #include <functional>

include/swift/Basic/Statistic.h

@@ -13,6 +13,7 @@
 #ifndef SWIFT_BASIC_STATISTIC_H
 #define SWIFT_BASIC_STATISTIC_H
 
+#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Support/Timer.h"

include/swift/Demangling/ManglingUtils.h

@@ -13,6 +13,7 @@
 #ifndef SWIFT_DEMANGLING_MANGLINGUTILS_H
 #define SWIFT_DEMANGLING_MANGLINGUTILS_H
 
+#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringRef.h"
 #include "swift/Demangling/NamespaceMacros.h"
 #include "swift/Demangling/Punycode.h"

include/swift/Remote/MemoryReader.h

@@ -20,6 +20,7 @@
 
 #include "swift/Remote/RemoteAddress.h"
 #include "swift/SwiftRemoteMirror/MemoryReaderInterface.h"
+#include "llvm/ADT/Optional.h"
 
 #include <cstring>
 #include <functional>

include/swift/SIL/SILInstruction.h

@@ -277,12 +277,12 @@ SILInstructionResultArray::end() const {
 
 inline SILInstructionResultArray::reverse_iterator
 SILInstructionResultArray::rbegin() const {
-  return llvm::make_reverse_iterator(end());
+  return std::make_reverse_iterator(end());
 }
 
 inline SILInstructionResultArray::reverse_iterator
 SILInstructionResultArray::rend() const {
-  return llvm::make_reverse_iterator(begin());
+  return std::make_reverse_iterator(begin());
 }
 
 inline SILInstructionResultArray::range

include/swift/Syntax/AbsoluteRawSyntax.h

@@ -397,11 +397,11 @@ class OptionalStorage<AbsoluteRawSyntax> {
 
   bool hasValue() const { return !Storage.isNull(); }
 
-  AbsoluteRawSyntax &getValue() LLVM_LVALUE_FUNCTION {
+  AbsoluteRawSyntax &getValue() & {
     assert(hasValue());
     return Storage;
   }
-  AbsoluteRawSyntax const &getValue() const LLVM_LVALUE_FUNCTION {
+  AbsoluteRawSyntax const &getValue() const & {
     assert(hasValue());
     return Storage;
   }

include/swift/Syntax/SyntaxData.h

@@ -416,11 +416,11 @@ class OptionalStorage<SyntaxDataRef> {
 
   bool hasValue() const { return !Storage.getAbsoluteRaw().isNull(); }
 
-  SyntaxDataRef &getValue() LLVM_LVALUE_FUNCTION {
+  SyntaxDataRef &getValue() & {
     assert(hasValue());
     return Storage;
   }
-  SyntaxDataRef const &getValue() const LLVM_LVALUE_FUNCTION {
+  SyntaxDataRef const &getValue() const & {
     assert(hasValue());
     return Storage;
   }