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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2017-07-11 13:29:16 -07:00
parent c33d8667ae ec6fc4d54d
commit e0782d0448
35 changed files with 498 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
lib/ClangImporter/SwiftLookupTable.cpp
View File

@@ -179,12 +179,12 @@ public:
clang::serialization::ModuleFile &getModuleFile() { return ModuleFile; }
/// Retrieve the set of base names that are stored in the on-disk hash table.
SmallVector<StringRef, 4> getBaseNames();
SmallVector<SerializedSwiftName, 4> getBaseNames();
/// Retrieve the set of entries associated with the given base name.
///
/// \returns true if we found anything, false otherwise.
bool lookup(StringRef baseName,
bool lookup(SerializedSwiftName baseName,
SmallVectorImpl<SwiftLookupTable::FullTableEntry> &entries);
/// Retrieve the declaration IDs of the categories.
@@ -205,6 +205,15 @@ public:
};
} // namespace swift
DeclBaseName SerializedSwiftName::toDeclBaseName(ASTContext &Context) const {
switch (Kind) {
case DeclBaseName::Kind::Normal:
return Context.getIdentifier(Name);
case DeclBaseName::Kind::Subscript:
return DeclBaseName::createSubscript();
}
}
bool SwiftLookupTable::contextRequiresName(ContextKind kind) {
switch (kind) {
case ContextKind::ObjCClass:
@@ -305,9 +314,9 @@ SwiftLookupTable::translateContext(EffectiveClangContext context) {
/// declaration context or typedef name.
clang::NamedDecl *SwiftLookupTable::resolveContext(StringRef unresolvedName) {
// Look for a context with the given Swift name.
for (auto entry : lookup(unresolvedName,
std::make_pair(ContextKind::TranslationUnit,
StringRef()))) {
for (auto entry :
lookup(SerializedSwiftName(unresolvedName),
std::make_pair(ContextKind::TranslationUnit, StringRef()))) {
if (auto decl = entry.dyn_cast<clang::NamedDecl *>()) {
if (isa<clang::TagDecl>(decl) ||
isa<clang::ObjCInterfaceDecl>(decl) ||
@@ -492,7 +501,7 @@ void SwiftLookupTable::addEntry(DeclName name, SingleEntry newEntry,
}
// Populate cache from reader if necessary.
findOrCreate(name.getBaseIdentifier().str());
findOrCreate(name.getBaseName());
auto context = *contextOpt;
@@ -503,7 +512,7 @@ void SwiftLookupTable::addEntry(DeclName name, SingleEntry newEntry,
}
// Find the list of entries for this base name.
auto &entries = LookupTable[name.getBaseIdentifier().str()];
auto &entries = LookupTable[name.getBaseName()];
auto decl = newEntry.dyn_cast<clang::NamedDecl *>();
auto macro = newEntry.dyn_cast<clang::MacroInfo *>();
auto moduleMacro = newEntry.dyn_cast<clang::ModuleMacro *>();
@@ -527,8 +536,9 @@ void SwiftLookupTable::addEntry(DeclName name, SingleEntry newEntry,
entries.push_back(entry);
}
auto SwiftLookupTable::findOrCreate(StringRef baseName)
-> llvm::DenseMap<StringRef, SmallVector<FullTableEntry, 2>>::iterator {
auto SwiftLookupTable::findOrCreate(SerializedSwiftName baseName)
-> llvm::DenseMap<SerializedSwiftName,
SmallVector<FullTableEntry, 2>>::iterator {
// If there is no base name, there is nothing to find.
if (baseName.empty()) return LookupTable.end();
@@ -552,7 +562,7 @@ auto SwiftLookupTable::findOrCreate(StringRef baseName)
}
SmallVector<SwiftLookupTable::SingleEntry, 4>
SwiftLookupTable::lookup(StringRef baseName,
SwiftLookupTable::lookup(SerializedSwiftName baseName,
llvm::Optional<StoredContext> searchContext) {
SmallVector<SwiftLookupTable::SingleEntry, 4> result;
@@ -642,7 +652,7 @@ SwiftLookupTable::allGlobalsAsMembers() {
}
SmallVector<SwiftLookupTable::SingleEntry, 4>
SwiftLookupTable::lookup(StringRef baseName,
SwiftLookupTable::lookup(SerializedSwiftName baseName,
EffectiveClangContext searchContext) {
// Translate context.
Optional<StoredContext> context;
@@ -654,12 +664,12 @@ SwiftLookupTable::lookup(StringRef baseName,
return lookup(baseName, context);
}
SmallVector<StringRef, 4> SwiftLookupTable::allBaseNames() {
SmallVector<SerializedSwiftName, 4> SwiftLookupTable::allBaseNames() {
// If we have a reader, enumerate its base names.
if (Reader) return Reader->getBaseNames();
// Otherwise, walk the lookup table.
SmallVector<StringRef, 4> result;
SmallVector<SerializedSwiftName, 4> result;
for (const auto &entry : LookupTable) {
result.push_back(entry.first);
}
@@ -667,7 +677,7 @@ SmallVector<StringRef, 4> SwiftLookupTable::allBaseNames() {
}
SmallVector<clang::NamedDecl *, 4>
SwiftLookupTable::lookupObjCMembers(StringRef baseName) {
SwiftLookupTable::lookupObjCMembers(SerializedSwiftName baseName) {
SmallVector<clang::NamedDecl *, 4> result;
// Find the lookup table entry for this base name.
@@ -842,14 +852,21 @@ static void printStoredEntry(const SwiftLookupTable *table, uint64_t entry,
void SwiftLookupTable::dump() const {
// Dump the base name -> full table entry mappings.
SmallVector<StringRef, 4> baseNames;
SmallVector<SerializedSwiftName, 4> baseNames;
for (const auto &entry : LookupTable) {
baseNames.push_back(entry.first);
}
llvm::array_pod_sort(baseNames.begin(), baseNames.end());
llvm::errs() << "Base name -> entry mappings:\n";
for (auto baseName : baseNames) {
llvm::errs() << " " << baseName << ":\n";
switch (baseName.Kind) {
case DeclBaseName::Kind::Normal:
llvm::errs() << " " << baseName.Name << ":\n";
break;
case DeclBaseName::Kind::Subscript:
llvm::errs() << " subscript:\n";
break;
}
const auto &entries = LookupTable.find(baseName)->second;
for (const auto &entry : entries) {
llvm::errs() << " ";
@@ -952,11 +969,14 @@ namespace {
/// Trait used to write the on-disk hash table for the base name -> entities
/// mapping.
class BaseNameToEntitiesTableWriterInfo {
static_assert(sizeof(DeclBaseName::Kind) <= sizeof(uint8_t),
"kind serialized as uint8_t");
SwiftLookupTable &Table;
clang::ASTWriter &Writer;
public:
using key_type = StringRef;
using key_type = SerializedSwiftName;
using key_type_ref = key_type;
using data_type = SmallVector<SwiftLookupTable::FullTableEntry, 2>;
using data_type_ref = data_type &;
@@ -970,14 +990,16 @@ namespace {
}
hash_value_type ComputeHash(key_type_ref key) {
return llvm::HashString(key);
return llvm::DenseMapInfo<SerializedSwiftName>::getHashValue(key);
}
std::pair<unsigned, unsigned> EmitKeyDataLength(raw_ostream &out,
key_type_ref key,
data_type_ref data) {
// The length of the key.
uint32_t keyLength = key.size();
uint32_t keyLength = sizeof(uint8_t); // For the flag of the name's kind
if (key.Kind == DeclBaseName::Kind::Normal) {
keyLength += key.Name.size(); // The name's length
}
// # of entries
uint32_t dataLength = sizeof(uint16_t);
@@ -1004,7 +1026,10 @@ namespace {
}
void EmitKey(raw_ostream &out, key_type_ref key, unsigned len) {
out << key;
endian::Writer<little> writer(out);
writer.write<uint8_t>((uint8_t)key.Kind);
if (key.Kind == swift::DeclBaseName::Kind::Normal)
writer.OS << key.Name;
}
void EmitData(raw_ostream &out, key_type_ref key, data_type_ref data,
@@ -1141,7 +1166,7 @@ void SwiftLookupTableWriter::writeExtensionContents(
SmallVector<uint64_t, 64> ScratchRecord;
// First, gather the sorted list of base names.
SmallVector<StringRef, 2> baseNames;
SmallVector<SerializedSwiftName, 2> baseNames;
for (const auto &entry : table.LookupTable)
baseNames.push_back(entry.first);
llvm::array_pod_sort(baseNames.begin(), baseNames.end());
@@ -1214,7 +1239,7 @@ namespace {
/// Used to deserialize the on-disk base name -> entities table.
class BaseNameToEntitiesTableReaderInfo {
public:
using internal_key_type = StringRef;
using internal_key_type = SerializedSwiftName;
using external_key_type = internal_key_type;
using data_type = SmallVector<SwiftLookupTable::FullTableEntry, 2>;
using hash_value_type = uint32_t;
@@ -1229,7 +1254,7 @@ namespace {
}
hash_value_type ComputeHash(internal_key_type key) {
return llvm::HashString(key);
return llvm::DenseMapInfo<SerializedSwiftName>::getHashValue(key);
}
static bool EqualKey(internal_key_type lhs, internal_key_type rhs) {
@@ -1244,7 +1269,18 @@ namespace {
}
static internal_key_type ReadKey(const uint8_t *data, unsigned length) {
return StringRef((const char *)data, length);
uint8_t kind = endian::readNext<uint8_t, little, unaligned>(data);
switch (kind) {
case (uint8_t)DeclBaseName::Kind::Normal: {
StringRef str(reinterpret_cast<const char *>(data),
length - sizeof(uint8_t));
return SerializedSwiftName(str);
}
case (uint8_t)DeclBaseName::Kind::Subscript:
return SerializedSwiftName(DeclBaseName::Kind::Subscript);
default:
llvm_unreachable("Unknown kind for DeclBaseName");
}
}
static data_type ReadData(internal_key_type key, const uint8_t *data,
@@ -1532,9 +1568,9 @@ SwiftLookupTableReader::create(clang::ModuleFileExtension *extension,
}
SmallVector<StringRef, 4> SwiftLookupTableReader::getBaseNames() {
SmallVector<SerializedSwiftName, 4> SwiftLookupTableReader::getBaseNames() {
auto table = static_cast<SerializedBaseNameToEntitiesTable*>(SerializedTable);
SmallVector<StringRef, 4> results;
SmallVector<SerializedSwiftName, 4> results;
for (auto key : table->keys()) {
results.push_back(key);
}
@@ -1542,8 +1578,8 @@ SmallVector<StringRef, 4> SwiftLookupTableReader::getBaseNames() {
}
bool SwiftLookupTableReader::lookup(
StringRef baseName,
SmallVectorImpl<SwiftLookupTable::FullTableEntry> &entries) {
SerializedSwiftName baseName,
SmallVectorImpl<SwiftLookupTable::FullTableEntry> &entries) {
auto table = static_cast<SerializedBaseNameToEntitiesTable*>(SerializedTable);
// Look for an entry with this base name.
@@ -1641,7 +1677,7 @@ void importer::addEntryToLookupTable(SwiftLookupTable &table,
// Also add the subscript entry, if needed.
if (importedName.isSubscriptAccessor())
table.addEntry(DeclName(nameImporter.getContext(),
nameImporter.getContext().Id_subscript,
DeclBaseName::createSubscript(),
ArrayRef<Identifier>()),
named, importedName.getEffectiveContext());