diff options
author | Douglas Gregor <dgregor@apple.com> | 2011-11-02 20:52:01 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2011-11-02 20:52:01 +0000 |
commit | 21a25167b8279df3d8f889d041a4fd98733d3c27 (patch) | |
tree | d7fb6455ec9893fc2c1b598dbfb27d73c80578b9 | |
parent | 5fa3f1309b27d2f117dfd10a45a8642b7d4baae9 (diff) |
Fix various minor issues find via unreachable code warnings, from
Ahmed Charles!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143569 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/AST/ASTImporter.cpp | 2 | ||||
-rw-r--r-- | lib/Basic/Targets.cpp | 2 | ||||
-rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 3 | ||||
-rw-r--r-- | lib/Sema/SemaTemplate.cpp | 4 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Core/PathDiagnostic.cpp | 3 |
5 files changed, 5 insertions, 9 deletions
diff --git a/lib/AST/ASTImporter.cpp b/lib/AST/ASTImporter.cpp index e92b358ec7..519d519a5e 100644 --- a/lib/AST/ASTImporter.cpp +++ b/lib/AST/ASTImporter.cpp @@ -1774,8 +1774,8 @@ ASTNodeImporter::ImportDeclarationNameLoc(const DeclarationNameInfo &From, To.setNamedTypeInfo(Importer.Import(FromTInfo)); return; } - llvm_unreachable("Unknown name kind."); } + llvm_unreachable("Unknown name kind."); } void ASTNodeImporter::ImportDeclContext(DeclContext *FromDC, bool ForceImport) { diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index da32c93254..0df5ed2fab 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -3077,6 +3077,8 @@ public: TargetInfo::ConstraintInfo &Info) const { switch (*Name) { default: + return false; + case 'r': // CPU registers. case 'd': // Equivalent to "r" unless generating MIPS16 code. case 'y': // Equivalent to "r", backwards compatibility only. diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 34ad608475..b498290399 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -690,11 +690,12 @@ static void LangOptsToArgs(const LangOptions &Opts, case LangOptions::SOB_Undefined: break; case LangOptions::SOB_Defined: Res.push_back("-fwrapv"); break; case LangOptions::SOB_Trapping: - Res.push_back("-ftrapv"); break; + Res.push_back("-ftrapv"); if (!Opts.OverflowHandler.empty()) { Res.push_back("-ftrapv-handler"); Res.push_back(Opts.OverflowHandler); } + break; } if (Opts.HeinousExtensions) Res.push_back("-fheinous-gnu-extensions"); diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index 41c62550e8..9c14976f0a 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -6632,10 +6632,6 @@ Sema::CheckTypenameType(ElaboratedTypeKeyword Keyword, Referenced = Result.getFoundDecl(); break; - - llvm_unreachable("unresolved using decl in non-dependent context"); - return QualType(); - case LookupResult::FoundOverloaded: DiagID = diag::err_typename_nested_not_type; Referenced = *Result.begin(); diff --git a/lib/StaticAnalyzer/Core/PathDiagnostic.cpp b/lib/StaticAnalyzer/Core/PathDiagnostic.cpp index 1152b3fce9..6c2f2ae46f 100644 --- a/lib/StaticAnalyzer/Core/PathDiagnostic.cpp +++ b/lib/StaticAnalyzer/Core/PathDiagnostic.cpp @@ -193,9 +193,6 @@ PathDiagnosticLocation } return PathDiagnosticLocation(S, SMng, P.getLocationContext()); - - if (!S) - return PathDiagnosticLocation(); } PathDiagnosticLocation |