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

Adjust for llvm r291016.

Browse Source 
BitCodeAbbrev is now used as a shared_ptr, instead of making it an
IntrusiveRefCntPtr.
This commit is contained in:
Bob Wilson
2017-01-05 19:08:50 -08:00
parent 4ca0676a34
commit 9114163fcc
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Frontend/SerializedDiagnosticConsumer.cpp
View File

@@ -329,7 +329,7 @@ static void emitRecordID(unsigned ID, const char *Name,
} }
/// \brief Emit bitcode for abbreviation for source locations. /// \brief Emit bitcode for abbreviation for source locations.
static void addSourceLocationAbbrev(llvm::BitCodeAbbrev *Abbrev) { static void addSourceLocationAbbrev(std::shared_ptr<llvm::BitCodeAbbrev> Abbrev) {
using namespace llvm; using namespace llvm;
Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 10)); // File ID. Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 10)); // File ID.
Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32)); // Line. Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32)); // Line.
@@ -338,7 +338,7 @@ static void addSourceLocationAbbrev(llvm::BitCodeAbbrev *Abbrev) {
} }
/// \brief Emit bitcode for abbreviation for source ranges. /// \brief Emit bitcode for abbreviation for source ranges.
static void addRangeLocationAbbrev(llvm::BitCodeAbbrev *Abbrev) { static void addRangeLocationAbbrev(std::shared_ptr<llvm::BitCodeAbbrev> Abbrev) {
addSourceLocationAbbrev(Abbrev); addSourceLocationAbbrev(Abbrev);
addSourceLocationAbbrev(Abbrev); addSourceLocationAbbrev(Abbrev);
} }
@@ -357,7 +357,7 @@ void SerializedDiagnosticConsumer::emitBlockInfoBlock() {
emitBlockID(BLOCK_META, "Meta", Stream, Record); emitBlockID(BLOCK_META, "Meta", Stream, Record);
emitRecordID(RECORD_VERSION, "Version", Stream, Record); emitRecordID(RECORD_VERSION, "Version", Stream, Record);
BitCodeAbbrev *Abbrev = new BitCodeAbbrev(); auto Abbrev = std::make_shared<BitCodeAbbrev>();
Abbrev->Add(BitCodeAbbrevOp(RECORD_VERSION)); Abbrev->Add(BitCodeAbbrevOp(RECORD_VERSION));
Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32)); Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32));
Abbrevs.set(RECORD_VERSION, Stream.EmitBlockInfoAbbrev(BLOCK_META, Abbrev)); Abbrevs.set(RECORD_VERSION, Stream.EmitBlockInfoAbbrev(BLOCK_META, Abbrev));
@@ -375,7 +375,7 @@ void SerializedDiagnosticConsumer::emitBlockInfoBlock() {
emitRecordID(RECORD_FIXIT, "FixIt", Stream, Record); emitRecordID(RECORD_FIXIT, "FixIt", Stream, Record);
// Emit abbreviation for RECORD_DIAG. // Emit abbreviation for RECORD_DIAG.
Abbrev = new BitCodeAbbrev(); Abbrev = std::make_shared<BitCodeAbbrev>();
Abbrev->Add(BitCodeAbbrevOp(RECORD_DIAG)); Abbrev->Add(BitCodeAbbrevOp(RECORD_DIAG));
Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 3)); // Diag level. Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 3)); // Diag level.
addSourceLocationAbbrev(Abbrev); addSourceLocationAbbrev(Abbrev);
@@ -386,7 +386,7 @@ void SerializedDiagnosticConsumer::emitBlockInfoBlock() {
Abbrevs.set(RECORD_DIAG, Stream.EmitBlockInfoAbbrev(BLOCK_DIAG, Abbrev)); Abbrevs.set(RECORD_DIAG, Stream.EmitBlockInfoAbbrev(BLOCK_DIAG, Abbrev));
// Emit abbreviation for RECORD_CATEGORY. // Emit abbreviation for RECORD_CATEGORY.
Abbrev = new BitCodeAbbrev(); Abbrev = std::make_shared<BitCodeAbbrev>();
Abbrev->Add(BitCodeAbbrevOp(RECORD_CATEGORY)); Abbrev->Add(BitCodeAbbrevOp(RECORD_CATEGORY));
Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 16)); // Category ID. Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 16)); // Category ID.
Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 8)); // Text size. Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 8)); // Text size.
@@ -394,14 +394,14 @@ void SerializedDiagnosticConsumer::emitBlockInfoBlock() {
Abbrevs.set(RECORD_CATEGORY, Stream.EmitBlockInfoAbbrev(BLOCK_DIAG, Abbrev)); Abbrevs.set(RECORD_CATEGORY, Stream.EmitBlockInfoAbbrev(BLOCK_DIAG, Abbrev));
// Emit abbreviation for RECORD_SOURCE_RANGE. // Emit abbreviation for RECORD_SOURCE_RANGE.
Abbrev = new BitCodeAbbrev(); Abbrev = std::make_shared<BitCodeAbbrev>();
Abbrev->Add(BitCodeAbbrevOp(RECORD_SOURCE_RANGE)); Abbrev->Add(BitCodeAbbrevOp(RECORD_SOURCE_RANGE));
addRangeLocationAbbrev(Abbrev); addRangeLocationAbbrev(Abbrev);
Abbrevs.set(RECORD_SOURCE_RANGE, Abbrevs.set(RECORD_SOURCE_RANGE,
Stream.EmitBlockInfoAbbrev(BLOCK_DIAG, Abbrev)); Stream.EmitBlockInfoAbbrev(BLOCK_DIAG, Abbrev));
// Emit the abbreviation for RECORD_DIAG_FLAG. // Emit the abbreviation for RECORD_DIAG_FLAG.
Abbrev = new BitCodeAbbrev(); Abbrev = std::make_shared<BitCodeAbbrev>();
Abbrev->Add(BitCodeAbbrevOp(RECORD_DIAG_FLAG)); Abbrev->Add(BitCodeAbbrevOp(RECORD_DIAG_FLAG));
Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 10)); // Mapped Diag ID. Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 10)); // Mapped Diag ID.
Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 16)); // Text size. Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 16)); // Text size.
@@ -410,7 +410,7 @@ void SerializedDiagnosticConsumer::emitBlockInfoBlock() {
Abbrev)); Abbrev));
// Emit the abbreviation for RECORD_FILENAME. // Emit the abbreviation for RECORD_FILENAME.
Abbrev = new BitCodeAbbrev(); Abbrev = std::make_shared<BitCodeAbbrev>();
Abbrev->Add(BitCodeAbbrevOp(RECORD_FILENAME)); Abbrev->Add(BitCodeAbbrevOp(RECORD_FILENAME));
Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 10)); // Mapped file ID. Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 10)); // Mapped file ID.
Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32)); // Size. Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32)); // Size.
@@ -421,7 +421,7 @@ void SerializedDiagnosticConsumer::emitBlockInfoBlock() {
Abbrev)); Abbrev));
// Emit the abbreviation for RECORD_FIXIT. // Emit the abbreviation for RECORD_FIXIT.
Abbrev = new BitCodeAbbrev(); Abbrev = std::make_shared<BitCodeAbbrev>();
Abbrev->Add(BitCodeAbbrevOp(RECORD_FIXIT)); Abbrev->Add(BitCodeAbbrevOp(RECORD_FIXIT));
addRangeLocationAbbrev(Abbrev); addRangeLocationAbbrev(Abbrev);
Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 16)); // Text size. Abbrev->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 16)); // Text size.