Rename Reflection library to RemoteInspection (swiftlang#62846)

Azoy · web-flow · commit 382510fa508e · 2023-01-06T13:21:32.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1196,8 +1196,8 @@ else()
     add_subdirectory(stdlib/public/BackDeployConcurrency)
   endif()
 
-  # Some tools (e.g. swift-reflection-dump) rely on a host swiftReflection, so
-  # ensure we build that when building tools.
+  # Some tools (e.g. swift-reflection-dump) rely on a host swiftRemoteInspection,
+  # so ensure we build that when building tools.
   if(SWIFT_INCLUDE_TOOLS)
     add_subdirectory(stdlib/public/SwiftShims/swift/shims)
   endif()
diff --git a/include/swift/RemoteInspection/MetadataSource.h b/include/swift/RemoteInspection/MetadataSource.h
@@ -36,7 +36,7 @@ namespace reflection {
 
 enum class MetadataSourceKind {
 #define METADATA_SOURCE(Id, Parent) Id,
-#include "swift/Reflection/MetadataSources.def"
+#include "swift/RemoteInspection/MetadataSources.def"
 #undef METADATA_SOURCE
 };
 
@@ -344,7 +344,7 @@ class MetadataSourceVisitor {
       return static_cast<ImplClass*>(this) \
         ->visit##Id##MetadataSource(cast<Id##MetadataSource>(MS), \
                            ::std::forward<Args>(args)...);
-#include "swift/Reflection/MetadataSources.def"
+#include "swift/RemoteInspection/MetadataSources.def"
     }
   }
 };
diff --git a/include/swift/RemoteInspection/MetadataSourceBuilder.h b/include/swift/RemoteInspection/MetadataSourceBuilder.h
@@ -17,7 +17,7 @@
 #ifndef SWIFT_REFLECTION_METADATASOURCEBUILDER_H
 #define SWIFT_REFLECTION_METADATASOURCEBUILDER_H
 
