Skip to content

Commit 2017d52

Browse files
committed
Move Memory.{h,cpp} to Common.
Differential Revision: https://reviews.llvm.org/D40571 llvm-svn: 319221
1 parent 7b361b5 commit 2017d52

31 files changed

+54
-151
lines changed

lld/COFF/Driver.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
#include "Driver.h"
1111
#include "Config.h"
1212
#include "InputFiles.h"
13-
#include "Memory.h"
1413
#include "MinGW.h"
1514
#include "SymbolTable.h"
1615
#include "Symbols.h"
1716
#include "Writer.h"
1817
#include "lld/Common/Driver.h"
1918
#include "lld/Common/ErrorHandler.h"
19+
#include "lld/Common/Memory.h"
2020
#include "lld/Common/Version.h"
2121
#include "llvm/ADT/Optional.h"
2222
#include "llvm/ADT/StringSwitch.h"
@@ -50,10 +50,6 @@ namespace coff {
5050
Configuration *Config;
5151
LinkerDriver *Driver;
5252

53-
BumpPtrAllocator BAlloc;
54-
StringSaver Saver{BAlloc};
55-
std::vector<SpecificAllocBase *> SpecificAllocBase::Instances;
56-
5753
bool link(ArrayRef<const char *> Args, bool CanExitEarly, raw_ostream &Diag) {
5854
errorHandler().LogName = Args[0];
5955
errorHandler().ErrorOS = &Diag;

lld/COFF/DriverUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
#include "Config.h"
1717
#include "Driver.h"
18-
#include "Memory.h"
1918
#include "Symbols.h"
2019
#include "lld/Common/ErrorHandler.h"
20+
#include "lld/Common/Memory.h"
2121
#include "llvm/ADT/Optional.h"
2222
#include "llvm/ADT/StringSwitch.h"
2323
#include "llvm/BinaryFormat/COFF.h"

lld/COFF/InputFiles.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
#include "Chunks.h"
1212
#include "Config.h"
1313
#include "Driver.h"
14-
#include "Memory.h"
1514
#include "SymbolTable.h"
1615
#include "Symbols.h"
1716
#include "lld/Common/ErrorHandler.h"
17+
#include "lld/Common/Memory.h"
1818
#include "llvm-c/lto.h"
1919
#include "llvm/ADT/SmallVector.h"
2020
#include "llvm/ADT/Triple.h"

lld/COFF/Memory.h

Lines changed: 0 additions & 52 deletions
This file was deleted.

lld/COFF/SymbolTable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#include "Config.h"
1212
#include "Driver.h"
1313
#include "LTO.h"
14-
#include "Memory.h"
1514
#include "Symbols.h"
1615
#include "lld/Common/ErrorHandler.h"
16+
#include "lld/Common/Memory.h"
1717
#include "llvm/IR/LLVMContext.h"
1818
#include "llvm/Support/Debug.h"
1919
#include "llvm/Support/raw_ostream.h"

lld/COFF/Symbols.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
#include "Symbols.h"
1111
#include "InputFiles.h"
12-
#include "Memory.h"
1312
#include "Strings.h"
1413
#include "lld/Common/ErrorHandler.h"
14+
#include "lld/Common/Memory.h"
1515
#include "llvm/ADT/STLExtras.h"
1616
#include "llvm/Support/Debug.h"
1717
#include "llvm/Support/raw_ostream.h"

lld/COFF/Symbols.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#include "Chunks.h"
1414
#include "Config.h"
15-
#include "Memory.h"
1615
#include "lld/Common/LLVM.h"
16+
#include "lld/Common/Memory.h"
1717
#include "llvm/ADT/ArrayRef.h"
1818
#include "llvm/Object/Archive.h"
1919
#include "llvm/Object/COFF.h"

lld/COFF/Writer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#include "DLL.h"
1313
#include "InputFiles.h"
1414
#include "MapFile.h"
15-
#include "Memory.h"
1615
#include "PDB.h"
1716
#include "SymbolTable.h"
1817
#include "Symbols.h"
1918
#include "lld/Common/ErrorHandler.h"
19+
#include "lld/Common/Memory.h"
2020
#include "llvm/ADT/DenseMap.h"
2121
#include "llvm/ADT/STLExtras.h"
2222
#include "llvm/ADT/StringSwitch.h"

lld/Common/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ endif()
55
add_lld_library(lldCommon
66
Args.cpp
77
ErrorHandler.cpp
8+
Memory.cpp
89
Reproduce.cpp
910
Strings.cpp
1011
TargetOptionsCommandFlags.cpp

lld/Common/Memory.cpp

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
//===- Memory.cpp ---------------------------------------------------------===//
2+
//
3+
// The LLVM Linker
4+
//
5+
// This file is distributed under the University of Illinois Open Source
6+
// License. See LICENSE.TXT for details.
7+
//
8+
//===----------------------------------------------------------------------===//
9+
10+
#include "lld/Common/Memory.h"
11+
12+
using namespace llvm;
13+
using namespace lld;
14+
15+
BumpPtrAllocator lld::BAlloc;
16+
StringSaver lld::Saver{BAlloc};
17+
std::vector<SpecificAllocBase *> lld::SpecificAllocBase::Instances;
18+
19+
void lld::freeArena() {
20+
for (SpecificAllocBase *Alloc : SpecificAllocBase::Instances)
21+
Alloc->reset();
22+
BAlloc.Reset();
23+
}

0 commit comments

Comments
 (0)