Revert "Eliminated repl_swift's dependency on the Darwin overlay."

This reverts commit 95a38ac.

Author: scallanan

lldb.xcodeproj/project.pbxproj

@@ -10469,7 +10469,7 @@
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = debugging;
 				SWIFT_FORCE_DYNAMIC_LINK_STDLIB = "";
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_SOURCE_DIR)/tools/swift/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/swift/include $(LLVM_SOURCE_DIR)/tools/swift/lib $(LLVM_BUILD_DIR)/$(SWIFT_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM $(CONFIGURATION_BUILD_DIR) $(SRCROOT)/tools/repl/swift/REPLTime";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include $(LLVM_SOURCE_DIR)/tools/swift/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/swift/include $(LLVM_SOURCE_DIR)/tools/swift/lib $(LLVM_BUILD_DIR)/$(SWIFT_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/lib/Target/ARM $(CONFIGURATION_BUILD_DIR)";
 				WARNING_CFLAGS = (
 					"-Wreorder",
 					"-Wno-newline-eof",

scripts/Xcode/build-swift-repl.py

@@ -28,16 +28,6 @@ def repl_executable():
 def repl_source_file():
     return sys.argv[2]
 
-
-def REPLTime_dir():
-    source_file = repl_source_file()
-    source_dir = os.path.dirname(source_file)
-    return os.path.join(source_dir, "REPLTime")
-
-
-def search_args_for_repl():
-    return ["-I" + REPLTime_dir()]
-
 # Xcode interface
 
 
@@ -119,7 +109,7 @@ def swiftc_args_for_repl():
             "-DXCODE_BUILD_ME"] + target_arg_for_repl() + ["-g",
                                                            "-o",
                                                            repl_executable(),
-                                                           repl_source_file()] + module_cache_args_for_repl() + search_args_for_repl() +  linker_args_for_repl()
+                                                           repl_source_file()] + module_cache_args_for_repl() + linker_args_for_repl()
 
 
 def strip_args_for_repl():

tools/repl/swift/CMakeLists.txt

@@ -20,8 +20,7 @@ endif()
 
 set(swift_compile_cmd "${LLDB_SWIFTC}"
                       -resource-dir "${LLDB_PATH_TO_SWIFT_BUILD}/lib/swift"
-                      -module-cache-path "${module_cache_dir}"
-                      -I${CMAKE_CURRENT_SOURCE_DIR}/REPLTime)
+                      -module-cache-path "${module_cache_dir}")
 
 if(CMAKE_CROSSCOMPILING)
   set(swift_compile_cmd ${swift_compile_cmd} -target "${LLVM_HOST_TRIPLE}" -sdk "${CMAKE_SYSROOT}")

tools/repl/swift/REPLTime/REPLTime.h

@@ -14,7 +14,7 @@
 // lands in an external Xcode build.
 #if XCODE_BUILD_ME || !_runtime(_ObjC)
 #if _runtime(_ObjC)
-import REPLTime
+import Darwin
 #endif
 
 func repl_main() -> Int
@@ -38,13 +38,13 @@ func repl_main() -> Int
 // we want this program to exit without consuming 100% CPU, so we detect any loops
 // that take less than 100us and if we get three of them in a row, we exit.
 
-var timebase_info = REPLTime.mach_timebase_info(numer: 0, denom: 0)
-REPLTime.REPL_mach_timebase_info(&timebase_info)
+var timebase_info = mach_timebase_info(numer: 0, denom: 0)
+Darwin.mach_timebase_info(&timebase_info)
 var subsequent_short = 0
 while subsequent_short < 3 {
-    var start = REPLTime.REPL_mach_absolute_time()
+    var start = Darwin.mach_absolute_time()
     repl_main()
-    var end = REPLTime.REPL_mach_absolute_time()
+    var end = Darwin.mach_absolute_time()
     var elapsedTicks = end - start
     var elapsedNano = (elapsedTicks * UInt64(timebase_info.numer)) / UInt64(timebase_info.denom)
     if elapsedNano < 100000 {