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

Revert "Merge pull request #6092 from swiftix/wip-generics-inlining-flag-4"

Browse Source 
This reverts commit 1b3d29a163, reversing
changes made to b32424953e.

We're seeing a handful of issues from turning on inlining of generics,
so I'm reverting to unblock the bots.
This commit is contained in:
Jordan Rose
2017-02-13 10:52:17 -08:00
parent f0c0bd8791
commit 1c60910198
24 changed files with 75 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Serialization/SerializedSILLoader.cpp
View File

@@ -59,7 +59,7 @@ SILFunction *SerializedSILLoader::lookupSILFunction(SILFunction *Callee) {
SILFunction *SerializedSILLoader::lookupSILFunction(StringRef Name,
bool declarationOnly,
Optional<SILLinkage> Linkage) {
SILLinkage Linkage) {
// It is possible that one module has a declaration of a SILFunction, while
// another has the full definition.
SILFunction *retVal = nullptr;
@@ -67,9 +67,9 @@ SILFunction *SerializedSILLoader::lookupSILFunction(StringRef Name,
if (auto Func = Des->lookupSILFunction(Name, declarationOnly)) {
DEBUG(llvm::dbgs() << "Deserialized " << Func->getName() << " from "
<< Des->getModuleIdentifier().str() << "\n");
if (Linkage) {
if (Linkage != SILLinkage::Private) {
// This is not the linkage we are looking for.
if (Func->getLinkage() != *Linkage) {
if (Func->getLinkage() != Linkage) {
DEBUG(llvm::dbgs()
<< "Wrong linkage for Function: " << Func->getName() << " : "
<< (int)Func->getLinkage() << "\n");
@@ -86,8 +86,7 @@ SILFunction *SerializedSILLoader::lookupSILFunction(StringRef Name,
return retVal;
}
bool SerializedSILLoader::hasSILFunction(StringRef Name,
Optional<SILLinkage> Linkage) {
bool SerializedSILLoader::hasSILFunction(StringRef Name, SILLinkage Linkage) {
// It is possible that one module has a declaration of a SILFunction, while
// another has the full definition.
SILFunction *retVal = nullptr;