Skip to content

Commit 78ed7c7

Browse files
committed
Clean all C++ warnings in the parser
Signed-off-by: Dimitar Dobrev <[email protected]>
1 parent 5ceedc1 commit 78ed7c7

File tree

1 file changed

+19
-26
lines changed

1 file changed

+19
-26
lines changed

src/CppParser/Parser.cpp

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -342,18 +342,10 @@ void Parser::Setup()
342342
clang::driver::ToolChain *TC = nullptr;
343343
llvm::Triple Target(TO->Triple);
344344

345-
switch (Target.getOS()) {
346-
case llvm::Triple::Linux:
347-
TC = new clang::driver::toolchains::Linux(D, Target, Args);
348-
break;
349-
case llvm::Triple::Win32:
350-
switch (Target.getEnvironment()) {
351-
case llvm::Triple::MSVC:
352-
TC = new clang::driver::toolchains::MSVCToolChain(D, Target, Args);
353-
break;
354-
}
355-
break;
356-
}
345+
if (Target.getOS() == llvm::Triple::Linux)
346+
TC = new clang::driver::toolchains::Linux(D, Target, Args);
347+
else if (Target.getEnvironment() == llvm::Triple::EnvironmentType::MSVC)
348+
TC = new clang::driver::toolchains::MSVCToolChain(D, Target, Args);
357349

358350
if (TC && !opts->noStandardIncludes) {
359351
llvm::opt::ArgStringList Includes;
@@ -927,12 +919,12 @@ static RecordArgABI GetRecordArgABI(
927919
using namespace clang::CodeGen;
928920
switch (argAbi)
929921
{
930-
case CGCXXABI::RecordArgABI::RAA_Default:
931-
return RecordArgABI::Default;
932922
case CGCXXABI::RecordArgABI::RAA_DirectInMemory:
933923
return RecordArgABI::DirectInMemory;
934924
case CGCXXABI::RecordArgABI::RAA_Indirect:
935925
return RecordArgABI::Indirect;
926+
default:
927+
return RecordArgABI::Default;
936928
}
937929
}
938930

@@ -1007,6 +999,8 @@ void Parser::WalkRecord(const clang::RecordDecl* Record, Class* RC)
1007999
WalkDeclaration(MD);
10081000
break;
10091001
}
1002+
default:
1003+
break;
10101004
}
10111005
}
10121006
}
@@ -3093,6 +3087,8 @@ static bool IsInvalid(clang::Stmt* Body, std::unordered_set<clang::Stmt*>& Bodie
30933087
case clang::Stmt::StmtClass::MemberExprClass:
30943088
D = cast<clang::MemberExpr>(Body)->getMemberDecl();
30953089
break;
3090+
default:
3091+
break;
30963092
}
30973093
if (D)
30983094
{
@@ -3286,8 +3282,8 @@ void Parser::WalkFunction(const clang::FunctionDecl* FD, Function* F,
32863282

32873283
const CXXMethodDecl* MD;
32883284
if (FD->isDependentContext() ||
3289-
(MD = dyn_cast<CXXMethodDecl>(FD)) && !MD->isStatic() &&
3290-
!HasLayout(cast<CXXRecordDecl>(MD->getDeclContext())) ||
3285+
((MD = dyn_cast<CXXMethodDecl>(FD)) && !MD->isStatic() &&
3286+
!HasLayout(cast<CXXRecordDecl>(MD->getDeclContext()))) ||
32913287
!CanCheckCodeGenInfo(c->getSema(), FD->getReturnType().getTypePtr()) ||
32923288
std::any_of(FD->parameters().begin(), FD->parameters().end(),
32933289
[this](auto* P) { return !CanCheckCodeGenInfo(c->getSema(), P->getType().getTypePtr()); }))
@@ -4103,6 +4099,8 @@ Declaration* Parser::WalkDeclaration(const clang::Decl* D)
41034099
Decl->isDeprecated = true;
41044100
break;
41054101
}
4102+
default:
4103+
break;
41064104
}
41074105
}
41084106
}
@@ -4412,17 +4410,12 @@ ParserResultKind Parser::ParseSharedLib(llvm::StringRef File,
44124410
// see https://bugs.llvm.org/show_bug.cgi?id=44433
44134411
for (const auto& Symbol : MachOObjectFile->symbols())
44144412
{
4415-
if (Symbol.getName())
4416-
{
4417-
if ((Symbol.getFlags() & llvm::object::BasicSymbolRef::Flags::SF_Exported) &&
4418-
!(Symbol.getFlags() & llvm::object::BasicSymbolRef::Flags::SF_Undefined))
4419-
NativeLib->Symbols.push_back(Symbol.getName().get().str());
4420-
}
4421-
else
4422-
{
4423-
Symbol.getName().takeError();
4413+
if (Symbol.getName().takeError())
44244414
return ParserResultKind::Error;
4425-
}
4415+
4416+
if ((Symbol.getFlags() & llvm::object::BasicSymbolRef::Flags::SF_Exported) &&
4417+
!(Symbol.getFlags() & llvm::object::BasicSymbolRef::Flags::SF_Undefined))
4418+
NativeLib->Symbols.push_back(Symbol.getName().get().str());
44264419
}
44274420
return ParserResultKind::Success;
44284421
}

0 commit comments

Comments
 (0)