[llvm-branch-commits] [cfe-branch] r128166 - in /cfe/branches/release_29: ./ lib/CodeGen/CGObjC.cpp lib/CodeGen/CGObjCMac.cpp test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Wed Mar 23 16:01:34 2011
New Revision: 128166

URL: http://llvm.org/viewvc/llvm-project?rev=128166&view=rev
Log:
--- Merging r128104 into '.':
U    lib/CodeGen/CGObjCMac.cpp
U    lib/CodeGen/CGObjC.cpp


Modified:
    cfe/branches/release_29/   (props changed)
    cfe/branches/release_29/lib/CodeGen/CGObjC.cpp
    cfe/branches/release_29/lib/CodeGen/CGObjCMac.cpp
    cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 23 16:01:34 2011
@@ -1,3 +1,3 @@
-/cfe/trunk:127238,127283,127308,127326,127329,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127652,127654-127655,127736-127738,127806,127811,127971,127980,128102
+/cfe/trunk:127238,127283,127308,127326,127329,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127652,127654-127655,127736-127738,127806,127811,127971,127980,128102,128104
 /cfe/trunk/test/SemaTemplate:126920
 /llvm/trunk:127238,127329,127652,127654-127655

Modified: cfe/branches/release_29/lib/CodeGen/CGObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/CodeGen/CGObjC.cpp?rev=128166&r1=128165&r2=128166&view=diff
==============================================================================
--- cfe/branches/release_29/lib/CodeGen/CGObjC.cpp (original)
+++ cfe/branches/release_29/lib/CodeGen/CGObjC.cpp Wed Mar 23 16:01:34 2011
@@ -238,7 +238,8 @@
     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 @@
     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));

Modified: cfe/branches/release_29/lib/CodeGen/CGObjCMac.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/CodeGen/CGObjCMac.cpp?rev=128166&r1=128165&r2=128166&view=diff
==============================================================================
--- cfe/branches/release_29/lib/CodeGen/CGObjCMac.cpp (original)
+++ cfe/branches/release_29/lib/CodeGen/CGObjCMac.cpp Wed Mar 23 16:01:34 2011
@@ -328,7 +328,7 @@
     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 @@
     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);

Propchange: cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 23 16:01:34 2011
@@ -1 +1 @@
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127238,127283,127308,127326,127329,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127652,127654-127655,127736-127738,127806,127811,127971,127980,128102
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127238,127283,127308,127326,127329,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127652,127654-127655,127736-127738,127806,127811,127971,127980,128102,128104