Ignore:
Timestamp:
Apr 21, 2016, 12:18:06 PM (3 years ago)
Author:
cameron
Message:

Some updates for compatibility with LLVM 3.8

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/kernels/symboltablepipeline.cpp

    r5010 r5014  
    365365    Value * gatherFunctionPtr = iBuilder->CreateLoad(iBuilder->CreateGEP(gatherFunctionPtrArray, groupIV));
    366366    Value * outputBuffer = iBuilder->CreatePointerCast(kBuilder->getOutputStream(groupIV), iBuilder->getInt8PtrTy());
    367     iBuilder->CreateCall5(gatherFunctionPtr, base, startArrayPtr, endArrayPtr, iBuilder->getInt32(32), outputBuffer);
     367    iBuilder->CreateCall(gatherFunctionPtr, {base, startArrayPtr, endArrayPtr, iBuilder->getInt32(32), outputBuffer});
    368368    // Copy the unused start positions to the front of the start position array and adjust the start index
    369369    Value * remainingArrayPtr = iBuilder->CreateGEP(startArrayPtr, iBuilder->getInt32(gatherCount));
     
    418418
    419419        Function::arg_iterator args = function->arg_begin();
    420         Value * const base = args++;
     420        Value * const base = &*(args++);
    421421        base->setName("base");
    422         Value * startArray = args++;
     422        Value * startArray = &*(args++);
    423423        startArray->setName("startArray");
    424         Value * endArray = args++;
     424        Value * endArray = &*(args++);
    425425        endArray->setName("endArray");
    426         Value * const numOfKeys = args++;
     426        Value * const numOfKeys = &*(args++);
    427427        numOfKeys->setName("numOfKeys");
    428         Value * result = args++;
     428        Value * result = &*(args++);
    429429        result->setName("result");
    430430
     
    652652    Function::arg_iterator args = main->arg_begin();
    653653
    654     Value * const inputStream = args++;
     654    Value * const inputStream = &*(args++);
    655655    inputStream->setName("inputStream");
    656656
    657     Value * const bufferSize = args++;
     657    Value * const bufferSize = &*(args++);
    658658    bufferSize->setName("bufferSize");
    659659
     
    767767        Value * endArrayPtr = iBuilder->CreatePointerCast(endArray, PointerType::get(iBuilder->getInt32Ty(), 0));
    768768        Value * outputBuffer = iBuilder->CreatePointerCast(gatheringInstance->getOutputStream(groupIV), iBuilder->getInt8PtrTy());
    769         iBuilder->CreateCall5(mGatherFunction.at(i), base, startArrayPtr, endArrayPtr, startIndex, outputBuffer);
     769        iBuilder->CreateCall(mGatherFunction.at(i), {base, startArrayPtr, endArrayPtr, startIndex, outputBuffer});
    770770        iBuilder->CreateBr(nextNonEmptyGroup);
    771771
Note: See TracChangeset for help on using the changeset viewer.