6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-10-25 10:27:04 +00:00
Code Issues Projects Releases Wiki Activity

fix build in C++11 mode.

Browse Source 
Thanks to Chandler for pointing out the problem.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@158928 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nuno Lopes
2012-06-21 18:38:26 +00:00
parent 438c04027b
commit ef22f04bad
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Analysis/MemoryBuiltins.cpp
View File

@@ -43,7 +43,7 @@ struct AllocFnsTy {
AllocType AllocTy; AllocType AllocTy;
unsigned char NumParams; unsigned char NumParams;
// First and Second size parameters (or -1 if unused) // First and Second size parameters (or -1 if unused)
unsigned char FstParam, SndParam; signed char FstParam, SndParam;
}; };
static const AllocFnsTy AllocationFnData[] = { static const AllocFnsTy AllocationFnData[] = {
@@ -100,16 +100,16 @@ static const AllocFnsTy *getAllocationData(const Value *V, AllocType AllocTy,
// Check function prototype. // Check function prototype.
// FIXME: Check the nobuiltin metadata?? (PR5130) // FIXME: Check the nobuiltin metadata?? (PR5130)
unsigned FstParam = FnData->FstParam; int FstParam = FnData->FstParam;
unsigned SndParam = FnData->SndParam; int SndParam = FnData->SndParam;
FunctionType *FTy = Callee->getFunctionType(); FunctionType *FTy = Callee->getFunctionType();
if (FTy->getReturnType() == Type::getInt8PtrTy(FTy->getContext()) && if (FTy->getReturnType() == Type::getInt8PtrTy(FTy->getContext()) &&
FTy->getNumParams() == FnData->NumParams && FTy->getNumParams() == FnData->NumParams &&
(FstParam == (unsigned char)-1 || (FstParam < 0 ||
(FTy->getParamType(FstParam)->isIntegerTy(32) || (FTy->getParamType(FstParam)->isIntegerTy(32) ||
FTy->getParamType(FstParam)->isIntegerTy(64))) && FTy->getParamType(FstParam)->isIntegerTy(64))) &&
(SndParam == (unsigned char)-1 || (SndParam < 0 ||
FTy->getParamType(SndParam)->isIntegerTy(32) || FTy->getParamType(SndParam)->isIntegerTy(32) ||
FTy->getParamType(SndParam)->isIntegerTy(64))) FTy->getParamType(SndParam)->isIntegerTy(64)))
return FnData; return FnData;
@@ -421,7 +421,7 @@ SizeOffsetType ObjectSizeOffsetVisitor::visitCallSite(CallSite CS) {
APInt Size = Arg->getValue().zextOrSelf(IntTyBits); APInt Size = Arg->getValue().zextOrSelf(IntTyBits);
// size determined by just 1 parameter // size determined by just 1 parameter
if (FnData->SndParam == (unsigned char)-1) if (FnData->SndParam < 0)
return std::make_pair(Size, Zero); return std::make_pair(Size, Zero);
Arg = dyn_cast<ConstantInt>(CS.getArgument(FnData->SndParam)); Arg = dyn_cast<ConstantInt>(CS.getArgument(FnData->SndParam));
@@ -604,7 +604,7 @@ SizeOffsetEvalType ObjectSizeOffsetEvaluator::visitCallSite(CallSite CS) {
Value *FirstArg = CS.getArgument(FnData->FstParam); Value *FirstArg = CS.getArgument(FnData->FstParam);
FirstArg = Builder.CreateZExt(FirstArg, IntTy); FirstArg = Builder.CreateZExt(FirstArg, IntTy);
if (FnData->SndParam == (unsigned char)-1) if (FnData->SndParam < 0)
return std::make_pair(FirstArg, Zero); return std::make_pair(FirstArg, Zero);
Value *SecondArg = CS.getArgument(FnData->SndParam); Value *SecondArg = CS.getArgument(FnData->SndParam);