-#include "swift/Reflection/MetadataSource.h"
+#include "swift/RemoteInspection/MetadataSource.h"
 
 namespace swift {
 namespace reflection {
diff --git a/include/swift/RemoteInspection/MetadataSources.def b/include/swift/RemoteInspection/MetadataSources.def
diff --git a/include/swift/RemoteInspection/Records.h b/include/swift/RemoteInspection/Records.h
diff --git a/include/swift/RemoteInspection/ReflectionContext.h b/include/swift/RemoteInspection/ReflectionContext.h
@@ -30,11 +30,11 @@
 #include "swift/Concurrency/Actor.h"
 #include "swift/Remote/MemoryReader.h"
 #include "swift/Remote/MetadataReader.h"
-#include "swift/Reflection/Records.h"
-#include "swift/Reflection/RuntimeInternals.h"
-#include "swift/Reflection/TypeLowering.h"
-#include "swift/Reflection/TypeRef.h"
-#include "swift/Reflection/TypeRefBuilder.h"
+#include "swift/RemoteInspection/Records.h"
+#include "swift/RemoteInspection/RuntimeInternals.h"
+#include "swift/RemoteInspection/TypeLowering.h"
+#include "swift/RemoteInspection/TypeRef.h"
+#include "swift/RemoteInspection/TypeRefBuilder.h"
 #include "swift/Basic/Unreachable.h"
 
 #include <set>
diff --git a/include/swift/RemoteInspection/RuntimeInternals.h b/include/swift/RemoteInspection/RuntimeInternals.h
diff --git a/include/swift/RemoteInspection/TypeLowering.h b/include/swift/RemoteInspection/TypeLowering.h
diff --git a/include/swift/RemoteInspection/TypeRef.h b/include/swift/RemoteInspection/TypeRef.h
@@ -34,7 +34,7 @@ using llvm::dyn_cast;
 
 enum class TypeRefKind {
 #define TYPEREF(Id, Parent) Id,
-#include "swift/Reflection/TypeRefs.def"
+#include "swift/RemoteInspection/TypeRefs.def"
 #undef TYPEREF
 };
 
@@ -1034,7 +1034,7 @@ class TypeRefVisitor {
       return static_cast<ImplClass*>(this) \
         ->visit##Id##TypeRef(cast<Id##TypeRef>(typeRef), \
                            ::std::forward<Args>(args)...);
-#include "swift/Reflection/TypeRefs.def"
+#include "swift/RemoteInspection/TypeRefs.def"
     }
 
     // We shouldn't get an unknown kind, but bad data might result in an unknown
diff --git a/include/swift/RemoteInspection/TypeRefBuilder.h b/include/swift/RemoteInspection/TypeRefBuilder.h
@@ -20,10 +20,10 @@
 
 #include "swift/Remote/ExternalTypeRefCache.h"
 #include "swift/Remote/MetadataReader.h"
-#include "swift/Reflection/MetadataSourceBuilder.h"
-#include "swift/Reflection/Records.h"
-#include "swift/Reflection/TypeLowering.h"
-#include "swift/Reflection/TypeRef.h"
+#include "swift/RemoteInspection/MetadataSourceBuilder.h"
+#include "swift/RemoteInspection/Records.h"
+#include "swift/RemoteInspection/TypeLowering.h"
+#include "swift/RemoteInspection/TypeRef.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallVector.h"
 #include <iomanip>
@@ -394,7 +394,7 @@ struct TypeRefDecl {
 /// it vends.
 class TypeRefBuilder {
 #define TYPEREF(Id, Parent) friend class Id##TypeRef;
-#include "swift/Reflection/TypeRefs.def"
+#include "swift/RemoteInspection/TypeRefs.def"
 
 public:
   using BuiltType = const TypeRef *;
@@ -437,7 +437,7 @@ class TypeRefBuilder {
 #define TYPEREF(Id, Parent) \
   std::unordered_map<TypeRefID, const Id##TypeRef *, \
                      TypeRefID::Hash, TypeRefID::Equal> Id##TypeRefs;
-#include "swift/Reflection/TypeRefs.def"
+#include "swift/RemoteInspection/TypeRefs.def"
 
 public:
   template <typename TypeRefTy, typename... Args>
diff --git a/include/swift/RemoteInspection/TypeRefs.def b/include/swift/RemoteInspection/TypeRefs.def
diff --git a/include/swift/Runtime/Metadata.h b/include/swift/Runtime/Metadata.h
@@ -18,7 +18,7 @@
 #define SWIFT_RUNTIME_METADATA_H
 
 #include "swift/ABI/Metadata.h"
-#include "swift/Reflection/Records.h"
+#include "swift/RemoteInspection/Records.h"
 #include "swift/Runtime/Once.h"
 #include "swift/shims/Visibility.h"
 
diff --git a/include/swift/StaticMirror/ObjectFileContext.h b/include/swift/StaticMirror/ObjectFileContext.h
@@ -13,7 +13,7 @@
 #ifndef SWIFT_OBJECT_FILE_CONTEXT_H
 #define SWIFT_OBJECT_FILE_CONTEXT_H
 
-#include "swift/Reflection/ReflectionContext.h"
+#include "swift/RemoteInspection/ReflectionContext.h"
 
 namespace llvm {
 namespace object {
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -45,7 +45,7 @@ add_subdirectory(RemoteAST)
 add_subdirectory(Sema)
 add_subdirectory(Serialization)
 add_subdirectory(SwiftDemangle)
-add_subdirectory(SwiftReflection)
+add_subdirectory(SwiftRemoteInspection)
 add_subdirectory(SwiftRemoteMirror)
 add_subdirectory(SIL)
 add_subdirectory(SILGen)
diff --git a/lib/IRGen/GenReflection.cpp b/lib/IRGen/GenReflection.cpp
@@ -23,8 +23,8 @@
 #include "swift/AST/SubstitutionMap.h"
 #include "swift/Basic/Platform.h"
 #include "swift/IRGen/Linking.h"
-#include "swift/Reflection/MetadataSourceBuilder.h"
-#include "swift/Reflection/Records.h"
+#include "swift/RemoteInspection/MetadataSourceBuilder.h"
+#include "swift/RemoteInspection/Records.h"
 #include "swift/SIL/SILModule.h"
 
 #include "ConstantBuilder.h"
diff --git a/lib/IRGen/MetadataPath.h b/lib/IRGen/MetadataPath.h
@@ -19,7 +19,7 @@
 #define SWIFT_IRGEN_METADATAPATH_H
 
 #include "swift/Basic/EncodedSequence.h"
-#include "swift/Reflection/MetadataSource.h"
+#include "swift/RemoteInspection/MetadataSource.h"
 #include "WitnessIndex.h"
 #include "IRGen.h"
 
diff --git a/lib/StaticMirror/BinaryScanningTool.cpp b/lib/StaticMirror/BinaryScanningTool.cpp
@@ -13,9 +13,9 @@
 #include "swift/StaticMirror/BinaryScanningTool.h"
 #include "swift/Basic/Unreachable.h"
 #include "swift/Demangling/Demangler.h"
-#include "swift/Reflection/ReflectionContext.h"
-#include "swift/Reflection/TypeRefBuilder.h"
-#include "swift/Reflection/TypeLowering.h"
+#include "swift/RemoteInspection/ReflectionContext.h"
+#include "swift/RemoteInspection/TypeRefBuilder.h"
+#include "swift/RemoteInspection/TypeLowering.h"
 #include "swift/Remote/CMemoryReader.h"
 #include "swift/StaticMirror/ObjectFileContext.h"
 
diff --git a/lib/StaticMirror/CMakeLists.txt b/lib/StaticMirror/CMakeLists.txt
@@ -4,4 +4,4 @@ add_swift_host_library(swiftStaticMirror STATIC
    LLVM_LINK_COMPONENTS object support)
 
  target_link_libraries(swiftStaticMirror PRIVATE
-     swiftReflection)
+     swiftRemoteInspection)
diff --git a/lib/StaticMirror/ObjectFileContext.cpp b/lib/StaticMirror/ObjectFileContext.cpp
@@ -13,9 +13,9 @@
 #include "swift/StaticMirror/ObjectFileContext.h"
 #include "swift/Basic/Unreachable.h"
 #include "swift/Demangling/Demangler.h"
-#include "swift/Reflection/ReflectionContext.h"
-#include "swift/Reflection/TypeLowering.h"
-#include "swift/Reflection/TypeRefBuilder.h"
+#include "swift/RemoteInspection/ReflectionContext.h"
+#include "swift/RemoteInspection/TypeLowering.h"
+#include "swift/RemoteInspection/TypeRefBuilder.h"
 #include "swift/Remote/CMemoryReader.h"
 
 #include "llvm/ADT/StringSet.h"
diff --git a/lib/SwiftReflection/CMakeLists.txt b/lib/SwiftReflection/CMakeLists.txt
diff --git a/lib/SwiftRemoteInspection/CMakeLists.txt b/lib/SwiftRemoteInspection/CMakeLists.txt
@@ -0,0 +1,9 @@
+
+add_swift_host_library(swiftRemoteInspection STATIC
+  ${SWIFT_SOURCE_DIR}/stdlib/public/RemoteInspection/MetadataSource.cpp
+  ${SWIFT_SOURCE_DIR}/stdlib/public/RemoteInspection/TypeLowering.cpp
+  ${SWIFT_SOURCE_DIR}/stdlib/public/RemoteInspection/TypeRef.cpp
+  ${SWIFT_SOURCE_DIR}/stdlib/public/RemoteInspection/TypeRefBuilder.cpp)
+target_compile_options(swiftRemoteInspection PRIVATE -DSWIFT_ENABLE_REFLECTION)
+target_link_libraries(swiftRemoteInspection PUBLIC
+  swiftDemangling)
diff --git a/stdlib/public/CMakeLists.txt b/stdlib/public/CMakeLists.txt
@@ -64,7 +64,7 @@ add_subdirectory(SwiftShims/swift/shims)
 add_subdirectory(CommandLineSupport)
 add_subdirectory(Threading)
 
-# This static library is shared across swiftCore and swiftReflection
+# This static library is shared across swiftCore and swiftRemoteInspection
 if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_REMOTE_MIRROR)
   # TODO: due to the use of `add_swift_target_library` rather than `add_library`
   # we cannot use `target_sources` and thus must resort to list manipulations to
@@ -149,7 +149,7 @@ if(SWIFT_BUILD_STDLIB)
 endif()
 
 if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_REMOTE_MIRROR)
-  add_subdirectory(Reflection)
+  add_subdirectory(RemoteInspection)
   add_subdirectory(SwiftRemoteMirror)
 endif()
 
diff --git a/stdlib/public/Concurrency/TaskPrivate.h b/stdlib/public/Concurrency/TaskPrivate.h
@@ -288,7 +288,7 @@ class alignas(2 * sizeof(void*)) ActiveTaskStatus {
 
   // Note: this structure is mirrored by ActiveTaskStatusWithEscalation and
   // ActiveTaskStatusWithoutEscalation in
-  // include/swift/Reflection/RuntimeInternals.h. Any changes to the layout here
+  // include/swift/RemoteInspection/RuntimeInternals.h. Any changes to the layout here
   // must also be made there.
 #if SWIFT_CONCURRENCY_ENABLE_PRIORITY_ESCALATION && SWIFT_POINTER_IS_4_BYTES
   uint32_t Flags;
diff --git a/stdlib/public/Reflection/CMakeLists.txt b/stdlib/public/Reflection/CMakeLists.txt
diff --git a/stdlib/public/RemoteInspection/CMakeLists.txt b/stdlib/public/RemoteInspection/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(swiftRemoteInspection_SOURCES
+  MetadataSource.cpp
+  TypeLowering.cpp
+  TypeRef.cpp
+  TypeRefBuilder.cpp)
+
+set(swiftRemoteInspection_C_COMPILE_FLAGS -DswiftCore_EXPORTS)
+if(SWIFT_ENABLE_REFLECTION)
+  list(APPEND swiftRemoteInspection_C_COMPILE_FLAGS -DSWIFT_ENABLE_REFLECTION)
+endif()
+
+add_swift_target_library(swiftRemoteInspection STATIC
+  ${swiftRemoteInspection_SOURCES}
+  C_COMPILE_FLAGS ${SWIFT_RUNTIME_CXX_FLAGS} ${swiftRemoteInspection_C_COMPILE_FLAGS}
+  LINK_FLAGS ${SWIFT_RUNTIME_LINK_FLAGS}
+  INCORPORATE_OBJECT_LIBRARIES
+    swiftLLVMSupport swiftDemangling swiftDemanglingCR
+  SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
+  INSTALL_IN_COMPONENT dev)
diff --git a/stdlib/public/RemoteInspection/MetadataSource.cpp b/stdlib/public/RemoteInspection/MetadataSource.cpp
@@ -12,7 +12,7 @@
 
 #if SWIFT_ENABLE_REFLECTION
 
-#include "swift/Reflection/MetadataSource.h"
+#include "swift/RemoteInspection/MetadataSource.h"
 #include <iostream>
 
 using namespace swift;
diff --git a/stdlib/public/RemoteInspection/TypeLowering.cpp b/stdlib/public/RemoteInspection/TypeLowering.cpp
@@ -23,9 +23,9 @@
 #include "llvm/Support/MathExtras.h"
 #include "swift/ABI/Enum.h"
 #include "swift/ABI/MetadataValues.h"
-#include "swift/Reflection/TypeLowering.h"
-#include "swift/Reflection/TypeRef.h"
-#include "swift/Reflection/TypeRefBuilder.h"
+#include "swift/RemoteInspection/TypeLowering.h"
+#include "swift/RemoteInspection/TypeRef.h"
+#include "swift/RemoteInspection/TypeRefBuilder.h"
 #include "swift/Basic/Unreachable.h"
 #include <iostream>
 #include <sstream>
diff --git a/stdlib/public/RemoteInspection/TypeRef.cpp b/stdlib/public/RemoteInspection/TypeRef.cpp
@@ -19,8 +19,8 @@
 
 #include "swift/Basic/Range.h"
 #include "swift/Demangling/Demangle.h"
-#include "swift/Reflection/TypeRef.h"
-#include "swift/Reflection/TypeRefBuilder.h"
+#include "swift/RemoteInspection/TypeRef.h"
+#include "swift/RemoteInspection/TypeRefBuilder.h"
 #include <iostream>
 
 using namespace swift;
diff --git a/stdlib/public/RemoteInspection/TypeRefBuilder.cpp b/stdlib/public/RemoteInspection/TypeRefBuilder.cpp
@@ -17,11 +17,11 @@
 
 #if SWIFT_ENABLE_REFLECTION
 
-#include "swift/Reflection/TypeRefBuilder.h"
+#include "swift/RemoteInspection/TypeRefBuilder.h"
 #include "swift/Demangling/Demangle.h"
-#include "swift/Reflection/Records.h"
-#include "swift/Reflection/TypeLowering.h"
-#include "swift/Reflection/TypeRef.h"
+#include "swift/RemoteInspection/Records.h"
+#include "swift/RemoteInspection/TypeLowering.h"
+#include "swift/RemoteInspection/TypeRef.h"
 #include "swift/Remote/MetadataReader.h"
 #include <iomanip>
 #include <iostream>
diff --git a/stdlib/public/SwiftRemoteMirror/CMakeLists.txt b/stdlib/public/SwiftRemoteMirror/CMakeLists.txt
@@ -5,7 +5,7 @@ if(SWIFT_BUILD_DYNAMIC_STDLIB)
                            SHARED DONT_EMBED_BITCODE NOSWIFTRT
                            SwiftRemoteMirror.cpp
                            LINK_LIBRARIES
-                             swiftReflection
+                             swiftRemoteInspection
                            C_COMPILE_FLAGS
                              ${SWIFT_RUNTIME_CXX_FLAGS} -DswiftRemoteMirror_EXPORTS -I${LLVM_MAIN_INCLUDE_DIR}
                            LINK_FLAGS
diff --git a/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp b/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp
@@ -23,8 +23,8 @@ SWIFT_REMOTE_MIRROR_LINKAGE uint32_t swift_reflection_libraryVersion = 3;
 }
 
 #include "swift/Demangling/Demangler.h"
-#include "swift/Reflection/ReflectionContext.h"
-#include "swift/Reflection/TypeLowering.h"
+#include "swift/RemoteInspection/ReflectionContext.h"
+#include "swift/RemoteInspection/TypeLowering.h"
 #include "swift/Remote/CMemoryReader.h"
 #include "swift/Basic/Unreachable.h"
 
diff --git a/stdlib/public/runtime/Demangle.cpp b/stdlib/public/runtime/Demangle.cpp
@@ -228,7 +228,7 @@ swift::_buildDemanglingForContext(const ContextDescriptor *context,
 }
 
 // FIXME: This stuff should be merged with the existing logic in
-// include/swift/Reflection/TypeRefBuilder.h as part of the rewrite
+// include/swift/RemoteInspection/TypeRefBuilder.h as part of the rewrite
 // to change stdlib reflection over to using remote mirrors.
 
 Demangle::NodePointer
diff --git a/stdlib/public/runtime/MetadataLookup.cpp b/stdlib/public/runtime/MetadataLookup.cpp
@@ -21,7 +21,7 @@
 #include "swift/Basic/Lazy.h"
 #include "swift/Demangling/Demangler.h"
 #include "swift/Demangling/TypeDecoder.h"
-#include "swift/Reflection/Records.h"
+#include "swift/RemoteInspection/Records.h"
 #include "swift/Runtime/Casting.h"
 #include "swift/Runtime/Concurrent.h"
 #include "swift/Runtime/Debug.h"
diff --git a/stdlib/tools/swift-reflection-test/CMakeLists.txt b/stdlib/tools/swift-reflection-test/CMakeLists.txt
@@ -3,7 +3,7 @@ add_swift_target_executable(swift-reflection-test BUILD_WITH_STDLIB
   overrides.c
   LINK_LIBRARIES
     swiftRemoteMirror
-    swiftReflection)
+    swiftRemoteInspection)
 # NOTE(compnerd) since _WINDLL has no impact on non-Windows targets,
 # we just spam it on all the targets for simplicity due to the build
 # structure of swift.  This will make the global variable imported,
diff --git a/test/TypeRoundTrip/Inputs/RoundTrip/RoundTrip.cpp b/test/TypeRoundTrip/Inputs/RoundTrip/RoundTrip.cpp
@@ -1,6 +1,6 @@
 #include "swift/ABI/Metadata.h"
 #include "swift/Demangling/Demangle.h"
-#include "swift/Reflection/TypeRefBuilder.h"
+#include "swift/RemoteInspection/TypeRefBuilder.h"
 #include "swift/Remote/MetadataReader.h"
 #include "swift/Remote/InProcessMemoryReader.h"
 
diff --git a/test/TypeRoundTrip/round-trip.swift b/test/TypeRoundTrip/round-trip.swift
@@ -6,7 +6,7 @@
 // RUN: echo "func runAllTests() throws {" >> %t/all-tests.swift
 // RUN: for module in %S/Inputs/testcases/*.swift; do modname=$(basename $module .swift); %target-build-swift -g -static -emit-module-path %t/$modname.swiftmodule -emit-module -emit-library -module-name $modname -o %t/%target-static-library-name($modname) -I%t -L%t $module -lRoundTrip; echo "  print(\"--- $modname\")" >> %t/all-tests.swift; echo "  $modname.test()" >> %t/all-tests.swift; echo "  print(\"\")" >> %t/all-tests.swift; echo "-l$modname" >> %t/link.txt; done
 // RUN: echo "}" >> %t/all-tests.swift
-// RUN: %target-build-swift -g -I%t -o %t/round-trip %s %t/all-tests.swift -L%t %target-cxx-lib $(cat %t/link.txt) -lm -lRoundTrip -lswiftReflection
+// RUN: %target-build-swift -g -I%t -o %t/round-trip %s %t/all-tests.swift -L%t %target-cxx-lib $(cat %t/link.txt) -lm -lRoundTrip -lswiftRemoteInspection
 // RUN: %target-codesign %t/round-trip
 // RUN: %target-run %t/round-trip | %FileCheck %s
 
diff --git a/tools/libStaticMirror/CMakeLists.txt b/tools/libStaticMirror/CMakeLists.txt
@@ -18,7 +18,7 @@ add_dependencies(libStaticMirror
 
 target_link_libraries(libStaticMirror PRIVATE
     swiftStaticMirror
-    swiftReflection)
+    swiftRemoteInspection)
 
 set_target_properties(libStaticMirror
     PROPERTIES
diff --git a/tools/libSwiftScan/CMakeLists.txt b/tools/libSwiftScan/CMakeLists.txt
diff --git a/tools/swift-reflection-dump/CMakeLists.txt b/tools/swift-reflection-dump/CMakeLists.txt
diff --git a/tools/swift-reflection-dump/swift-reflection-dump.cpp b/tools/swift-reflection-dump/swift-reflection-dump.cpp
diff --git a/tools/swift-reflection-fuzzer/CMakeLists.txt b/tools/swift-reflection-fuzzer/CMakeLists.txt
diff --git a/tools/swift-reflection-fuzzer/swift-reflection-fuzzer.cpp b/tools/swift-reflection-fuzzer/swift-reflection-fuzzer.cpp
diff --git a/unittests/Reflection/CMakeLists.txt b/unittests/Reflection/CMakeLists.txt
diff --git a/unittests/Reflection/TypeRef.cpp b/unittests/Reflection/TypeRef.cpp
