mirror of
https://github.com/llvm/llvm-project.git
synced 2025-05-15 06:06:09 +00:00
15681ad00b
This is a recommit of r333506, which was reverted in r333518.
The original commit message is below.
In r325551 many calls of malloc/calloc/realloc were replaces with calls of
their safe counterparts defined in the namespace llvm. There functions
generate crash if memory cannot be allocated, such behavior facilitates
handling of out of memory errors on Windows.
If the result of *alloc function were checked for success, the function was
not replaced with the safe variant. In these cases the calling function made
the error handling, like:
T *NewElts = static_cast<T*>(malloc(NewCapacity*sizeof(T)));
if (NewElts == nullptr)
report_bad_alloc_error("Allocation of SmallVector element failed.");
Actually knowledge about the function where OOM occurred is useless. Moreover
having a single entry point for OOM handling is convenient for investigation
of memory problems. This change removes custom OOM errors handling and
replaces them with calls to functions `llvm::safe_*alloc`.
Declarations of `safe_*alloc` are moved to a separate include file, to avoid
cyclic dependency in SmallVector.h
Differential Revision: https://reviews.llvm.org/D47440
llvm-svn: 334344
41 lines
1.5 KiB
C++
41 lines
1.5 KiB
C++
//===- llvm/ADT/SmallVector.cpp - 'Normally small' vectors ----------------===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file implements the SmallVector class.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "llvm/ADT/SmallVector.h"
|
|
using namespace llvm;
|
|
|
|
/// grow_pod - This is an implementation of the grow() method which only works
|
|
/// on POD-like datatypes and is out of line to reduce code duplication.
|
|
void SmallVectorBase::grow_pod(void *FirstEl, size_t MinSizeInBytes,
|
|
size_t TSize) {
|
|
size_t CurSizeBytes = size_in_bytes();
|
|
size_t NewCapacityInBytes = 2 * capacity_in_bytes() + TSize; // Always grow.
|
|
if (NewCapacityInBytes < MinSizeInBytes)
|
|
NewCapacityInBytes = MinSizeInBytes;
|
|
|
|
void *NewElts;
|
|
if (BeginX == FirstEl) {
|
|
NewElts = safe_malloc(NewCapacityInBytes);
|
|
|
|
// Copy the elements over. No need to run dtors on PODs.
|
|
memcpy(NewElts, this->BeginX, CurSizeBytes);
|
|
} else {
|
|
// If this wasn't grown from the inline copy, grow the allocated space.
|
|
NewElts = safe_realloc(this->BeginX, NewCapacityInBytes);
|
|
}
|
|
|
|
this->EndX = (char*)NewElts+CurSizeBytes;
|
|
this->BeginX = NewElts;
|
|
this->CapacityX = (char*)this->BeginX + NewCapacityInBytes;
|
|
}
|