Merge remote-tracking branch 'apple/master'

Author: leoshimo

lib/Markup/Markup.cpp

@@ -16,7 +16,6 @@
 #include "swift/Markup/LineList.h"
 #include "swift/Markup/Markup.h"
 #include "cmark.h"
-#include "node.h"
 
 using namespace llvm;
 using namespace markup;
@@ -60,15 +59,7 @@ StringRef getLiteralContent(MarkupContext &MC, LineList &LL, cmark_node *Node) {
   // its parent.
   auto Literal = cmark_node_get_literal(Node);
   assert(Literal != nullptr);
-  size_t Length = 0;
-  switch (cmark_node_get_type(Node)) {
-  case CMARK_NODE_CODE_BLOCK:
-    Length = Node->as.code.literal.len;
-    break;
-  default:
-    Length = Node->as.literal.len;
-  }
-  return MC.allocateCopy(StringRef(Literal, Length));
+  return MC.allocateCopy(StringRef(Literal));
 }
 
 ParseResult<MarkupASTNode>

stdlib/public/core/Misc.swift

@@ -83,6 +83,30 @@ func _typeName(type: Any.Type, qualified: Bool = true) -> String {
     input: UnsafeBufferPointer(start: stringPtr, count: count))
 }
 
+@warn_unused_result
+@_silgen_name("swift_stdlib_demangleName")
+func _stdlib_demangleNameImpl(
+  mangledName: UnsafePointer<UInt8>,
+  _ mangledNameLength: UInt,
+  _ demangledName: UnsafeMutablePointer<String>)
+
+// NB: This function is not used directly in the Swift codebase, but is
+// exported for Xcode support. Please coordinate before changing.
+@warn_unused_result
+public // @testable
+func _stdlib_demangleName(mangledName: String) -> String {
+  let mangledNameUTF8 = Array(mangledName.utf8)
+  return mangledNameUTF8.withUnsafeBufferPointer {
+    (mangledNameUTF8) in
+    let (_, demangledName) = _withUninitializedString {
+      _stdlib_demangleNameImpl(
+        mangledNameUTF8.baseAddress, UInt(mangledNameUTF8.endIndex),
+        $0)
+    }
+    return demangledName
+  }
+}
+
 /// Returns `floor(log(x))`.  This equals to the position of the most
 /// significant non-zero bit, or 63 - number-of-zeros before it.
 ///

stdlib/public/core/String.swift

@@ -102,7 +102,7 @@ import SwiftShims
 /// any sequence of mutating operations causes elements to be copied
 /// into unique, contiguous storage which may cost `O(N)` time and
 /// space, where `N` is the length of the string representation (or
-/// more, if the underlying `NSString` is has unusual performance
+/// more, if the underlying `NSString` has unusual performance
 /// characteristics).
 public struct String {
   /// An empty `String`.

stdlib/public/runtime/Reflection.mm

@@ -1264,3 +1264,17 @@ static Mirror ObjC_getMirrorForSuperclass(Class sup,
     T->vw_destroy(value);
   return MirrorReturn(result);
 }
+
+// NB: This function is not used directly in the Swift codebase, but is
+// exported for Xcode support. Please coordinate before changing.
+extern "C" void swift_stdlib_demangleName(const char *mangledName,
+                                          size_t mangledNameLength,
+                                          String *demangledName) {
+  auto options = Demangle::DemangleOptions();
+  options.DisplayDebuggerGeneratedModule = false;
+  auto result =
+      Demangle::demangleSymbolAsString(mangledName,
+                                       mangledNameLength,
+                                       options);
+  new (demangledName) String(result.data(), result.size());
+}

test/1_stdlib/Runtime.swift

@@ -665,6 +665,16 @@ Runtime.test("typeName") {
   expectEqual("protocol<>.Protocol", _typeName(a.dynamicType))
 }
 
+Runtime.test("demangleName") {
+  expectEqual("", _stdlib_demangleName(""))
+  expectEqual("abc", _stdlib_demangleName("abc"))
+  expectEqual("\0", _stdlib_demangleName("\0"))
+  expectEqual("Swift.Double", _stdlib_demangleName("_TtSd"))
+  expectEqual("x.a : x.Foo<x.Foo<x.Foo<Swift.Int, Swift.Int>, x.Foo<Swift.Int, Swift.Int>>, x.Foo<x.Foo<Swift.Int, Swift.Int>, x.Foo<Swift.Int, Swift.Int>>>",
+      _stdlib_demangleName("_Tv1x1aGCS_3FooGS0_GS0_SiSi_GS0_SiSi__GS0_GS0_SiSi_GS0_SiSi___"))
+  expectEqual("Foobar", _stdlib_demangleName("_TtC13__lldb_expr_46Foobar"))
+}
+
 Runtime.test("_stdlib_atomicCompareExchangeStrongPtr") {
   typealias IntPtr = UnsafeMutablePointer<Int>
   var origP1 = IntPtr(bitPattern: 0x10101010)

test/Driver/environment.swift

@@ -1,4 +1,5 @@
 // FIXME: This is failing on some of Apple's internal CI.
+// FIXME: <rdar://problem/23771412> Fix test/Driver/{environment.swift,options-interpreter.swift}
 // REQUIRES: disabled
 
 // RUN: %swift_driver -target x86_64-apple-macosx10.9 -L/foo/ -driver-use-frontend-path %S/Inputs/print-var.sh %s DYLD_LIBRARY_PATH | FileCheck %s

test/Driver/options-interpreter.swift

@@ -1,4 +1,5 @@
 // FIXME: This is failing on some of Apple's internal CI.
+// FIXME: <rdar://problem/23771412> Fix test/Driver/{environment.swift,options-interpreter.swift}
 // REQUIRES: disabled
 
 // RUN: not %swift_driver -deprecated-integrated-repl -emit-module 2>&1 | FileCheck -check-prefix=IMMEDIATE_NO_MODULE %s