Revert "Symbol graph support"

Author: compnerd

include/swift/AST/Decl.h

@@ -875,8 +875,6 @@ class alignas(1 << DeclAlignInBits) Decl {
   LLVM_READONLY
   const GenericContext *getAsGenericContext() const;
 
-  bool hasUnderscoredNaming() const;
-
   bool isPrivateStdlibDecl(bool treatNonBuiltinProtocolsAsPublic = true) const;
 
   AvailabilityContext getAvailabilityForLinkage() const;

include/swift/AST/PrintOptions.h

@@ -380,13 +380,6 @@ struct PrintOptions {
   ArgAndParamPrintingMode ArgAndParamPrinting =
       ArgAndParamPrintingMode::MatchSource;
 
-  /// Whether to print the default argument value string
-  /// representation.
-  bool PrintDefaultArgumentValue = true;
-
-  /// Whether to print "_" placeholders for empty arguments.
-  bool PrintEmptyArgumentNames = true;
-
   /// Whether to print documentation comments attached to declarations.
   /// Note that this may print documentation comments from related declarations
   /// (e.g. the overridden method in the superclass) if such comment is found.

include/swift/Driver/Driver.h

@@ -158,8 +158,7 @@ class Driver {
     Interactive,     // swift
     Batch,           // swiftc
     AutolinkExtract, // swift-autolink-extract
-    SwiftIndent,     // swift-indent
-    SymbolGraph      // swift-symbolgraph
+    SwiftIndent      // swift-indent
   };
 
   class InputInfoMap;

include/swift/SymbolGraphGen/SymbolGraphGen.h

@@ -2632,9 +2632,6 @@ void PrintAST::printOneParameter(const ParamDecl *param,
       // Else, print the argument only.
       LLVM_FALLTHROUGH;
     case PrintOptions::ArgAndParamPrintingMode::ArgumentOnly:
-      if (ArgName.empty() && !Options.PrintEmptyArgumentNames) {
-        return;
-      }
       Printer.printName(ArgName, PrintNameContext::FunctionParameterExternal);
 
       if (!ArgNameIsAPIByDefault && !ArgName.empty())
@@ -2689,7 +2686,7 @@ void PrintAST::printOneParameter(const ParamDecl *param,
   if (param->isVariadic())
     Printer << "...";
 
-  if (param->isDefaultArgument() && Options.PrintDefaultArgumentValue) {
+  if (param->isDefaultArgument()) {
     SmallString<128> scratch;
     auto defaultArgStr = param->getDefaultValueStringRepresentation(scratch);
 

lib/AST/ASTPrinter.cpp

@@ -697,56 +697,6 @@ bool ParameterList::hasInternalParameter(StringRef Prefix) const {
   return false;
 }
 
-bool Decl::hasUnderscoredNaming() const {
-  const Decl *D = this;
-  if (const auto AFD = dyn_cast<AbstractFunctionDecl>(D)) {
-    // If it's a function with a parameter with leading underscore, it's a
-    // private function.
-    if (AFD->getParameters()->hasInternalParameter("_")) {
-      return true;
-    }
-  }
-
-  if (const auto SubscriptD = dyn_cast<SubscriptDecl>(D)) {
-    if (SubscriptD->getIndices()->hasInternalParameter("_")) {
-      return true;
-    }
-  }
-
-  if (const auto PD = dyn_cast<ProtocolDecl>(D)) {
-    if (PD->getAttrs().hasAttribute<ShowInInterfaceAttr>()) {
-      return false;
-    }
-    StringRef NameStr = PD->getNameStr();
-    if (NameStr.startswith("_Builtin")) {
-      return true;
-    }
-    if (NameStr.startswith("_ExpressibleBy")) {
-      return true;
-    }
-  }
-
-  if (const auto ImportD = dyn_cast<ImportDecl>(D)) {
-    if (const auto *Mod = ImportD->getModule()) {
-      if (Mod->isSwiftShimsModule()) {
-        return true;
-      }
-    }
-  }
-
-  const auto VD = dyn_cast<ValueDecl>(D);
-  if (!VD || !VD->hasName()) {
-    return false;
-  }
-
-  if (!VD->getBaseName().isSpecial() &&
-      VD->getBaseName().getIdentifier().str().startswith("_")) {
-    return true;
-  }
-
-  return false;
-}
-
 bool Decl::isPrivateStdlibDecl(bool treatNonBuiltinProtocolsAsPublic) const {
   const Decl *D = this;
   if (auto ExtD = dyn_cast<ExtensionDecl>(D)) {
@@ -768,12 +718,47 @@ bool Decl::isPrivateStdlibDecl(bool treatNonBuiltinProtocolsAsPublic) const {
       FU->getKind() != FileUnitKind::SerializedAST)
     return false;
 
+  if (auto AFD = dyn_cast<AbstractFunctionDecl>(D)) {
+    // If it's a function with a parameter with leading underscore, it's a
+    // private function.
+    if (AFD->getParameters()->hasInternalParameter("_"))
+      return true;
+  }
+
+  if (auto SubscriptD = dyn_cast<SubscriptDecl>(D)) {
+    if (SubscriptD->getIndices()->hasInternalParameter("_"))
+      return true;
+  }
+
   if (auto PD = dyn_cast<ProtocolDecl>(D)) {
+    if (PD->getAttrs().hasAttribute<ShowInInterfaceAttr>())
+      return false;
+    StringRef NameStr = PD->getNameStr();
+    if (NameStr.startswith("_Builtin"))
+      return true;
+    if (NameStr.startswith("_ExpressibleBy"))
+      return true;
     if (treatNonBuiltinProtocolsAsPublic)
       return false;
   }
 
-  return hasUnderscoredNaming();
+  if (auto ImportD = dyn_cast<ImportDecl>(D)) {
+    if (auto *Mod = ImportD->getModule()) {
+      if (Mod->isSwiftShimsModule())
+        return true;
+    }
+  }
+
+  auto VD = dyn_cast<ValueDecl>(D);
+  if (!VD || !VD->hasName())
+    return false;
+
+  // If the name has leading underscore then it's a private symbol.
+  if (!VD->getBaseName().isSpecial() &&
+      VD->getBaseName().getIdentifier().str().startswith("_"))
+    return true;
+
+  return false;
 }
 
 AvailabilityContext Decl::getAvailabilityForLinkage() const {

lib/AST/Decl.cpp

@@ -42,7 +42,6 @@ add_subdirectory(SwiftRemoteMirror)
 add_subdirectory(SIL)
 add_subdirectory(SILGen)
 add_subdirectory(SILOptimizer)
-add_subdirectory(SymbolGraphGen)
 add_subdirectory(Syntax)
 add_subdirectory(SyntaxParse)
 add_subdirectory(TBDGen)

lib/CMakeLists.txt

@@ -98,7 +98,6 @@ void Driver::parseDriverKind(ArrayRef<const char *> Args) {
   .Case("swiftc", DriverKind::Batch)
   .Case("swift-autolink-extract", DriverKind::AutolinkExtract)
   .Case("swift-indent", DriverKind::SwiftIndent)
-  .Case("swift-symbolgraph-extract", DriverKind::SymbolGraph)
   .Default(None);
 
   if (Kind.hasValue())
@@ -3253,7 +3252,6 @@ void Driver::printHelp(bool ShowHidden) const {
   case DriverKind::Batch:
   case DriverKind::AutolinkExtract:
   case DriverKind::SwiftIndent:
-  case DriverKind::SymbolGraph:
     ExcludedFlagsBitmask |= options::NoBatchOption;
     break;
   }

lib/Driver/Driver.cpp

@@ -115,6 +115,8 @@ LineList MarkupContext::getLineList(swift::RawComment RC) {
       // Determine if we have leading decorations in this block comment.
       bool HasASCIIArt = false;
       if (swift::startsWithNewline(Cleaned)) {
+        Builder.addLine(Cleaned.substr(0, 0), { C.Range.getStart(),
+                                                C.Range.getStart() });
         unsigned NewlineBytes = swift::measureNewline(Cleaned);
         Cleaned = Cleaned.drop_front(NewlineBytes);
         CleanedStartLoc = CleanedStartLoc.getAdvancedLocOrInvalid(NewlineBytes);