Skip to content

Commit 00dc540

Browse files
committed
Revert "[nfc] Fix a few warnings I introduced."
This reverts commit 077d3cb.
1 parent 40a85f7 commit 00dc540

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

lib/ClangImporter/ClangImporter.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6525,6 +6525,7 @@ CxxRecordSemanticsKind
65256525
CxxRecordSemantics::evaluate(Evaluator &evaluator,
65266526
CxxRecordSemanticsDescriptor desc) const {
65276527
const auto *decl = desc.decl;
6528+
auto &clangSema = desc.ctx.getClangModuleLoader()->getClangSema();
65286529

65296530
if (hasImportAsRefAttr(decl)) {
65306531
return CxxRecordSemanticsKind::Reference;

lib/ClangImporter/SwiftLookupTable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2219,5 +2219,5 @@ SwiftNameLookupExtension::createExtensionReader(
22192219
}
22202220

22212221
void swift::dumpSwiftLookupTable(SwiftLookupTable *table) {
2222-
table->dump(llvm::dbgs());
2222+
table->dump();
22232223
}

lib/Sema/CSDiagnostics.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3830,7 +3830,7 @@ void MissingMemberFailure::diagnoseUnsafeCxxMethod(SourceLoc loc,
38303830
llvm::dbgs() << "====================================================\n";
38313831
llvm::dbgs() << "====================================================\n\n";
38323832

3833-
llvm::dbgs() << "THE NAME: "; name.print(llvm::dbgs());
3833+
llvm::dbgs() << "THE NAME: "; name.dump();
38343834

38353835
llvm::dbgs() << "====================================================\n";
38363836
llvm::dbgs() << "====================================================\n\n";
@@ -3863,7 +3863,7 @@ void MissingMemberFailure::diagnoseUnsafeCxxMethod(SourceLoc loc,
38633863
baseType->getAnyNominal()->lookupDirect(DeclBaseName(unsafeId))) {
38643864
llvm::dbgs() << "**FOUND UNSAFE VERSION**\n";
38653865
llvm::dbgs() << "UNSAFE: ";
3866-
found->dump(llvm::dbgs());
3866+
found->dump();
38673867

38683868
if (auto cxxMethod = dyn_cast_or_null<clang::CXXMethodDecl>(found->getClangDecl())) {
38693869
llvm::dbgs() << "FOUND CXX METHOD.";
@@ -3897,7 +3897,7 @@ void MissingMemberFailure::diagnoseUnsafeCxxMethod(SourceLoc loc,
38973897
baseType->getAnyNominal()->lookupDirect(DeclBaseName(safeId))) {
38983898
llvm::dbgs() << "**FOUND SAFE VERSION**\n";
38993899
llvm::dbgs() << "UNSAFE: ";
3900-
found->dump(llvm::dbgs());
3900+
found->dump();
39013901

39023902
if (auto cxxMethod = dyn_cast_or_null<clang::CXXMethodDecl>(found->getClangDecl())) {
39033903
llvm::dbgs() << "FOUND CXX METHOD.";
@@ -3920,10 +3920,10 @@ void MissingMemberFailure::diagnoseUnsafeCxxMethod(SourceLoc loc,
39203920
llvm::dbgs() << "====================================================\n";
39213921
llvm::dbgs() << "====================================================\n\n";
39223922
llvm::dbgs() << "(IMPORTED) SWIFT TYPE: ";
3923-
baseType->dump(llvm::dbgs());
3923+
baseType->dump();
39243924

39253925
llvm::dbgs() << "(IMPORTED) SWIFT DECL: ";
3926-
baseType->getAnyNominal()->print(llvm::dbgs());
3926+
baseType->getAnyNominal()->dump();
39273927

39283928
// And for my final trick, I will dump the whole lookup table.
39293929
llvm::dbgs() << "====================================================\n";

0 commit comments

Comments
 (0)