From 30db45e81306a0eaa198c2e491f7b6f477dfe58c Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandro_alonso@apple.com>
Date: Wed, 25 Jan 2023 23:11:18 -0800
Subject: [PATCH] [Reflection] Remove folder in shims

---
 stdlib/public/SwiftShims/swift/shims/CMakeLists.txt         | 3 +--
 .../{_SwiftRuntimeShims/Functions.h => _SwiftRuntime.h}     | 6 +++---
 stdlib/public/SwiftShims/swift/shims/module.modulemap       | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename stdlib/public/SwiftShims/swift/shims/{_SwiftRuntimeShims/Functions.h => _SwiftRuntime.h} (86%)

diff --git a/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt b/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt
index 90f66795c37ed..b0df12ada5d26 100644
--- a/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt
+++ b/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt
@@ -23,8 +23,7 @@ set(sources
   Visibility.h
   _SwiftConcurrency.h
   _SwiftDistributed.h
-
-  _SwiftRuntimeShims/Functions.h
+  _SwiftRuntime.h
 
   module.modulemap
   )
diff --git a/stdlib/public/SwiftShims/swift/shims/_SwiftRuntimeShims/Functions.h b/stdlib/public/SwiftShims/swift/shims/_SwiftRuntime.h
similarity index 86%
rename from stdlib/public/SwiftShims/swift/shims/_SwiftRuntimeShims/Functions.h
rename to stdlib/public/SwiftShims/swift/shims/_SwiftRuntime.h
index b640d4c14a8b8..23645cd6616c2 100644
--- a/stdlib/public/SwiftShims/swift/shims/_SwiftRuntimeShims/Functions.h
+++ b/stdlib/public/SwiftShims/swift/shims/_SwiftRuntime.h
@@ -9,8 +9,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_REFLECTION_FUNCTIONS_H
-#define SWIFT_REFLECTION_FUNCTIONS_H
+#ifndef SWIFT_REFLECTION_RUNTIME_H
+#define SWIFT_REFLECTION_RUNTIME_H
 
 // OpaqueValue *swift_projectBox(HeapObject *object);
 extern void *swift_projectBox(void *object);
@@ -19,4 +19,4 @@ extern void *swift_projectBox(void *object);
 //                                        ProtocolDescriptor *protocol);
 extern void *swift_conformsToProtocol(const void *type, const void *protocol);
 
-#endif /* SWIFT_REFLECTION_FUNCTIONS_H */
+#endif /* SWIFT_REFLECTION_RUNTIME_H */
diff --git a/stdlib/public/SwiftShims/swift/shims/module.modulemap b/stdlib/public/SwiftShims/swift/shims/module.modulemap
index c7c743b9a9e9d..57e872cd2594e 100644
--- a/stdlib/public/SwiftShims/swift/shims/module.modulemap
+++ b/stdlib/public/SwiftShims/swift/shims/module.modulemap
@@ -32,6 +32,6 @@ module SwiftOverlayShims {
 }
 
 module _SwiftRuntimeShims {
-  header "_SwiftRuntimeShims/Functions.h"
+  header "_SwiftRuntime.h"
   export *
 }