Skip to content

runtime: remove llvm/DataTypes.h, llvm-c/DataTypes.h #32188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/swift/Remote/MetadataReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#include <vector>
#include <unordered_map>

#include <inttypes.h>

namespace swift {
namespace remote {

Expand Down
84 changes: 0 additions & 84 deletions stdlib/include/llvm-c/DataTypes.h

This file was deleted.

2 changes: 1 addition & 1 deletion stdlib/include/llvm/ADT/Hashing.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
#ifndef LLVM_ADT_HASHING_H
#define LLVM_ADT_HASHING_H

#include "llvm/Support/DataTypes.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/SwapByteOrder.h"
#include "llvm/Support/type_traits.h"
#include <algorithm>
#include <cassert>
#include <cstring>
#include <cstdint>
#include <string>
#include <utility>

Expand Down
2 changes: 1 addition & 1 deletion stdlib/include/llvm/Support/Atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef LLVM_SUPPORT_ATOMIC_H
#define LLVM_SUPPORT_ATOMIC_H

#include "llvm/Support/DataTypes.h"
#include <stdint.h>

// Windows will at times define MemoryFence.
#ifdef MemoryFence
Expand Down
16 changes: 0 additions & 16 deletions stdlib/include/llvm/Support/DataTypes.h

This file was deleted.

2 changes: 1 addition & 1 deletion stdlib/include/llvm/Support/PointerLikeTypeTraits.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#ifndef LLVM_SUPPORT_POINTERLIKETYPETRAITS_H
#define LLVM_SUPPORT_POINTERLIKETYPETRAITS_H

#include "llvm/Support/DataTypes.h"
#include <cassert>
#include <cstdint>
#include <type_traits>

inline namespace __swift { inline namespace __runtime {
Expand Down
1 change: 1 addition & 0 deletions stdlib/public/runtime/Demangle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "swift/Strings.h"

#include <vector>
#include <inttypes.h>

#if SWIFT_OBJC_INTEROP
#include <objc/runtime.h>
Expand Down
1 change: 1 addition & 0 deletions stdlib/public/runtime/Exclusivity.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "swift/Runtime/Debug.h"
#include "swift/Runtime/Metadata.h"
#include <memory>
#include <inttypes.h>
#include <stdio.h>

// Pick a return-address strategy
Expand Down
1 change: 1 addition & 0 deletions stdlib/public/runtime/SwiftObject.mm
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#if SWIFT_OBJC_INTEROP
#include <dlfcn.h>
#endif
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <unordered_map>
Expand Down