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 "Add debug info support for inlined and specialized generic variables."

Browse Source 
There is an assertion failure building the source compatibility suite that
needs to be investigated.

This reverts commit 91f6f34119.
This commit is contained in:
Adrian Prantl
2018-07-07 13:01:01 -07:00
parent a6952decab
commit fdad9076f2
18 changed files with 69 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/swift/SILOptimizer/Utils/GenericCloner.h
View File

@@ -34,8 +34,6 @@ class GenericCloner : public TypeSubstCloner<GenericCloner> {
IsSerialized_t Serialized;
const ReabstractionInfo &ReInfo;
CloneCollector::CallbackType Callback;
llvm::SmallDenseMap<const SILDebugScope *, const SILDebugScope *, 8>
RemappedScopeCache;
public:
friend class SILCloner<GenericCloner>;
@@ -92,9 +90,6 @@ private:
/// by initCloned.
void populateCloned();
SILFunction *getCloned() { return &getBuilder().getFunction(); }
const SILDebugScope *remapScope(const SILDebugScope *DS);
};
} // end namespace swift

27
include/swift/SILOptimizer/Utils/SpecializationMangler.h
View File

@@ -48,8 +48,7 @@ protected:
protected:
SpecializationMangler(SpecializationPass P, IsSerialized_t Serialized,
SILFunction *F)
: Pass(P), Serialized(Serialized), Function(F),
ArgOpBuffer(ArgOpStorage) {}
: Pass(P), Serialized(Serialized), Function(F), ArgOpBuffer(ArgOpStorage) {}
SILFunction *getFunction() const { return Function; }
@@ -68,17 +67,17 @@ class GenericSpecializationMangler : public SpecializationMangler {
SubstitutionMap SubMap;
bool isReAbstracted;
bool isInlined;
public:
GenericSpecializationMangler(SILFunction *F, SubstitutionMap SubMap,
IsSerialized_t Serialized, bool isReAbstracted,
bool isInlined = false)
: SpecializationMangler(SpecializationPass::GenericSpecializer,
Serialized, F),
SubMap(SubMap), isReAbstracted(isReAbstracted), isInlined(isInlined) {}
std::string mangle(GenericSignature *Sig = nullptr);
GenericSpecializationMangler(SILFunction *F,
SubstitutionMap SubMap,
IsSerialized_t Serialized,
bool isReAbstracted)
: SpecializationMangler(SpecializationPass::GenericSpecializer, Serialized, F),
SubMap(SubMap), isReAbstracted(isReAbstracted) {}
std::string mangle();
};
class PartialSpecializationMangler : public SpecializationMangler {
@@ -89,10 +88,10 @@ class PartialSpecializationMangler : public SpecializationMangler {
public:
PartialSpecializationMangler(SILFunction *F,
CanSILFunctionType SpecializedFnTy,
IsSerialized_t Serialized, bool isReAbstracted)
: SpecializationMangler(SpecializationPass::GenericSpecializer,
Serialized, F),
SpecializedFnTy(SpecializedFnTy), isReAbstracted(isReAbstracted) {}
IsSerialized_t Serialized,
bool isReAbstracted)
: SpecializationMangler(SpecializationPass::GenericSpecializer, Serialized, F),
SpecializedFnTy(SpecializedFnTy), isReAbstracted(isReAbstracted) {}
std::string mangle();
};