Merge pull request apple#122 from scallanan/repl-no-darwin

Eliminated repl_swift's dependency on the Darwin overlay.

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)";
+				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";
 				WARNING_CFLAGS = (
 					"-Wreorder",
 					"-Wno-newline-eof",

scripts/Xcode/build-swift-repl.py

@@ -28,6 +28,16 @@ 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
 
 
@@ -106,10 +116,9 @@ def module_cache_args_for_repl():
 
 def swiftc_args_for_repl():
     return [swiftc_path(),
-            "-DXCODE_BUILD_ME"] + target_arg_for_repl() + ["-g",
-                                                           "-o",
+            "-DXCODE_BUILD_ME"] + target_arg_for_repl() + ["-o",
                                                            repl_executable(),
-                                                           repl_source_file()] + module_cache_args_for_repl() + linker_args_for_repl()
+                                                           repl_source_file()] + module_cache_args_for_repl() + search_args_for_repl() +  linker_args_for_repl()
 
 
 def strip_args_for_repl():

tools/repl/swift/CMakeLists.txt

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

tools/repl/swift/REPLTime/REPLTime.h

@@ -0,0 +1,38 @@
+// REPLTime.h
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+// -----------------------------------------------------------------------------
+
+#ifndef REPL_TIME_H
+#define REPL_TIME_H
+
+typedef unsigned long long uint64_t;
+typedef unsigned int uint32_t;
+typedef int kern_return_t;
+
+struct mach_timebase_info {
+  uint32_t numer;
+  uint32_t denom;
+};
+
+typedef struct mach_timebase_info *mach_timebase_info_t;
+
+extern kern_return_t mach_timebase_info(mach_timebase_info_t info);
+extern uint64_t mach_absolute_time();
+
+kern_return_t __attribute__ ((always_inline)) REPL_mach_timebase_info(mach_timebase_info_t info) {
+  return mach_timebase_info(info);
+}
+
+uint64_t __attribute__ ((always_inline)) REPL_mach_absolute_time() {
+  return mach_absolute_time();
+}
+
+#endif //REPL_TIME_H

tools/repl/swift/REPLTime/module.modulemap

@@ -0,0 +1,4 @@
+module REPLTime [extern_c] {
+  header "REPLTime.h"
+  export *
+}

tools/repl/swift/main.swift

@@ -14,7 +14,8 @@
 // lands in an external Xcode build.
 #if XCODE_BUILD_ME || !_runtime(_ObjC)
 #if _runtime(_ObjC)
-import Darwin
+// LLDB may not depend on overlays, so do not import any modules that LLDB doesn't build.
+import REPLTime
 #endif
 
 func repl_main() -> Int
@@ -38,13 +39,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 = mach_timebase_info(numer: 0, denom: 0)
-Darwin.mach_timebase_info(&timebase_info)
+var timebase_info = REPLTime.mach_timebase_info(numer: 0, denom: 0)
+REPLTime.REPL_mach_timebase_info(&timebase_info)
 var subsequent_short = 0
 while subsequent_short < 3 {
-    var start = Darwin.mach_absolute_time()
+    var start = REPLTime.REPL_mach_absolute_time()
     repl_main()
-    var end = Darwin.mach_absolute_time()
+    var end = REPLTime.REPL_mach_absolute_time()
     var elapsedTicks = end - start
     var elapsedNano = (elapsedTicks * UInt64(timebase_info.numer)) / UInt64(timebase_info.denom)
     if elapsedNano < 100000 {