diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/AST/Expr.cpp | 12 | ||||
| -rw-r--r-- | clang/lib/AST/StmtPrinter.cpp | 9 | ||||
| -rw-r--r-- | clang/lib/AST/StmtSerialization.cpp | 21 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGExprAgg.cpp | 15 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGExprComplex.cpp | 6 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGExprScalar.cpp | 6 | ||||
| -rw-r--r-- | clang/lib/Parse/ParseExpr.cpp | 34 | ||||
| -rw-r--r-- | clang/lib/Sema/Sema.h | 6 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 95 |
9 files changed, 0 insertions, 204 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); diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp index df335a7135c..e2f5c79d994 100644 --- a/clang/lib/CodeGen/CGExprAgg.cpp +++ b/clang/lib/CodeGen/CGExprAgg.cpp @@ -81,7 +81,6 @@ public: void VisitStmtExpr(const StmtExpr *E); void VisitBinaryOperator(const BinaryOperator *BO); void VisitBinAssign(const BinaryOperator *E); - void VisitOverloadExpr(const OverloadExpr *E); void VisitBinComma(const BinaryOperator *E); void VisitObjCMessageExpr(ObjCMessageExpr *E); @@ -197,20 +196,6 @@ void AggExprEmitter::VisitObjCKVCRefExpr(ObjCKVCRefExpr *E) { CGF.EmitAggregateCopy(DestPtr, RV.getAggregateAddr(), E->getType()); } -void AggExprEmitter::VisitOverloadExpr(const OverloadExpr *E) { - RValue RV = CGF.EmitCallExpr(E->getFn(), E->arg_begin(), - E->arg_end(CGF.getContext())); - - assert(RV.isAggregate() && "Return value must be aggregate value!"); - - // If the result is ignored, don't copy from the value. - if (DestPtr == 0) - // FIXME: If the source is volatile, we must read from it. - return; - - CGF.EmitAggregateCopy(DestPtr, RV.getAggregateAddr(), E->getType()); -} - void AggExprEmitter::VisitBinComma(const BinaryOperator *E) { CGF.EmitAnyExpr(E->getLHS()); CGF.EmitAggExpr(E->getRHS(), DestPtr, false); diff --git a/clang/lib/CodeGen/CGExprComplex.cpp b/clang/lib/CodeGen/CGExprComplex.cpp index ebf35948ff8..c676b579e65 100644 --- a/clang/lib/CodeGen/CGExprComplex.cpp +++ b/clang/lib/CodeGen/CGExprComplex.cpp @@ -94,7 +94,6 @@ public: } ComplexPairTy VisitCallExpr(const CallExpr *E); ComplexPairTy VisitStmtExpr(const StmtExpr *E); - ComplexPairTy VisitOverloadExpr(const OverloadExpr *OE); // Operators. ComplexPairTy VisitPrePostIncDec(const UnaryOperator *E, @@ -260,11 +259,6 @@ ComplexPairTy ComplexExprEmitter::VisitCallExpr(const CallExpr *E) { return CGF.EmitCallExpr(E).getComplexVal(); } -ComplexPairTy ComplexExprEmitter::VisitOverloadExpr(const OverloadExpr *E) { - return CGF.EmitCallExpr(E->getFn(), E->arg_begin(), - E->arg_end(CGF.getContext())).getComplexVal(); -} - ComplexPairTy ComplexExprEmitter::VisitStmtExpr(const StmtExpr *E) { return CGF.EmitCompoundStmt(*E->getSubStmt(), true).getComplexVal(); } diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index f5a1cf05258..4b185f61018 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/lib/CodeGen/CGExprScalar.cpp @@ -322,7 +322,6 @@ public: Value *VisitBlockExpr(const BlockExpr *BE); Value *VisitConditionalOperator(const ConditionalOperator *CO); Value *VisitChooseExpr(ChooseExpr *CE); - Value *VisitOverloadExpr(OverloadExpr *OE); Value *VisitVAArgExpr(VAArgExpr *VE); Value *VisitObjCStringLiteral(const ObjCStringLiteral *E) { return CGF.EmitObjCStringLiteral(E); @@ -1335,11 +1334,6 @@ Value *ScalarExprEmitter::VisitChooseExpr(ChooseExpr *E) { Visit(E->isConditionTrue(CGF.getContext()) ? E->getLHS() : E->getRHS()); } -Value *ScalarExprEmitter::VisitOverloadExpr(OverloadExpr *E) { - return CGF.EmitCallExpr(E->getFn(), E->arg_begin(), - E->arg_end(CGF.getContext())).getScalarVal(); -} - Value *ScalarExprEmitter::VisitVAArgExpr(VAArgExpr *VE) { llvm::Value *ArgValue = CGF.EmitVAListRef(VE->getSubExpr()); llvm::Value *ArgPtr = CGF.EmitVAArg(ArgValue, VE->getType()); diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp index 5133af8f7f5..b6c2a71e089 100644 --- a/clang/lib/Parse/ParseExpr.cpp +++ b/clang/lib/Parse/ParseExpr.cpp @@ -574,7 +574,6 @@ Parser::OwningExprResult Parser::ParseCastExpression(bool isUnaryExpression, case tok::kw___builtin_va_arg: case tok::kw___builtin_offsetof: case tok::kw___builtin_choose_expr: - case tok::kw___builtin_overload: case tok::kw___builtin_types_compatible_p: return ParseBuiltinPrimaryExpression(); case tok::kw___null: @@ -905,7 +904,6 @@ Parser::OwningExprResult Parser::ParseSizeofAlignofExpression() { /// [GNU] '__builtin_choose_expr' '(' assign-expr ',' assign-expr ',' /// assign-expr ')' /// [GNU] '__builtin_types_compatible_p' '(' type-name ',' type-name ')' -/// [CLANG] '__builtin_overload' '(' expr (',' expr)* ')' /// /// [GNU] offsetof-member-designator: /// [GNU] identifier @@ -1049,38 +1047,6 @@ Parser::OwningExprResult Parser::ParseBuiltinPrimaryExpression() { Expr2.release(), ConsumeParen()); break; } - case tok::kw___builtin_overload: { - ExprVector ArgExprs(Actions); - llvm::SmallVector<SourceLocation, 8> CommaLocs; - - // For each iteration through the loop look for assign-expr followed by a - // comma. If there is no comma, break and attempt to match r-paren. - if (Tok.isNot(tok::r_paren)) { - while (1) { - OwningExprResult ArgExpr(ParseAssignmentExpression()); - if (ArgExpr.isInvalid()) { - SkipUntil(tok::r_paren); - return ExprError(); - } else - ArgExprs.push_back(ArgExpr.release()); - - if (Tok.isNot(tok::comma)) - break; - // Move to the next argument, remember where the comma was. - CommaLocs.push_back(ConsumeToken()); - } - } - - // Attempt to consume the r-paren - if (Tok.isNot(tok::r_paren)) { - Diag(Tok, diag::err_expected_rparen); - SkipUntil(tok::r_paren); - return ExprError(); - } - Res = Actions.ActOnOverloadExpr(ArgExprs.take(), ArgExprs.size(), - &CommaLocs[0], StartLoc, ConsumeParen()); - break; - } case tok::kw___builtin_types_compatible_p: TypeResult Ty1 = ParseTypeName(); diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h index 39d049bd29a..3eb68b50590 100644 --- a/clang/lib/Sema/Sema.h +++ b/clang/lib/Sema/Sema.h @@ -1164,12 +1164,6 @@ public: ExprTy *cond, ExprTy *expr1, ExprTy *expr2, SourceLocation RPLoc); - // __builtin_overload(...) - virtual ExprResult ActOnOverloadExpr(ExprTy **Args, unsigned NumArgs, - SourceLocation *CommaLocs, - SourceLocation BuiltinLoc, - SourceLocation RParenLoc); - // __builtin_va_arg(expr, type) virtual ExprResult ActOnVAArg(SourceLocation BuiltinLoc, ExprTy *expr, TypeTy *type, diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index dd490ec51fc..66dc8e13ae1 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -4444,101 +4444,6 @@ Sema::ExprResult Sema::ActOnBlockStmtExpr(SourceLocation CaretLoc, StmtTy *body, return new (Context) BlockExpr(BSI->TheDecl, BlockTy); } -/// ExprsMatchFnType - return true if the Exprs in array Args have -/// QualTypes that match the QualTypes of the arguments of the FnType. -/// The number of arguments has already been validated to match the number of -/// arguments in FnType. -static bool ExprsMatchFnType(Expr **Args, const FunctionTypeProto *FnType, - ASTContext &Context) { - unsigned NumParams = FnType->getNumArgs(); - for (unsigned i = 0; i != NumParams; ++i) { - QualType ExprTy = Context.getCanonicalType(Args[i]->getType()); - QualType ParmTy = Context.getCanonicalType(FnType->getArgType(i)); - - if (ExprTy.getUnqualifiedType() != ParmTy.getUnqualifiedType()) - return false; - } - return true; -} - -Sema::ExprResult Sema::ActOnOverloadExpr(ExprTy **args, unsigned NumArgs, - SourceLocation *CommaLocs, - SourceLocation BuiltinLoc, - SourceLocation RParenLoc) { - // __builtin_overload requires at least 2 arguments - if (NumArgs < 2) - return Diag(RParenLoc, diag::err_typecheck_call_too_few_args) - << SourceRange(BuiltinLoc, RParenLoc); - - // The first argument is required to be a constant expression. It tells us - // the number of arguments to pass to each of the functions to be overloaded. - Expr **Args = reinterpret_cast<Expr**>(args); - Expr *NParamsExpr = Args[0]; - llvm::APSInt constEval(32); - SourceLocation ExpLoc; - if (!NParamsExpr->isIntegerConstantExpr(constEval, Context, &ExpLoc)) - return Diag(ExpLoc, diag::err_overload_expr_requires_non_zero_constant) - << NParamsExpr->getSourceRange(); - - // Verify that the number of parameters is > 0 - unsigned NumParams = constEval.getZExtValue(); - if (NumParams == 0) - return Diag(ExpLoc, diag::err_overload_expr_requires_non_zero_constant) - << NParamsExpr->getSourceRange(); - // Verify that we have at least 1 + NumParams arguments to the builtin. - if ((NumParams + 1) > NumArgs) - return Diag(RParenLoc, diag::err_typecheck_call_too_few_args) - << SourceRange(BuiltinLoc, RParenLoc); - - // Figure out the return type, by matching the args to one of the functions - // listed after the parameters. - OverloadExpr *OE = 0; - for (unsigned i = NumParams + 1; i < NumArgs; ++i) { - // UsualUnaryConversions will convert the function DeclRefExpr into a - // pointer to function. - Expr *Fn = UsualUnaryConversions(Args[i]); - const FunctionTypeProto *FnType = 0; - if (const PointerType *PT = Fn->getType()->getAsPointerType()) - FnType = PT->getPointeeType()->getAsFunctionTypeProto(); - - // The Expr type must be FunctionTypeProto, since FunctionTypeProto has no - // parameters, and the number of parameters must match the value passed to - // the builtin. - if (!FnType || (FnType->getNumArgs() != NumParams)) - return Diag(Fn->getExprLoc(), diag::err_overload_incorrect_fntype) - << Fn->getSourceRange(); - - // Scan the parameter list for the FunctionType, checking the QualType of - // each parameter against the QualTypes of the arguments to the builtin. - // If they match, return a new OverloadExpr. - if (ExprsMatchFnType(Args+1, FnType, Context)) { - if (OE) - return Diag(Fn->getExprLoc(), diag::err_overload_multiple_match) - << OE->getFn()->getSourceRange(); - // Remember our match, and continue processing the remaining arguments - // to catch any errors. - OE = new (Context) OverloadExpr(Context, Args, NumArgs, i, - FnType->getResultType().getNonReferenceType(), - BuiltinLoc, RParenLoc); - } - } - // Return the newly created OverloadExpr node, if we succeded in matching - // exactly one of the candidate functions. - if (OE) - return OE; - - // If we didn't find a matching function Expr in the __builtin_overload list - // the return an error. - std::string typeNames; - for (unsigned i = 0; i != NumParams; ++i) { - if (i != 0) typeNames += ", "; - typeNames += Args[i+1]->getType().getAsString(); - } - - return Diag(BuiltinLoc, diag::err_overload_no_match) - << typeNames << SourceRange(BuiltinLoc, RParenLoc); -} - Sema::ExprResult Sema::ActOnVAArg(SourceLocation BuiltinLoc, ExprTy *expr, TypeTy *type, SourceLocation RPLoc) { |
