mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
* Enforce using headers from Swift's LLVMSupport fork and not llvm-project when building stdlib * [LLVMSupport] Re-import LLVMSupport .cpp and .h files from 9ff3a9759b7c2f146e7f46e4aebc60453c577c5a from apple/llvm-project Done via the following commands, while having llvm-project checked out at 9ff3a9759b7c2f146e7f46e4aebc60453c577c5a, a commit on the stable/20210726 branch of apple/llvm-project, <9ff3a9759b>: for i in swift/stdlib/public/LLVMSupport/*.cpp ; do cp llvm-project/llvm/lib/Support/$(basename $i) $i ; done for i in swift/stdlib/include/llvm/ADT/*.h; do cp llvm-project/llvm/include/llvm/ADT/$(basename $i) $i ; done for i in swift/stdlib/include/llvm/Support/*.h; do cp llvm-project/llvm/include/llvm/Support/$(basename $i) $i ; done cp llvm-project/llvm/include/llvm/ADT/ScopeExit.h swift/stdlib/include/llvm/ADT/ScopeExit.h cp llvm-project/llvm/include/llvm/ADT/Twine.h swift/stdlib/include/llvm/ADT/Twine.h cp llvm-project/llvm/include/llvm/Support/raw_ostream.h swift/stdlib/include/llvm/Support/raw_ostream.h * [LLVMSupport] Re-namespace the LLVMSupport fork after re-forking by re-applyingb72788c27aMore precisely: 1) git cherry-pickb72788c27a2) manually resolve the conflict in AlignOf.h by keeping the HEAD's version of the chunk and discarding the cherry-pick's change 3) git add AlignOf.h 4) git status | grep "deleted by us" | awk '{print($4)}' | xargs git rm 5) git cherry-pick --continue Original namespacing commit message: > This adds the `__swift::__runtime` inline namespace to the LLVMSupport > interfaces. This avoids an ODR violation when LLVM and Swift are in the > same address space. It also will aid in the process of pruning the > LLVMSupport library by ensuring that accidental leakage of the llvm > namespace does not allow us to remove symbols which we rely on. * [LLVMSupport] Re-apply "pruning" on re-forked LLVMSupport frombb102707edThis re-applies the "pruning" commit frombb102707ed, which did the following: - Remove many whole files, - Remove "epoch tracking" and "reverse iteration" support from ADT containers - Remove "ABI break checking" support from STLExtras - Remove float parsing functions from StringExtras.h - Remove APInt/APSInt dependencies from StringRef.h + StringRef.cpp (edit distance, int parsing) - Remove some variants of error handling and dependency of dbgs() from ErrorHandling.h and ErrorHandling.cpp We don't need to do the whole-file-removal step, because that's already done, but the rest is re-applied by doing: 1) git cherry-pickbb102707ed2) manually resolving conflict in ADT/DenseMap.h by keeping HEAD's version of the chunk and removing epoch tracking from it 3) manually resolving conflict in ADT/STLExtras.h by keeping HEAD's version of the chunk and removing ABI check checking from it 4) manually resolving conflict in ADT/StringExtras.h by deleting the whole chunk (removing APInt/APSInt dependent functions) 5) manually resolving conflict in ErrorHandling.cpp by force-applying the cherry-pick's version (removing write() calls and OOM callback) 6) manually resolving the three conflicts in CMakeLists.txt files by keeping HEAD's version completely 7) git add stdlib/include/llvm/{ADT/StringSwitch.h,ADT/Twine.h,Support/raw_ostream.h} Original commit description: > Reduce LLVMSupport to the subset required for the runtime. This reduces > the TCB and the overheads of the runtime. The inline namespace's > preservation ensures that ODR violations do not occur. * [LLVMSupport] Re-apply all post-import modifications on LLVMSupport that the Swift's fork has Since the previous commits re-imported "vanilla" versions of LLVMSupport, we need to re-apply all modifications that the Swift's fork has made since the last import. More precisely: 1) git diff 7b70120440cd39d67a595a7d0ea4e828ecc6ee44..origin/main -- stdlib/include/llvm stdlib/public/LLVMSupport | git apply -3 --exclude "stdlib/include/llvm/Support/DataTypes.h" --exclude "stdlib/include/llvm/Config/llvm-config.h.cmake" 2) manually resolve conflict in STLExtras.h by applying the "__swift::__runtime" prefix to HEAD's version 3) manually resolve conflicts in StringSwitch.h by keeping HEAD's version (removing the Unicode BOM marker at the beginning of the file, keeping LLVM's version of the string functions) 4) manually resolve conflict in SwapByteOrder.h by adding the `defined(__wasi__)` part into the #if * [LLVMSupport] Drop remaining dependencies on APSInt.h, Error.h, DataTypes.h and STLForwardCompat.h Most cases can drop the #includes without any changes, in some cases there are straighforward replacements (climits, cstdint). For STLForwardCompat.h, we need to bring in parts of STLForwardCompat.h from llvm-project. * [LLVMSupport] Remove raw_ostream.h and drop dependencies to it from the runtime * [LLVMSupport] Simplify error reporting in SmallVector and avoid using std::string when producing fatal errors messages Co-authored-by: Saleem Abdulrasool <compnerd@compnerd.org>
115 lines
4.7 KiB
C++
115 lines
4.7 KiB
C++
//===- llvm/ADT/SmallVector.cpp - 'Normally small' vectors ----------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file implements the SmallVector class.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "llvm/ADT/SmallVector.h"
|
|
#include <cstdint>
|
|
#ifdef LLVM_ENABLE_EXCEPTIONS
|
|
#include <stdexcept>
|
|
#endif
|
|
using namespace llvm;
|
|
|
|
// Check that no bytes are wasted and everything is well-aligned.
|
|
namespace {
|
|
struct Struct16B {
|
|
alignas(16) void *X;
|
|
};
|
|
struct Struct32B {
|
|
alignas(32) void *X;
|
|
};
|
|
}
|
|
static_assert(sizeof(SmallVector<void *, 0>) ==
|
|
sizeof(unsigned) * 2 + sizeof(void *),
|
|
"wasted space in SmallVector size 0");
|
|
static_assert(alignof(SmallVector<Struct16B, 0>) >= alignof(Struct16B),
|
|
"wrong alignment for 16-byte aligned T");
|
|
static_assert(alignof(SmallVector<Struct32B, 0>) >= alignof(Struct32B),
|
|
"wrong alignment for 32-byte aligned T");
|
|
static_assert(sizeof(SmallVector<Struct16B, 0>) >= alignof(Struct16B),
|
|
"missing padding for 16-byte aligned T");
|
|
static_assert(sizeof(SmallVector<Struct32B, 0>) >= alignof(Struct32B),
|
|
"missing padding for 32-byte aligned T");
|
|
static_assert(sizeof(SmallVector<void *, 1>) ==
|
|
sizeof(unsigned) * 2 + sizeof(void *) * 2,
|
|
"wasted space in SmallVector size 1");
|
|
|
|
static_assert(sizeof(SmallVector<char, 0>) ==
|
|
sizeof(void *) * 2 + sizeof(void *),
|
|
"1 byte elements have word-sized type for size and capacity");
|
|
|
|
// Note: Moving this function into the header may cause performance regression.
|
|
template <class Size_T>
|
|
static size_t getNewCapacity(size_t MinSize, size_t TSize, size_t OldCapacity) {
|
|
constexpr size_t MaxSize = std::numeric_limits<Size_T>::max();
|
|
|
|
// Ensure we can fit the new capacity.
|
|
// This is only going to be applicable when the capacity is 32 bit.
|
|
if (MinSize > MaxSize)
|
|
report_bad_alloc_error("SmallVector capacity overflow during allocation");
|
|
|
|
// Ensure we can meet the guarantee of space for at least one more element.
|
|
// The above check alone will not catch the case where grow is called with a
|
|
// default MinSize of 0, but the current capacity cannot be increased.
|
|
// This is only going to be applicable when the capacity is 32 bit.
|
|
if (OldCapacity == MaxSize)
|
|
report_bad_alloc_error("SmallVector capacity unable to grow");
|
|
|
|
// In theory 2*capacity can overflow if the capacity is 64 bit, but the
|
|
// original capacity would never be large enough for this to be a problem.
|
|
size_t NewCapacity = 2 * OldCapacity + 1; // Always grow.
|
|
return std::min(std::max(NewCapacity, MinSize), MaxSize);
|
|
}
|
|
|
|
// Note: Moving this function into the header may cause performance regression.
|
|
template <class Size_T>
|
|
void *SmallVectorBase<Size_T>::mallocForGrow(size_t MinSize, size_t TSize,
|
|
size_t &NewCapacity) {
|
|
NewCapacity = getNewCapacity<Size_T>(MinSize, TSize, this->capacity());
|
|
return llvm::safe_malloc(NewCapacity * TSize);
|
|
}
|
|
|
|
// Note: Moving this function into the header may cause performance regression.
|
|
template <class Size_T>
|
|
void SmallVectorBase<Size_T>::grow_pod(void *FirstEl, size_t MinSize,
|
|
size_t TSize) {
|
|
size_t NewCapacity = getNewCapacity<Size_T>(MinSize, TSize, this->capacity());
|
|
void *NewElts;
|
|
if (BeginX == FirstEl) {
|
|
NewElts = safe_malloc(NewCapacity * TSize);
|
|
|
|
// Copy the elements over. No need to run dtors on PODs.
|
|
memcpy(NewElts, this->BeginX, size() * TSize);
|
|
} else {
|
|
// If this wasn't grown from the inline copy, grow the allocated space.
|
|
NewElts = safe_realloc(this->BeginX, NewCapacity * TSize);
|
|
}
|
|
|
|
this->BeginX = NewElts;
|
|
this->Capacity = NewCapacity;
|
|
}
|
|
|
|
template class llvm::SmallVectorBase<uint32_t>;
|
|
|
|
// Disable the uint64_t instantiation for 32-bit builds.
|
|
// Both uint32_t and uint64_t instantiations are needed for 64-bit builds.
|
|
// This instantiation will never be used in 32-bit builds, and will cause
|
|
// warnings when sizeof(Size_T) > sizeof(size_t).
|
|
#if SIZE_MAX > UINT32_MAX
|
|
template class llvm::SmallVectorBase<uint64_t>;
|
|
|
|
// Assertions to ensure this #if stays in sync with SmallVectorSizeType.
|
|
static_assert(sizeof(SmallVectorSizeType<char>) == sizeof(uint64_t),
|
|
"Expected SmallVectorBase<uint64_t> variant to be in use.");
|
|
#else
|
|
static_assert(sizeof(SmallVectorSizeType<char>) == sizeof(uint32_t),
|
|
"Expected SmallVectorBase<uint32_t> variant to be in use.");
|
|
#endif
|