maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[RS4GC] Minor cleanups enabled by the previous change; NFC 

llvm-svn: 259133
This commit is contained in:
Sanjoy Das 2016-01-29 01:03:20 +00:00
parent 4099297856
commit bcf27523f5
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
View File

@ -1390,21 +1390,17 @@ makeStatepointExplicitImpl(const CallSite CS, /* to replace */
uint32_t NumPatchBytes = 0; uint32_t NumPatchBytes = 0;
uint32_t Flags = uint32_t(StatepointFlags::None); uint32_t Flags = uint32_t(StatepointFlags::None);
ArrayRef<Use> CallArgs; ArrayRef<Use> CallArgs(CS.arg_begin(), CS.arg_end());
ArrayRef<Use> DeoptArgs; ArrayRef<Use> DeoptArgs = GetDeoptBundleOperands(CS);
ArrayRef<Use> TransitionArgs; ArrayRef<Use> TransitionArgs;
Value *CallTarget = nullptr;
CallArgs = {CS.arg_begin(), CS.arg_end()};
DeoptArgs = GetDeoptBundleOperands(CS);
if (auto TransitionBundle = if (auto TransitionBundle =
CS.getOperandBundle(LLVMContext::OB_gc_transition)) { CS.getOperandBundle(LLVMContext::OB_gc_transition)) {
Flags |= uint32_t(StatepointFlags::GCTransition); Flags |= uint32_t(StatepointFlags::GCTransition);
TransitionArgs = TransitionBundle->Inputs; TransitionArgs = TransitionBundle->Inputs;
} }
AttributeSet OriginalAttrs = CS.getAttributes();
Value *CallTarget = CS.getCalledValue();
AttributeSet OriginalAttrs = CS.getAttributes();
Attribute AttrID = OriginalAttrs.getAttribute(AttributeSet::FunctionIndex, Attribute AttrID = OriginalAttrs.getAttribute(AttributeSet::FunctionIndex,
"statepoint-id"); "statepoint-id");
if (AttrID.isStringAttribute()) if (AttrID.isStringAttribute())
@ -1415,9 +1411,6 @@ makeStatepointExplicitImpl(const CallSite CS, /* to replace */
if (AttrNumPatchBytes.isStringAttribute()) if (AttrNumPatchBytes.isStringAttribute())
AttrNumPatchBytes.getValueAsString().getAsInteger(10, NumPatchBytes); AttrNumPatchBytes.getValueAsString().getAsInteger(10, NumPatchBytes);
CallTarget = CS.getCalledValue();
// Create the statepoint given all the arguments // Create the statepoint given all the arguments
Instruction *Token = nullptr; Instruction *Token = nullptr;
AttributeSet ReturnAttrs; AttributeSet ReturnAttrs;
@ -2224,9 +2217,8 @@ static bool insertParsePoints(Function &F, DominatorTree &DT,
Uniqued.insert(ToUpdate.begin(), ToUpdate.end()); Uniqued.insert(ToUpdate.begin(), ToUpdate.end());
assert(Uniqued.size() == ToUpdate.size() && "no duplicates please!"); assert(Uniqued.size() == ToUpdate.size() && "no duplicates please!");
for (CallSite CS : ToUpdate) { for (CallSite CS : ToUpdate)
assert(CS.getInstruction()->getParent()->getParent() == &F); assert(CS.getInstruction()->getFunction() == &F);
}
#endif #endif
// When inserting gc.relocates for invokes, we need to be able to insert at // When inserting gc.relocates for invokes, we need to be able to insert at