Skip to content

Commit 158332c

Browse files
committed
runtime: remove llvm/DataTypes.h, llvm-c/DataTypes.h
Inline the standard headers that they included and remove the extra include path.
1 parent b25dab2 commit 158332c

File tree

9 files changed

+8
-103
lines changed

9 files changed

+8
-103
lines changed

include/swift/Remote/MetadataReader.h

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
#include <vector>
3434
#include <unordered_map>
3535

36+
#include <inttypes.h>
37+
3638
namespace swift {
3739
namespace remote {
3840

stdlib/include/llvm-c/DataTypes.h

-84
This file was deleted.

stdlib/include/llvm/ADT/Hashing.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
#ifndef LLVM_ADT_HASHING_H
4545
#define LLVM_ADT_HASHING_H
4646

47-
#include "llvm/Support/DataTypes.h"
4847
#include "llvm/Support/ErrorHandling.h"
4948
#include "llvm/Support/SwapByteOrder.h"
5049
#include "llvm/Support/type_traits.h"
5150
#include <algorithm>
5251
#include <cassert>
5352
#include <cstring>
53+
#include <cstdint>
5454
#include <string>
5555
#include <utility>
5656

stdlib/include/llvm/Support/Atomic.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef LLVM_SUPPORT_ATOMIC_H
1818
#define LLVM_SUPPORT_ATOMIC_H
1919

20-
#include "llvm/Support/DataTypes.h"
20+
#include <stdint.h>
2121

2222
// Windows will at times define MemoryFence.
2323
#ifdef MemoryFence

stdlib/include/llvm/Support/DataTypes.h

-16
This file was deleted.

stdlib/include/llvm/Support/PointerLikeTypeTraits.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#ifndef LLVM_SUPPORT_POINTERLIKETYPETRAITS_H
1515
#define LLVM_SUPPORT_POINTERLIKETYPETRAITS_H
1616

17-
#include "llvm/Support/DataTypes.h"
1817
#include <cassert>
18+
#include <cstdint>
1919
#include <type_traits>
2020

2121
inline namespace __swift { inline namespace __runtime {

stdlib/public/runtime/Demangle.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "swift/Strings.h"
2020

2121
#include <vector>
22+
#include <inttypes.h>
2223

2324
#if SWIFT_OBJC_INTEROP
2425
#include <objc/runtime.h>

stdlib/public/runtime/Exclusivity.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "swift/Runtime/Debug.h"
3131
#include "swift/Runtime/Metadata.h"
3232
#include <memory>
33+
#include <inttypes.h>
3334
#include <stdio.h>
3435

3536
// Pick a return-address strategy

stdlib/public/runtime/SwiftObject.mm

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#if SWIFT_OBJC_INTEROP
4444
#include <dlfcn.h>
4545
#endif
46+
#include <inttypes.h>
4647
#include <stdio.h>
4748
#include <stdlib.h>
4849
#include <unordered_map>

0 commit comments

Comments
 (0)