Skip to content

stubs: avoid reaching up-tree, prefer inclusion options #40855

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.

Sign up for GitHub

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
Jan 15, 2022
Merged

stubs: avoid reaching up-tree, prefer inclusion options #40855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion stdlib/public/stubs/Assert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "swift/Runtime/Config.h"
#include "swift/Runtime/Debug.h"
#include "swift/Runtime/Portability.h"
#include "../SwiftShims/AssertionReporting.h"
#include "SwiftShims/AssertionReporting.h"
#include <cstdarg>
#include <cstdint>
#include <stdio.h>
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/Availability.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "swift/Basic/Lazy.h"
#include "swift/Runtime/Debug.h"
#include <TargetConditionals.h>
#include "../SwiftShims/FoundationShims.h"
#include "SwiftShims/FoundationShims.h"

struct os_system_version_s {
unsigned int major;
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ set(LLVM_OPTIONAL_SOURCES

set(swift_stubs_c_compile_flags ${SWIFT_RUNTIME_CORE_CXX_FLAGS})
list(APPEND swift_stubs_c_compile_flags -DswiftCore_EXPORTS)
list(APPEND swift_stubs_c_compile_flags -I${SWIFT_SOURCE_DIR}/include)
list(APPEND swift_stubs_c_compile_flags -I${SWIFT_SOURCE_DIR}/include -I${SWIFT_SOURCE_DIR}/stdlib/public)

add_swift_target_library(swiftStdlibStubs
OBJECT_LIBRARY
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/FoundationHelpers.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#if SWIFT_OBJC_INTEROP
#import <CoreFoundation/CoreFoundation.h>
#include "../SwiftShims/CoreFoundationShims.h"
#include "SwiftShims/CoreFoundationShims.h"
#import <objc/runtime.h>
#include "swift/Runtime/Once.h"
#include <dlfcn.h>
Expand Down
4 changes: 2 additions & 2 deletions stdlib/public/stubs/GlobalObjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
//
//===----------------------------------------------------------------------===//

#include "../SwiftShims/GlobalObjects.h"
#include "../SwiftShims/Random.h"
#include "SwiftShims/GlobalObjects.h"
#include "SwiftShims/Random.h"
#include "swift/Runtime/Metadata.h"
#include "swift/Runtime/Debug.h"
#include "swift/Runtime/EnvironmentVariables.h"
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/LibcShims.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#include <type_traits>

#include "../SwiftShims/LibcShims.h"
#include "SwiftShims/LibcShims.h"

#if defined(_WIN32)
static void __attribute__((__constructor__))
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/MathStubs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
//
//===----------------------------------------------------------------------===//

#include "../SwiftShims/Visibility.h"
#include "SwiftShims/Visibility.h"

#include <climits>
#include <cstdlib>
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/Random.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#include "swift/Runtime/Debug.h"
#include "swift/Runtime/Mutex.h"
#include "../SwiftShims/Random.h"
#include "SwiftShims/Random.h"

#include <algorithm> // required for std::min

Expand Down
6 changes: 3 additions & 3 deletions stdlib/public/stubs/Stubs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
#include "swift/Runtime/SwiftDtoa.h"
#include "swift/Basic/Lazy.h"

#include "../SwiftShims/LibcShims.h"
#include "../SwiftShims/RuntimeShims.h"
#include "../SwiftShims/RuntimeStubs.h"
#include "SwiftShims/LibcShims.h"
#include "SwiftShims/RuntimeShims.h"
#include "SwiftShims/RuntimeStubs.h"

#include "llvm/ADT/StringExtras.h"

Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/ThreadLocalStorage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <cstring>

#include "../SwiftShims/ThreadLocalStorage.h"
#include "SwiftShims/ThreadLocalStorage.h"
#include "swift/Basic/Lazy.h"
#include "swift/Runtime/Debug.h"
#include "swift/Runtime/ThreadLocalStorage.h"
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/Unicode/Apple/NormalizationData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef NORMALIZATION_DATA_H
#define NORMALIZATION_DATA_H

#include "../SwiftShims/SwiftStdint.h"
#include "SwiftShims/SwiftStdint.h"

static const __swift_uint16_t _swift_stdlib_normData_data[66] = {
0x4, 0x358, 0xA0, 0x50, 0x6C0, 0x44, 0x80, 0x48, 0x720, 0x3, 0x733, 0x88, 0xC8, 0x3C, 0xD0, 0xF0,
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/Unicode/Apple/ScalarPropsData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef SCALAR_PROP_DATA_H
#define SCALAR_PROP_DATA_H

#include "../SwiftShims/SwiftStdint.h"
#include "SwiftShims/SwiftStdint.h"

#define BIN_PROPS_COUNT 4874

Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/Unicode/Common/GraphemeData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef GRAPHEME_DATA_H
#define GRAPHEME_DATA_H

#include "../SwiftShims/SwiftStdint.h"
#include "SwiftShims/SwiftStdint.h"

#define GRAPHEME_BREAK_DATA_COUNT 621

Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/Unicode/Common/NormalizationData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef NORMALIZATION_DATA_H
#define NORMALIZATION_DATA_H

#include "../SwiftShims/SwiftStdint.h"
#include "SwiftShims/SwiftStdint.h"

static const __swift_uint16_t _swift_stdlib_normData_data[66] = {
0x110, 0x70, 0x3B0, 0x8, 0x750, 0x78, 0x6C4, 0x410, 0x6E0, 0x60, 0x734, 0x784,
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/Unicode/Common/ScalarPropsData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef SCALAR_PROP_DATA_H
#define SCALAR_PROP_DATA_H

#include "../SwiftShims/SwiftStdint.h"
#include "SwiftShims/SwiftStdint.h"

#define BIN_PROPS_COUNT 4855

Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/Unicode/UnicodeData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#include "../SwiftShims/UnicodeData.h"
#include "SwiftShims/UnicodeData.h"
#include <limits>

// Every 4 byte chunks of data that we need to hash (in this case only ever
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/Unicode/UnicodeGrapheme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#else
#include "swift/Runtime/Debug.h"
#endif
#include "../SwiftShims/UnicodeData.h"
#include "SwiftShims/UnicodeData.h"
#include <limits>

SWIFT_RUNTIME_STDLIB_INTERNAL
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/Unicode/UnicodeNormalization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "swift/Runtime/Debug.h"
#endif

#include "../SwiftShims/UnicodeData.h"
#include "SwiftShims/UnicodeData.h"
#include <limits>

SWIFT_RUNTIME_STDLIB_INTERNAL
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/Unicode/UnicodeScalarProps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "swift/Runtime/Debug.h"
#endif

#include "../SwiftShims/UnicodeData.h"
#include "SwiftShims/UnicodeData.h"
#include <limits>

SWIFT_RUNTIME_STDLIB_INTERNAL
Expand Down