projects
/
c11llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cb3ce04
)
edits to compile under clang11
author
Brian Demsky
<bdemsky@uci.edu>
Sun, 6 Sep 2020 21:55:19 +0000
(14:55 -0700)
committer
Brian Demsky
<bdemsky@uci.edu>
Sun, 6 Sep 2020 21:55:19 +0000
(14:55 -0700)
CDSPass.cpp
patch
|
blob
|
history
diff --git
a/CDSPass.cpp
b/CDSPass.cpp
index a33738a96d26880395afc7beaf3b284e1bf1e705..e6449788d05ad637762e9db0e16f0f113ad3d239 100644
(file)
--- a/
CDSPass.cpp
+++ b/
CDSPass.cpp
@@
-52,7
+52,7
@@
using namespace llvm;
#define DEBUG_TYPE "CDS"
#include <llvm/IR/DebugLoc.h>
#define DEBUG_TYPE "CDS"
#include <llvm/IR/DebugLoc.h>
-
static inline Value *getPosition( Instruction * I, IRBuilder <>
IRB, bool print = false)
+
Value *getPosition( Instruction * I, IRBuilder <> &
IRB, bool print = false)
{
const DebugLoc & debug_location = I->getDebugLoc ();
std::string position_string;
{
const DebugLoc & debug_location = I->getDebugLoc ();
std::string position_string;
@@
-166,7
+166,7
@@
int AtomicCasFailureOrderIndex(int index) {
/* The original function checkSanitizerInterfaceFunction was defined
* in llvm/Transforms/Utils/ModuleUtils.h
*/
/* The original function checkSanitizerInterfaceFunction was defined
* in llvm/Transforms/Utils/ModuleUtils.h
*/
-static Function * checkCDSPassInterfaceFunction(
Constant
*FuncOrBitcast) {
+static Function * checkCDSPassInterfaceFunction(
Value
*FuncOrBitcast) {
if (isa<Function>(FuncOrBitcast))
return cast<Function>(FuncOrBitcast);
FuncOrBitcast->print(errs());
if (isa<Function>(FuncOrBitcast))
return cast<Function>(FuncOrBitcast);
FuncOrBitcast->print(errs());
@@
-246,10
+246,10
@@
void CDSPass::initializeCallbacks(Module &M) {
CDSFuncEntry = checkCDSPassInterfaceFunction(
M.getOrInsertFunction("cds_func_entry",
CDSFuncEntry = checkCDSPassInterfaceFunction(
M.getOrInsertFunction("cds_func_entry",
-
Attr, VoidTy, Int8PtrTy
));
+
Attr, VoidTy, Int8PtrTy).getCallee(
));
CDSFuncExit = checkCDSPassInterfaceFunction(
M.getOrInsertFunction("cds_func_exit",
CDSFuncExit = checkCDSPassInterfaceFunction(
M.getOrInsertFunction("cds_func_exit",
-
Attr, VoidTy, Int8PtrTy
));
+
Attr, VoidTy, Int8PtrTy).getCallee(
));
// Get the function to call from our untime library.
for (unsigned i = 0; i < kNumberOfAccessSizes; i++) {
// Get the function to call from our untime library.
for (unsigned i = 0; i < kNumberOfAccessSizes; i++) {
@@
-273,24
+273,24
@@
void CDSPass::initializeCallbacks(Module &M) {
SmallString<32> AtomicStoreName("cds_atomic_store" + BitSizeStr);
CDSLoad[i] = checkCDSPassInterfaceFunction(
SmallString<32> AtomicStoreName("cds_atomic_store" + BitSizeStr);
CDSLoad[i] = checkCDSPassInterfaceFunction(
-
M.getOrInsertFunction(LoadName, Attr, VoidTy, Int8PtrTy
));
+
M.getOrInsertFunction(LoadName, Attr, VoidTy, Int8PtrTy).getCallee(
));
CDSStore[i] = checkCDSPassInterfaceFunction(
CDSStore[i] = checkCDSPassInterfaceFunction(
-
M.getOrInsertFunction(StoreName, Attr, VoidTy, Int8PtrTy
));
+
M.getOrInsertFunction(StoreName, Attr, VoidTy, Int8PtrTy).getCallee(
));
CDSVolatileLoad[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(VolatileLoadName,
CDSVolatileLoad[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(VolatileLoadName,
-
Attr, Ty, PtrTy, Int8PtrTy
));
+
Attr, Ty, PtrTy, Int8PtrTy).getCallee(
));
CDSVolatileStore[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(VolatileStoreName,
CDSVolatileStore[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(VolatileStoreName,
-
Attr, VoidTy, PtrTy, Ty, Int8PtrTy
));
+
Attr, VoidTy, PtrTy, Ty, Int8PtrTy).getCallee(
));
CDSAtomicInit[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(AtomicInitName,
CDSAtomicInit[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(AtomicInitName,
-
Attr, VoidTy, PtrTy, Ty, Int8PtrTy
));
+
Attr, VoidTy, PtrTy, Ty, Int8PtrTy).getCallee(
));
CDSAtomicLoad[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(AtomicLoadName,
CDSAtomicLoad[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(AtomicLoadName,
-
Attr, Ty, PtrTy, OrdTy, Int8PtrTy
));
+
Attr, Ty, PtrTy, OrdTy, Int8PtrTy).getCallee(
));
CDSAtomicStore[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(AtomicStoreName,
CDSAtomicStore[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(AtomicStoreName,
-
Attr, VoidTy, PtrTy, Ty, OrdTy, Int8PtrTy
));
+
Attr, VoidTy, PtrTy, Ty, OrdTy, Int8PtrTy).getCallee(
));
for (int op = AtomicRMWInst::FIRST_BINOP;
op <= AtomicRMWInst::LAST_BINOP; ++op) {
for (int op = AtomicRMWInst::FIRST_BINOP;
op <= AtomicRMWInst::LAST_BINOP; ++op) {
@@
-315,7
+315,7
@@
void CDSPass::initializeCallbacks(Module &M) {
SmallString<32> AtomicRMWName("cds_atomic" + NamePart + BitSizeStr);
CDSAtomicRMW[op][i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(AtomicRMWName,
SmallString<32> AtomicRMWName("cds_atomic" + NamePart + BitSizeStr);
CDSAtomicRMW[op][i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(AtomicRMWName,
-
Attr, Ty, PtrTy, Ty, OrdTy, Int8PtrTy
));
+
Attr, Ty, PtrTy, Ty, OrdTy, Int8PtrTy).getCallee(
));
}
// only supportes strong version
}
// only supportes strong version
@@
-323,24
+323,24
@@
void CDSPass::initializeCallbacks(Module &M) {
SmallString<32> AtomicCASName_V2("cds_atomic_compare_exchange" + BitSizeStr + "_v2");
CDSAtomicCAS_V1[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(AtomicCASName_V1,
SmallString<32> AtomicCASName_V2("cds_atomic_compare_exchange" + BitSizeStr + "_v2");
CDSAtomicCAS_V1[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(AtomicCASName_V1,
-
Attr, Ty, PtrTy, Ty, Ty, OrdTy, OrdTy, Int8PtrTy
));
+
Attr, Ty, PtrTy, Ty, Ty, OrdTy, OrdTy, Int8PtrTy).getCallee(
));
CDSAtomicCAS_V2[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(AtomicCASName_V2,
CDSAtomicCAS_V2[i] = checkCDSPassInterfaceFunction(
M.getOrInsertFunction(AtomicCASName_V2,
-
Attr, Int1Ty, PtrTy, PtrTy, Ty, OrdTy, OrdTy, Int8PtrTy
));
+
Attr, Int1Ty, PtrTy, PtrTy, Ty, OrdTy, OrdTy, Int8PtrTy).getCallee(
));
}
CDSAtomicThreadFence = checkCDSPassInterfaceFunction(
}
CDSAtomicThreadFence = checkCDSPassInterfaceFunction(
-
M.getOrInsertFunction("cds_atomic_thread_fence", Attr, VoidTy, OrdTy, Int8PtrTy
));
+
M.getOrInsertFunction("cds_atomic_thread_fence", Attr, VoidTy, OrdTy, Int8PtrTy).getCallee(
));
MemmoveFn = checkCDSPassInterfaceFunction(
M.getOrInsertFunction("memmove", Attr, Int8PtrTy, Int8PtrTy,
MemmoveFn = checkCDSPassInterfaceFunction(
M.getOrInsertFunction("memmove", Attr, Int8PtrTy, Int8PtrTy,
-
Int8PtrTy, IntPtrTy
));
+
Int8PtrTy, IntPtrTy).getCallee(
));
MemcpyFn = checkCDSPassInterfaceFunction(
M.getOrInsertFunction("memcpy", Attr, Int8PtrTy, Int8PtrTy,
MemcpyFn = checkCDSPassInterfaceFunction(
M.getOrInsertFunction("memcpy", Attr, Int8PtrTy, Int8PtrTy,
-
Int8PtrTy, IntPtrTy
));
+
Int8PtrTy, IntPtrTy).getCallee(
));
MemsetFn = checkCDSPassInterfaceFunction(
M.getOrInsertFunction("memset", Attr, Int8PtrTy, Int8PtrTy,
MemsetFn = checkCDSPassInterfaceFunction(
M.getOrInsertFunction("memset", Attr, Int8PtrTy, Int8PtrTy,
-
Int32Ty, IntPtrTy
));
+
Int32Ty, IntPtrTy).getCallee(
));
}
bool CDSPass::doInitialization(Module &M) {
}
bool CDSPass::doInitialization(Module &M) {