[Backtracing] Turn off MemberImportVisibility.

Also fixed a couple of other minor issues preventing this PR from
building on its own.

rdar://137201928

Author: al45tair

stdlib/public/Backtracing/CMakeLists.txt

@@ -53,7 +53,8 @@ set(BACKTRACING_COMPILE_FLAGS
   "-Xfrontend;-experimental-spi-only-imports"
   "-Xcc;-I${SWIFT_SOURCE_DIR}/include"
   "-Xcc;-I${CMAKE_BINARY_DIR}/include"
-  "-Xcc;-I${SWIFT_STDLIB_SOURCE_DIR}/public/Backtracing/modules")
+  "-Xcc;-I${SWIFT_STDLIB_SOURCE_DIR}/public/Backtracing/modules"
+  "-disable-upcoming-feature;MemberImportVisibility")
 
 ###TODO: Add these when we add static linking support
 #

stdlib/public/Backtracing/Elf.swift

@@ -75,6 +75,7 @@ let EI_VERSION    = swift.runtime.EI_VERSION
 let EI_OSABI      = swift.runtime.EI_OSABI
 let EI_ABIVERSION = swift.runtime.EI_ABIVERSION
 let EI_PAD        = swift.runtime.EI_PAD
+let EI_NIDENT     = BacktracingImpl.EI_NIDENT
 
 let ELFMAG0 = swift.runtime.ELFMAG0
 let ELFMAG1 = swift.runtime.ELFMAG1
@@ -181,6 +182,12 @@ let DF_TEXTREL = swift.runtime.DF_TEXTREL
 let DF_BIND_NOW = swift.runtime.DF_BIND_NOW
 let DF_STATIC_TLS = swift.runtime.DF_STATIC_TLS
 
+let NT_GNU_ABI_TAG = swift.runtime.NT_GNU_ABI_TAG
+let NT_GNU_HWCAP = swift.runtime.NT_GNU_HWCAP
+let NT_GNU_BUILD_ID = swift.runtime.NT_GNU_BUILD_ID
+let NT_GNU_GOLD_VERSION = swift.runtime.NT_GNU_GOLD_VERSION
+let NT_GNU_PROPERTY_TYPE_0 = swift.runtime.NT_GNU_PROPERTY_TYPE_0
+
 typealias Elf32_Ehdr = swift.runtime.Elf32_Ehdr
 typealias Elf64_Ehdr = swift.runtime.Elf64_Ehdr
 
@@ -1365,7 +1372,7 @@ class ElfImage<SomeImageSource: ImageSource,
     }
 
     for note in notes {
-      if note.name == "GNU" && note.type == ImageFormats.NT_GNU_BUILD_ID {
+      if note.name == "GNU" && note.type == NT_GNU_BUILD_ID {
         _uuid = note.desc
         return _uuid
       }

stdlib/public/libexec/swift-backtrace/CMakeLists.txt

@@ -27,7 +27,8 @@ set(BACKTRACING_COMPILE_FLAGS
   "-cxx-interoperability-mode=default"
   "-I${SWIFT_STDLIB_SOURCE_DIR}/public/Backtracing/modules"
   "-Xcc;-I${SWIFT_SOURCE_DIR}/include"
-  "-Xcc;-I${CMAKE_BINARY_DIR}/include")
+  "-Xcc;-I${CMAKE_BINARY_DIR}/include"
+  "-disable-upcoming-feature;MemberImportVisibility")
 
 set(BACKTRACING_SOURCES
   main.swift

stdlib/public/libexec/swift-backtrace/TargetLinux.swift

@@ -29,8 +29,6 @@ import _Backtracing
 @_spi(MemoryReaders) import _Backtracing
 @_spi(Utils) import _Backtracing
 
-internal import Runtime
-
 enum SomeBacktrace {
   case raw(Backtrace)
   case symbolicated(SymbolicatedBacktrace)