3 files changed, 0 insertions, 42 deletions
diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp
index dec17493f42..d9db1333853 100644
--- a/clang/lib/AST/Expr.cpp
+++ b/clang/lib/AST/Expr.cpp
@@ -583,7 +583,6 @@ Expr::isLvalueResult Expr::isLvalue(ASTContext &Ctx) const {
     //   An assignment expression [...] is not an lvalue.
     return LV_InvalidExpression;
   }
-  // FIXME: OverloadExprClass
   case CallExprClass: 
   case CXXOperatorCallExprClass:
   case CXXMemberCallExprClass: {
@@ -1487,13 +1486,6 @@ void SizeOfAlignOfExpr::Destroy(ASTContext& C) {
     Expr::Destroy(C);
 }
 
-void OverloadExpr::Destroy(ASTContext& C) {
-  DestroyChildren(C);
-  C.Deallocate(SubExprs);
-  this->~OverloadExpr();
-  C.Deallocate(this);
-}
-
 //===----------------------------------------------------------------------===//
 //  DesignatedInitExpr
 //===----------------------------------------------------------------------===//
@@ -1757,10 +1749,6 @@ Stmt::child_iterator ChooseExpr::child_end() { return &SubExprs[0]+END_EXPR; }
 Stmt::child_iterator GNUNullExpr::child_begin() { return child_iterator(); }
 Stmt::child_iterator GNUNullExpr::child_end() { return child_iterator(); }
 
-// OverloadExpr
-Stmt::child_iterator OverloadExpr::child_begin() { return &SubExprs[0]; }
-Stmt::child_iterator OverloadExpr::child_end() { return &SubExprs[0]+NumExprs; }
-
 // ShuffleVectorExpr
 Stmt::child_iterator ShuffleVectorExpr::child_begin() {
   return &SubExprs[0];
diff --git a/clang/lib/AST/StmtPrinter.cpp b/clang/lib/AST/StmtPrinter.cpp
index 7e3180d2281..1d563e246a0 100644
--- a/clang/lib/AST/StmtPrinter.cpp
+++ b/clang/lib/AST/StmtPrinter.cpp
@@ -866,15 +866,6 @@ void StmtPrinter::VisitGNUNullExpr(GNUNullExpr *) {
   OS << "__null";
 }
 
-void StmtPrinter::VisitOverloadExpr(OverloadExpr *Node) {
-  OS << "__builtin_overload(";
-  for (unsigned i = 0, e = Node->getNumSubExprs(); i != e; ++i) {
-    if (i) OS << ", ";
-    PrintExpr(Node->getExpr(i));
-  }
-  OS << ")";
-}
-
 void StmtPrinter::VisitShuffleVectorExpr(ShuffleVectorExpr *Node) {
   OS << "__builtin_shufflevector(";
   for (unsigned i = 0, e = Node->getNumSubExprs(); i != e; ++i) {
diff --git a/clang/lib/AST/StmtSerialization.cpp b/clang/lib/AST/StmtSerialization.cpp
index e1d85aa01c5..a6cf01fe2ba 100644
--- a/clang/lib/AST/StmtSerialization.cpp
+++ b/clang/lib/AST/StmtSerialization.cpp
@@ -917,27 +917,6 @@ GNUNullExpr *GNUNullExpr::CreateImpl(llvm::Deserializer &D, ASTContext &C) {
   return new GNUNullExpr(T, TL);
 }
 
-void OverloadExpr::EmitImpl(llvm::Serializer& S) const {
-  S.Emit(getType());
-  S.Emit(BuiltinLoc);
-  S.Emit(RParenLoc);
-  S.EmitInt(FnIndex);
-  S.EmitInt(NumExprs);
-  S.BatchEmitOwnedPtrs(NumExprs, &SubExprs[0]);
-}
-
-OverloadExpr* OverloadExpr::CreateImpl(llvm::Deserializer& D, ASTContext& C) {
-  QualType T = QualType::ReadVal(D);
-  SourceLocation BL = SourceLocation::ReadVal(D);
-  SourceLocation RP = SourceLocation::ReadVal(D);
-  unsigned FnIndex = D.ReadInt();
-  unsigned NumExprs = D.ReadInt();
-  // FIXME: Avoid extra allocation.
-  llvm::SmallVector<Expr*, 4> Exprs(NumExprs);
-  D.BatchReadOwnedPtrs(NumExprs, Exprs.begin(), C);
-  return new OverloadExpr(C, Exprs.begin(), NumExprs, FnIndex, T, BL, RP);
-}
-
 void VAArgExpr::EmitImpl(llvm::Serializer& S) const {
   S.Emit(getType());
   S.Emit(BuiltinLoc);