Commit dcc9a7ac authored by Bill Wendling's avatar Bill Wendling
Browse files

--- Merging r128104 into '.': 

U    lib/CodeGen/CGObjCMac.cpp
U    lib/CodeGen/CGObjC.cpp

llvm-svn: 128166
parent 514b9ee7

clang/lib/CodeGen/CGObjC.cpp

+4 −2
Original line number Diff line number Diff line
@@ -238,7 +238,8 @@ void CodeGenFunction::GenerateObjCGetter(ObjCImplementationDecl *IMP, 
    CallArgList Args;

    Args.push_back(std::make_pair(RValue::get(SelfAsId), IdTy));

    Args.push_back(std::make_pair(RValue::get(CmdVal), Cmd->getType()));

    Args.push_back(std::make_pair(RValue::get(Offset), getContext().LongTy));

    Args.push_back(std::make_pair(RValue::get(Offset),

                getContext().getPointerDiffType()));

    Args.push_back(std::make_pair(RValue::get(True), getContext().BoolTy));

    // FIXME: We shouldn't need to get the function info here, the

    // runtime already should have computed it to build the function.
@@ -396,7 +397,8 @@ void CodeGenFunction::GenerateObjCSetter(ObjCImplementationDecl *IMP, 
    CallArgList Args;

    Args.push_back(std::make_pair(RValue::get(SelfAsId), IdTy));

    Args.push_back(std::make_pair(RValue::get(CmdVal), Cmd->getType()));

    Args.push_back(std::make_pair(RValue::get(Offset), getContext().LongTy));

    Args.push_back(std::make_pair(RValue::get(Offset),

                getContext().getPointerDiffType()));

    Args.push_back(std::make_pair(RValue::get(ArgAsId), IdTy));

    Args.push_back(std::make_pair(RValue::get(IsAtomic ? True : False),

                                  getContext().BoolTy));

clang/lib/CodeGen/CGObjCMac.cpp

+2 −2
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ public: 
    CanQualType SelType = Ctx.getCanonicalParamType(Ctx.getObjCSelType());

    Params.push_back(IdType);

    Params.push_back(SelType);

    Params.push_back(Ctx.LongTy);

    Params.push_back(Ctx.getPointerDiffType()->getCanonicalTypeUnqualified());

    Params.push_back(Ctx.BoolTy);

    const llvm::FunctionType *FTy =

      Types.GetFunctionType(Types.getFunctionInfo(IdType, Params,
@@ -346,7 +346,7 @@ public: 
    CanQualType SelType = Ctx.getCanonicalParamType(Ctx.getObjCSelType());

    Params.push_back(IdType);

    Params.push_back(SelType);

    Params.push_back(Ctx.LongTy);

    Params.push_back(Ctx.getPointerDiffType()->getCanonicalTypeUnqualified());

    Params.push_back(IdType);

    Params.push_back(Ctx.BoolTy);

    Params.push_back(Ctx.BoolTy);