diff options
| -rw-r--r-- | lib/AST/Type.cpp | 5 | ||||
| -rw-r--r-- | lib/CodeGen/CGException.cpp | 8 | ||||
| -rw-r--r-- | lib/Sema/TreeTransform.h | 8 |
3 files changed, 2 insertions, 19 deletions
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp index 6732c724c2..c58debbbd2 100644 --- a/lib/AST/Type.cpp +++ b/lib/AST/Type.cpp @@ -2137,11 +2137,6 @@ static CachedProperties computeCachedProperties(const Type *T) { } llvm_unreachable("unhandled type class"); - - // C++ [basic.link]p8: - // Names not covered by these rules have no linkage. - NamedDecl::LinkageInfo LV(NoLinkage, DefaultVisibility, false); - return CachedProperties(LV, false); } /// \brief Determine the linkage of this type. diff --git a/lib/CodeGen/CGException.cpp b/lib/CodeGen/CGException.cpp index f90c71bb46..668dbaf70e 100644 --- a/lib/CodeGen/CGException.cpp +++ b/lib/CodeGen/CGException.cpp @@ -1204,14 +1204,10 @@ static void emitCatchDispatchBlock(CodeGenFunction &CGF, if (nextIsEnd) { CGF.Builder.restoreIP(savedIP); return; - - // Otherwise we need to emit and continue at that block. - } else { - CGF.EmitBlock(nextBlock); } + // Otherwise we need to emit and continue at that block. + CGF.EmitBlock(nextBlock); } - - llvm_unreachable("fell out of loop!"); } void CodeGenFunction::popCatchScope() { diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index 69e09e5ac3..8a47a37d1c 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -878,7 +878,6 @@ public: case LookupResult::FoundOverloaded: case LookupResult::FoundUnresolvedValue: llvm_unreachable("Tag lookup cannot find non-tags"); - return QualType(); case LookupResult::Ambiguous: // Let the LookupResult structure handle ambiguities. @@ -1783,8 +1782,6 @@ public: default: llvm_unreachable("Invalid C++ named cast"); } - - return ExprError(); } /// \brief Build a new C++ static_cast expression. @@ -2854,7 +2851,6 @@ TreeTransform<Derived>::TransformTemplateName(CXXScopeSpec &SS, // These should be getting filtered out before they reach the AST. llvm_unreachable("overloaded function decl survived to here"); - return TemplateName(); } template<typename Derived> @@ -3255,7 +3251,6 @@ TreeTransform<Derived>::TransformType(TypeLocBuilder &TLB, TypeLoc T) { } llvm_unreachable("unhandled type loc!"); - return QualType(); } /// FIXME: By default, this routine adds type qualifiers only to types @@ -6737,7 +6732,6 @@ TreeTransform<Derived>::TransformCXXOperatorCallExpr(CXXOperatorCallExpr *E) { case OO_Array_New: case OO_Array_Delete: llvm_unreachable("new and delete operators cannot use CXXOperatorCallExpr"); - return ExprError(); case OO_Call: { // This is a call to an object's operator(). @@ -6774,12 +6768,10 @@ TreeTransform<Derived>::TransformCXXOperatorCallExpr(CXXOperatorCallExpr *E) { case OO_Conditional: llvm_unreachable("conditional operator is not actually overloadable"); - return ExprError(); case OO_None: case NUM_OVERLOADED_OPERATORS: llvm_unreachable("not an overloaded operator?"); - return ExprError(); } ExprResult Callee = getDerived().TransformExpr(E->getCallee()); |