averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove API notes compilation support from swiftc (#21759)

Browse Source 
We don't use this feature anymore (see 0149129ed), and now that we've
branched Swift 5.0 for the last time it's time to rip it out of swiftc
(and then from Clang).

No functionality change, unless someone was compiling their own API
notes. If you were doing that, just copy them into place as text.
This commit is contained in:
Jordan Rose
2019-01-16 10:39:39 -08:00
committed by GitHub
parent eb083ce84d
commit a23eaf4a02
5 changed files with 0 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
test/APINotes/Inputs/roundtrip.apinotes
View File

@@ -1,79 +0,0 @@
---
Name: AppKit
Availability: available
AvailabilityMsg: ''
Classes:
- Name: NSCell
Availability: available
AvailabilityMsg: ''
Methods:
- Selector: init
MethodKind: Instance
NullabilityOfRet: U
Availability: available
AvailabilityMsg: ''
DesignatedInit: true
- Selector: 'initImageCell:'
MethodKind: Instance
Nullability: [ N ]
NullabilityOfRet: U
Availability: available
AvailabilityMsg: ''
DesignatedInit: true
- Selector: 'initTextCell:'
MethodKind: Instance
Nullability: [ N ]
NullabilityOfRet: U
Availability: available
AvailabilityMsg: ''
DesignatedInit: true
- Selector: 'initWithCoder:'
MethodKind: Instance
Nullability: [ N ]
NullabilityOfRet: U
Availability: available
AvailabilityMsg: ''
DesignatedInit: true
Required: true
- Name: NSView
AuditedForNullability: true
Availability: available
AvailabilityMsg: ''
Methods:
- Selector: 'addSubview:'
MethodKind: Instance
Nullability: [ N ]
NullabilityOfRet: N
Availability: available
AvailabilityMsg: ''
- Selector: 'addSubview:positioned:relativeTo:'
MethodKind: Instance
Nullability: [ N, N, O ]
NullabilityOfRet: N
Availability: available
AvailabilityMsg: ''
- Selector: 'beginDraggingSessionWithItems:event:source:'
MethodKind: Instance
Nullability: [ U, U, N ]
NullabilityOfRet: N
Availability: available
AvailabilityMsg: ''
Properties:
- Name: enclosingScrollView
Nullability: O
Availability: available
AvailabilityMsg: ''
- Name: makeBackingLayer
Nullability: N
Availability: available
AvailabilityMsg: ''
Functions:
- Name: NSAvailableWindowDepths
NullabilityOfRet: N
Availability: available
AvailabilityMsg: ''
Globals:
- Name: NSCalibratedWhiteColorSpace
Nullability: N
Availability: available
AvailabilityMsg: ''

7
test/APINotes/yaml-roundtrip.swift
View File

@@ -1,7 +0,0 @@
# RUN: %swift_driver_plain -apinotes -yaml-to-binary -o %t.apinotesc %S/Inputs/roundtrip.apinotes
# RUN: %swift_driver_plain -apinotes -binary-to-yaml -o %t.apinotes %t.apinotesc
# Note: We don't diff the results because they will change as Clang's
# API notes support evolves, and we don't want to tie that closely to
# a specific Clang.

1
tools/driver/CMakeLists.txt
View File

@@ -1,5 +1,4 @@
add_swift_host_tool(swift
api_notes.cpp
driver.cpp
autolink_extract_main.cpp
modulewrap_main.cpp

158
tools/driver/api_notes.cpp
View File

@@ -1,158 +0,0 @@
//===--- api_notes.cpp - Swift Compiler Frontend --------------------------===//
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2014 - 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
//
//===----------------------------------------------------------------------===//
///
/// \file
/// This is the YAML to binary converter for API notes.
///
//===----------------------------------------------------------------------===//
#include "clang/APINotes/APINotesYAMLCompiler.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/Signals.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/Triple.h"
using namespace llvm;
namespace api_notes = clang::api_notes;
int apinotes_main(ArrayRef<const char *> Args) {
// Mark all our options with this category, everything else (except for
// -version and -help) will be hidden.
static cl::OptionCategory APINotesCategory("API Notes options");
static cl::opt<api_notes::ActionType>
Action(cl::desc("Mode:"), cl::init(api_notes::ActionType::None),
cl::values(
clEnumValN(api_notes::ActionType::YAMLToBinary,
"yaml-to-binary", "Convert YAML to binary format"),
clEnumValN(api_notes::ActionType::BinaryToYAML,
"binary-to-yaml",
"Convert binary format to YAML"),
clEnumValN(api_notes::ActionType::Dump,
"dump", "Parse and dump the output")),
cl::cat(APINotesCategory));
static cl::opt<std::string>
InputFilename(cl::Positional, cl::desc("<input file>"),
cl::Required, cl::cat(APINotesCategory));
static cl::opt<std::string>
Target("target", cl::desc("Generate binary format for the given target"),
cl::cat(APINotesCategory));
static cl::opt<std::string>
OutputFilename("o", cl::desc("Output file name"), cl::cat(APINotesCategory));
// Hide unrelated options.
StringMap<cl::Option *> &Options =
cl::getRegisteredOptions(*cl::TopLevelSubCommand);
for (auto &Option : Options) {
if (Option.second->Category != &APINotesCategory &&
Option.first() != "help" && Option.first() != "version") {
Option.second->setHiddenFlag(cl::ReallyHidden);
}
}
cl::ParseCommandLineOptions(Args.size(),
Args.data(),
"Swift API Notes Tool\n");
if (Action == clang::api_notes::ActionType::None) {
errs() << "action required\n";
cl::PrintHelpMessage();
return 1;
}
auto fileBufOrErr = MemoryBuffer::getFile(InputFilename);
if (std::error_code EC = fileBufOrErr.getError()) {
llvm::errs() << "\n Could not open input file: " + EC.message() << '\n';
return true;
}
StringRef input = fileBufOrErr.get()->getBuffer();
switch (Action) {
case api_notes::ActionType::None:
llvm_unreachable("handled above");
case api_notes::ActionType::YAMLToBinary: {
if (OutputFilename.empty()) {
errs() << "output file is required\n";
cl::PrintHelpMessage();
return 1;
}
api_notes::OSType targetOS = api_notes::OSType::Absent;
// TODO: Check that we've specified the target.
if (!Target.empty()) {
llvm::Triple target(llvm::Triple::normalize(Target));
switch (target.getOS()) {
case llvm::Triple::Darwin:
case llvm::Triple::MacOSX:
targetOS = api_notes::OSType::OSX;
break;
case llvm::Triple::IOS:
targetOS = api_notes::OSType::IOS;
break;
case llvm::Triple::TvOS:
targetOS = api_notes::OSType::TvOS;
break;
case llvm::Triple::WatchOS:
targetOS = api_notes::OSType::WatchOS;
break;
default:
errs() << "target is not supported\n";
return 1;
}
}
std::error_code EC;
llvm::raw_fd_ostream os(OutputFilename, EC,
llvm::sys::fs::OpenFlags::F_None);
if (api_notes::compileAPINotes(input, /*sourceFile=*/nullptr, os, targetOS))
return 1;
os.flush();
return os.has_error();
}
case api_notes::ActionType::BinaryToYAML: {
if (OutputFilename.empty()) {
errs() << "output file required\n";
cl::PrintHelpMessage();
return 1;
}
std::error_code EC;
llvm::raw_fd_ostream os(OutputFilename, EC,
llvm::sys::fs::OpenFlags::F_None);
if (api_notes::decompileAPINotes(std::move(fileBufOrErr.get()), os))
return 1;
os.flush();
return os.has_error();
}
case api_notes::ActionType::Dump:
return api_notes::parseAndDumpAPINotes(input);
}
return 1;
}

6
tools/driver/driver.cpp
View File

@@ -111,8 +111,6 @@ static bool shouldRunAsSubcommand(StringRef ExecName,
return true;
}
extern int apinotes_main(ArrayRef<const char *> Args);
static int run_driver(StringRef ExecName,
const ArrayRef<const char *> argv) {
// Handle integrated tools.
@@ -128,10 +126,6 @@ static int run_driver(StringRef ExecName,
argv.data()+argv.size()),
argv[0], (void *)(intptr_t)getExecutablePath);
}
if (FirstArg == "-apinotes") {
return apinotes_main(llvm::makeArrayRef(argv.data()+1,
argv.data()+argv.size()));
}
}
std::string Path = getExecutablePath(argv[0]);