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
2018-04-10 17:27:42 -07:00
parent bdc2a81a93 c597ad1775
commit 068ea184ec
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/swift/SIL/SILModule.h
View File

@@ -39,6 +39,7 @@
#include "swift/SIL/TypeLowering.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/PointerIntPair.h"
#include "llvm/ADT/SetVector.h"
@@ -107,7 +108,8 @@ public:
using PropertyListType = llvm::ilist<SILProperty>;
using WitnessTableListType = llvm::ilist<SILWitnessTable>;
using DefaultWitnessTableListType = llvm::ilist<SILDefaultWitnessTable>;
using CoverageMapListType = llvm::ilist<SILCoverageMap>;
using CoverageMapCollectionType =
llvm::MapVector<StringRef, SILCoverageMap *>;
using LinkingMode = SILOptions::LinkingMode;
using ActionCallback = std::function<void()>;
@@ -185,8 +187,8 @@ private:
/// The list of SILGlobalVariables in the module.
GlobalListType silGlobals;
// The list of SILCoverageMaps in the module.
CoverageMapListType coverageMaps;
// The map of SILCoverageMaps in the module.
CoverageMapCollectionType coverageMaps;
// The list of SILProperties in the module.
PropertyListType properties;
@@ -455,10 +457,12 @@ public:
return {silGlobals.begin(), silGlobals.end()};
}
using coverage_map_iterator = CoverageMapListType::iterator;
using coverage_map_const_iterator = CoverageMapListType::const_iterator;
CoverageMapListType &getCoverageMapList() { return coverageMaps; }
const CoverageMapListType &getCoverageMapList() const { return coverageMaps; }
using coverage_map_iterator = CoverageMapCollectionType::iterator;
using coverage_map_const_iterator = CoverageMapCollectionType::const_iterator;
CoverageMapCollectionType &getCoverageMaps() { return coverageMaps; }
const CoverageMapCollectionType &getCoverageMaps() const {
return coverageMaps;
}
llvm::yaml::Output *getOptRecordStream() { return OptRecordStream.get(); }
void setOptRecordStream(std::unique_ptr<llvm::yaml::Output> &&Stream,