[Shims] Include SwiftShims headers without ../

This replaces a number of `#include`-s like this:
```
#include "../../../stdlib/public/SwiftShims/Visibility.h"
```
with this:
```
#include "swift/shims/Visibility.h"
```

This is needed to allow SwiftCompilerSources to use C++ headers which include SwiftShims headers. Currently trying to do that results in errors:
```
swift/swift/include/swift/Demangling/../../../stdlib/public/SwiftShims/module.modulemap:1:8: error: redefinition of module 'SwiftShims'
module SwiftShims {
       ^
Builds.noindex/swift/swift/bootstrapping0/lib/swift/shims/module.modulemap:1:8: note: previously defined here
module SwiftShims {
       ^
```
This happens because the headers in both the source dir and the build dir refer to SwiftShims headers by relative path, and both the source root and the build root contain SwiftShims headers (which are equivalent, but since they are located in different dirs, Clang treats them as different modules).

Author: egorzhdan

CMakeLists.txt

@@ -735,6 +735,7 @@ get_filename_component(SWIFT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} REALPATH)
 set(SWIFT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 set(SWIFT_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 set(SWIFT_MAIN_INCLUDE_DIR "${SWIFT_SOURCE_DIR}/include")
+set(SWIFT_SHIMS_INCLUDE_DIR "${SWIFT_SOURCE_DIR}/stdlib/public/SwiftShims")
 set(SWIFT_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
 
 set(SWIFT_RUNTIME_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin")
@@ -785,6 +786,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 include_directories(BEFORE
   ${SWIFT_MAIN_INCLUDE_DIR}
   ${SWIFT_INCLUDE_DIR}
+  ${SWIFT_SHIMS_INCLUDE_DIR}
   )
 
 # Configuration flags passed to all of our invocations of gyb.  Try to

cmake/modules/CMakeLists.txt

@@ -10,7 +10,7 @@ set(SWIFT_CONFIG_EXPORTS ${SWIFT_EXPORTS} ${SWIFT_BUILDTREE_EXPORTS})
 export(TARGETS ${SWIFT_CONFIG_EXPORTS} FILE ${SWIFT_EXPORTS_FILE})
 
 
-set(SWIFT_INCLUDE_DIRS ${SWIFT_INCLUDE_DIR} ${SWIFT_MAIN_INCLUDE_DIR})
+set(SWIFT_INCLUDE_DIRS ${SWIFT_INCLUDE_DIR} ${SWIFT_MAIN_INCLUDE_DIR} ${SWIFT_SHIMS_INCLUDE_DIR})
 set(SWIFT_LIBRARY_DIRS ${SWIFT_LIBRARY_OUTPUT_INTDIR})
 
 configure_file(

include/swift/ABI/HeapObject.h

@@ -17,6 +17,6 @@
 #ifndef SWIFT_ABI_HEAPOBJECT_H
 #define SWIFT_ABI_HEAPOBJECT_H
 
-#include "../../../stdlib/public/SwiftShims/HeapObject.h"
+#include "swift/shims/HeapObject.h"
 
 #endif // SWIFT_ABI_HEAPOBJECT_H

include/swift/ABI/KeyPath.h

@@ -22,7 +22,7 @@
 
 #include <cstdint>
 #include <cassert>
-#include "../../../stdlib/public/SwiftShims/KeyPath.h"
+#include "swift/shims/KeyPath.h"
 
 namespace swift {
 

include/swift/ABI/Metadata.h

@@ -40,7 +40,7 @@
 #include "swift/Demangling/Demangle.h"
 #include "swift/Demangling/ManglingMacros.h"
 #include "swift/Basic/Unreachable.h"
-#include "../../../stdlib/public/SwiftShims/HeapObject.h"
+#include "swift/shims/HeapObject.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/Casting.h"
 

include/swift/ABI/System.h

@@ -17,6 +17,6 @@
 #ifndef SWIFT_ABI_SYSTEM_H
 #define SWIFT_ABI_SYSTEM_H
 
-#include "../../../stdlib/public/SwiftShims/System.h"
+#include "swift/shims/System.h"
 
 #endif // SWIFT_ABI_SYSTEM_H

include/swift/Demangling/Errors.h

@@ -19,8 +19,8 @@
 #ifndef SWIFT_DEMANGLING_ERRORS_H
 #define SWIFT_DEMANGLING_ERRORS_H
 
-#include "../../../stdlib/public/SwiftShims/Visibility.h"
 #include "swift/Demangling/NamespaceMacros.h"
+#include "swift/shims/Visibility.h"
 #include <inttypes.h>
 #include <stdarg.h>
 

include/swift/Runtime/Config.h

@@ -166,7 +166,7 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
 #endif
 
 // Bring in visibility attribute macros
-#include "../../../stdlib/public/SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 
 // Define mappings for calling conventions.
 

include/swift/Runtime/Heap.h

@@ -22,7 +22,7 @@
 #include <utility>
 
 #include "swift/Runtime/Config.h"
-#include "../../../stdlib/public/SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 
 namespace swift {
 // Allocate plain old memory. This is the generalized entry point

include/swift/Runtime/HeapObject.h

@@ -27,8 +27,8 @@
 #endif // SWIFT_OBJC_INTEROP
 
 // Bring in the definition of HeapObject 
-#include "../../../stdlib/public/SwiftShims/HeapObject.h"
-#include "../../../stdlib/public/SwiftShims/Visibility.h"
+#include "swift/shims/HeapObject.h"
+#include "swift/shims/Visibility.h"
 
 namespace swift {
 

include/swift/Runtime/Metadata.h

@@ -20,7 +20,7 @@
 #include "swift/ABI/Metadata.h"
 #include "swift/Reflection/Records.h"
 #include "swift/Runtime/Once.h"
-#include "../../../stdlib/public/SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 
 namespace swift {
 

lib/Demangling/CrashReporter.h

@@ -22,7 +22,7 @@
 #if SWIFT_HAVE_CRASHREPORTERCLIENT
 
 // For SWIFT_LIBRARY_VISIBILITY
-#include "../../stdlib/public/SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 
 #include <inttypes.h>
 

stdlib/linker-support/magic-symbols-for-install-name.c

@@ -21,7 +21,7 @@
 
 #include <Availability.h>
 #include <TargetConditionals.h>
-#include "../public/SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 
 #define RPATH_INSTALL_NAME_DIRECTIVE_IMPL2(name, major, minor) \
   SWIFT_RUNTIME_EXPORT const char install_name_ ## major ## _ ## minor \

stdlib/public/BackDeployConcurrency/Error.h

@@ -19,7 +19,7 @@
 
 #include "swift/Basic/Compiler.h"
 
-#include "../SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 #include <cstdarg>
 #include <cstdint>
 #include <cstdlib>

stdlib/public/CMakeLists.txt

@@ -62,7 +62,7 @@ if(CXX_SUPPORTS_EXIT_TIME_DESTRUCTORS_WARNING)
     "-Werror=exit-time-destructors")
 endif()
 
-add_subdirectory(SwiftShims)
+add_subdirectory(SwiftShims/swift/shims)
 add_subdirectory(CommandLineSupport)
 add_subdirectory(Threading)
 

stdlib/public/CommandLineSupport/CommandLine.cpp

@@ -26,9 +26,9 @@
 
 #include "swift/Runtime/Debug.h"
 
-#include "../SwiftShims/GlobalObjects.h"
-#include "../SwiftShims/RuntimeStubs.h"
-#include "../SwiftShims/Visibility.h"
+#include "swift/shims/GlobalObjects.h"
+#include "swift/shims/RuntimeStubs.h"
+#include "swift/shims/Visibility.h"
 
 #if defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN

stdlib/public/Concurrency/Error.h

@@ -19,7 +19,7 @@
 
 #include "swift/Basic/Compiler.h"
 
-#include "../SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 #include <cstdarg>
 #include <cstdint>
 #include <cstdlib>

stdlib/public/Concurrency/linker-support/magic-symbols-for-install-name.c

@@ -24,7 +24,7 @@
 
 #include <Availability.h>
 #include <TargetConditionals.h>
-#include "../../SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 
 #define RPATH_INSTALL_NAME_DIRECTIVE_IMPL2(name, major, minor) \
   SWIFT_RUNTIME_EXPORT const char install_name_ ## major ## _ ## minor \

stdlib/public/SwiftShims/AssertionReporting.h renamed to stdlib/public/SwiftShims/swift/shims/AssertionReporting.h

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "../SwiftShims/Visibility.h"
 #include "Private.h"
 #include "SwiftHashableSupport.h"
 #include "SwiftValue.h"
@@ -20,6 +19,7 @@
 #include "swift/Runtime/Config.h"
 #include "swift/Runtime/Debug.h"
 #include "swift/Runtime/HeapObject.h"
+#include "swift/shims/Visibility.h"
 
 #include <new>
 

stdlib/public/SwiftShims/CMakeLists.txt renamed to stdlib/public/SwiftShims/swift/shims/CMakeLists.txt

@@ -19,7 +19,7 @@
 #include "swift/Runtime/Debug.h"
 #include "swift/Runtime/EnvironmentVariables.h"
 #include "swift/Threading/Once.h"
-#include "../SwiftShims/RuntimeShims.h"
+#include "swift/shims/RuntimeShims.h"
 #include <stdint.h>
 
 // If this is an Apple OS, use the Apple binary compatibility rules

stdlib/public/SwiftShims/CoreFoundationShims.h renamed to stdlib/public/SwiftShims/swift/shims/CoreFoundationShims.h

@@ -17,8 +17,6 @@
 
 #include "swift/Runtime/Casting.h"
 #include "../CompatibilityOverride/CompatibilityOverride.h"
-#include "../SwiftShims/GlobalObjects.h"
-#include "../SwiftShims/RuntimeShims.h"
 #include "ErrorObject.h"
 #include "ExistentialMetadataImpl.h"
 #include "Private.h"
@@ -32,6 +30,8 @@
 #include "swift/Runtime/ExistentialContainer.h"
 #include "swift/Runtime/HeapObject.h"
 #include "swift/Runtime/Metadata.h"
+#include "swift/shims/GlobalObjects.h"
+#include "swift/shims/RuntimeShims.h"
 #include "swift/Threading/Mutex.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/PointerIntPair.h"

stdlib/public/SwiftShims/FoundationShims.h renamed to stdlib/public/SwiftShims/swift/shims/FoundationShims.h

@@ -24,7 +24,7 @@
 #endif
 
 #include "swift/Runtime/Exclusivity.h"
-#include "../SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 #include "SwiftTLSContext.h"
 #include "swift/Basic/Lazy.h"
 #include "swift/Runtime/Config.h"

stdlib/public/SwiftShims/GlobalObjects.h renamed to stdlib/public/SwiftShims/swift/shims/GlobalObjects.h

@@ -32,7 +32,7 @@
 #if (defined(__ANDROID__) && defined(__ARM_ARCH_7A__) && defined(__ARM_EABI__)) || \
   ((defined(__i386__) || defined(__i686__) || defined(__x86_64__)) && !defined(__APPLE__))
 
-#include "../SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 
 static unsigned toEncoding(float f) {
   unsigned e;

stdlib/public/SwiftShims/HeapObject.h renamed to stdlib/public/SwiftShims/swift/shims/HeapObject.h

@@ -18,7 +18,7 @@
 #include "swift/Runtime/Heap.h"
 #include "Private.h"
 #include "swift/Runtime/Debug.h"
-#include "../SwiftShims/RuntimeShims.h"
+#include "swift/shims/RuntimeShims.h"
 #include <algorithm>
 #include <stdlib.h>
 #if defined(__APPLE__) && SWIFT_STDLIB_HAS_DARWIN_LIBMALLOC

stdlib/public/SwiftShims/KeyPath.h renamed to stdlib/public/SwiftShims/swift/shims/KeyPath.h

@@ -26,15 +26,15 @@
 #include "WeakReference.h"
 #include "swift/Runtime/Debug.h"
 #include "swift/Runtime/InstrumentsSupport.h"
+#include "swift/shims/GlobalObjects.h"
+#include "swift/shims/RuntimeShims.h"
 #include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <cstdio>
 #include <cstdlib>
 #include <new>
 #include <thread>
-#include "../SwiftShims/GlobalObjects.h"
-#include "../SwiftShims/RuntimeShims.h"
 #if SWIFT_OBJC_INTEROP
 # include <objc/NSObject.h>
 # include <objc/runtime.h>

stdlib/public/SwiftShims/LibcOverlayShims.h renamed to stdlib/public/SwiftShims/swift/shims/LibcOverlayShims.h

@@ -21,8 +21,8 @@
 
 #if !defined(__MACH__)
 
-#include "../SwiftShims/Visibility.h"
-#include "../SwiftShims/MetadataSections.h"
+#include "swift/shims/Visibility.h"
+#include "swift/shims/MetadataSections.h"
 #include "ImageInspection.h"
 #include "swift/Basic/Lazy.h"
 #include "swift/Runtime/Concurrent.h"

stdlib/public/SwiftShims/LibcShims.h renamed to stdlib/public/SwiftShims/swift/shims/LibcShims.h

@@ -46,7 +46,7 @@
 #define SWIFT_REFLECTION_METADATA_ELF_NOTE_MAGIC_STRING "swift_reflection_metadata_magic_string"
 #endif // defined(__ELF__)
 
-#include "../SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 #include <cstdint>
 #include <cstddef>
 

stdlib/public/SwiftShims/MetadataSections.h renamed to stdlib/public/SwiftShims/swift/shims/MetadataSections.h

@@ -20,7 +20,7 @@
 
 #if defined(__ELF__)
 
-#include "../SwiftShims/MetadataSections.h"
+#include "swift/shims/MetadataSections.h"
 #include "ImageInspection.h"
 #include <dlfcn.h>
 

stdlib/public/SwiftShims/Random.h renamed to stdlib/public/SwiftShims/swift/shims/Random.h

@@ -18,7 +18,7 @@
 
 #if defined(__wasm__)
 
-#include "../SwiftShims/MetadataSections.h"
+#include "swift/shims/MetadataSections.h"
 #include "ImageInspection.h"
 
 using namespace swift;

stdlib/public/SwiftShims/RefCount.h renamed to stdlib/public/SwiftShims/swift/shims/RefCount.h

@@ -21,7 +21,7 @@
 
 #if SWIFT_RUNTIME_ENABLE_LEAK_CHECKER
 
-#include "../SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 
 #include "swift/Runtime/Config.h"
 

stdlib/public/SwiftShims/Reflection.h renamed to stdlib/public/SwiftShims/swift/shims/Reflection.h

@@ -17,7 +17,7 @@
 #include "swift/Runtime/Metadata.h"
 #include "swift/Threading/Mutex.h"
 
-#include "../SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/STLExtras.h"

stdlib/public/SwiftShims/RuntimeShims.h renamed to stdlib/public/SwiftShims/swift/shims/RuntimeShims.h

@@ -23,7 +23,7 @@
 #include "swift/Demangling/TypeLookupError.h"
 #include "swift/Runtime/Config.h"
 #include "swift/Runtime/Metadata.h"
-#include "../SwiftShims/Visibility.h"
+#include "swift/shims/Visibility.h"
 
 #if defined(__APPLE__) && __has_include(<TargetConditionals.h>)
 #include <TargetConditionals.h>

stdlib/public/SwiftShims/RuntimeStubs.h renamed to stdlib/public/SwiftShims/swift/shims/RuntimeStubs.h

@@ -12,7 +12,6 @@
 
 #ifdef SWIFT_ENABLE_REFLECTION
 
-#include "../SwiftShims/Reflection.h"
 #include "ImageInspection.h"
 #include "Private.h"
 #include "WeakReference.h"
@@ -27,6 +26,7 @@
 #include "swift/Runtime/Metadata.h"
 #include "swift/Runtime/Portability.h"
 #include "swift/Runtime/Reflection.h"
+#include "swift/shims/Reflection.h"
 #include <cassert>
 #include <cinttypes>
 #include <cstdio>

stdlib/public/SwiftShims/SwiftStdbool.h renamed to stdlib/public/SwiftShims/swift/shims/SwiftStdbool.h

@@ -34,8 +34,8 @@
 #include "swift/Runtime/ObjCBridge.h"
 #include "swift/Runtime/Portability.h"
 #include "swift/Strings.h"
-#include "../SwiftShims/RuntimeShims.h"
-#include "../SwiftShims/AssertionReporting.h"
+#include "swift/shims/RuntimeShims.h"
+#include "swift/shims/AssertionReporting.h"
 #include "../CompatibilityOverride/CompatibilityOverride.h"
 #include "ErrorObject.h"
 #include "Private.h"

stdlib/public/SwiftShims/SwiftStddef.h renamed to stdlib/public/SwiftShims/swift/shims/SwiftStddef.h

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ImageInspectionCommon.h"
-#include "../SwiftShims/MetadataSections.h"
+#include "swift/shims/MetadataSections.h"
 
 #include <cstdint>
 #include <new>

stdlib/public/SwiftShims/SwiftStdint.h renamed to stdlib/public/SwiftShims/swift/shims/SwiftStdint.h

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ImageInspectionCommon.h"
-#include "../SwiftShims/MetadataSections.h"
+#include "swift/shims/MetadataSections.h"
 
 #include <cstddef>
 #include <new>

stdlib/public/SwiftShims/System.h renamed to stdlib/public/SwiftShims/swift/shims/System.h

@@ -17,8 +17,8 @@
 #ifndef SWIFT_RUNTIME_WEAKREFERENCE_H
 #define SWIFT_RUNTIME_WEAKREFERENCE_H
 
-#include "../../../stdlib/public/SwiftShims/Target.h"
-#include "../SwiftShims/Visibility.h"
+#include "swift/shims/Target.h"
+#include "swift/shims/Visibility.h"
 #include "swift/Runtime/Config.h"
 #include "swift/Runtime/HeapObject.h"
 #include "swift/Runtime/Metadata.h"

stdlib/public/SwiftShims/Target.h renamed to stdlib/public/SwiftShims/swift/shims/Target.h

@@ -13,7 +13,7 @@
 #include "swift/Runtime/Config.h"
 #include "swift/Runtime/Debug.h"
 #include "swift/Runtime/Portability.h"
-#include "SwiftShims/AssertionReporting.h"
+#include "swift/shims/AssertionReporting.h"
 #include <cstdarg>
 #include <cstdint>
 #include <stdio.h>