aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/AST/Expr.cpp5
-rw-r--r--lib/Sema/SemaExpr.cpp2
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 3d2132a43f..bd6bd298e9 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -190,7 +190,8 @@ unsigned CallExpr::isBuiltinCall(ASTContext &Context) const {
/// corresponds to, e.g. "<<=".
const char *BinaryOperator::getOpcodeStr(Opcode Op) {
switch (Op) {
- default: assert(0 && "Unknown binary operator");
+ case PtrMemD: return ".*";
+ case PtrMemI: return "->*";
case Mul: return "*";
case Div: return "/";
case Rem: return "%";
@@ -222,6 +223,8 @@ const char *BinaryOperator::getOpcodeStr(Opcode Op) {
case OrAssign: return "|=";
case Comma: return ",";
}
+
+ return "";
}
InitListExpr::InitListExpr(SourceLocation lbraceloc,
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 2ce7499b25..64a45182f2 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -3886,8 +3886,6 @@ Action::OwningExprResult Sema::CreateBuiltinBinOp(SourceLocation OpLoc,
BinaryOperator::Opcode Opc = (BinaryOperator::Opcode)Op;
switch (Opc) {
- default:
- assert(0 && "Unknown binary expr!");
case BinaryOperator::Assign:
ResultTy = CheckAssignmentOperands(lhs, rhs, OpLoc, QualType());
break;