diff options
author | Gabor Greif <ggreif@gmail.com> | 2010-04-15 12:46:56 +0000 |
---|---|---|
committer | Gabor Greif <ggreif@gmail.com> | 2010-04-15 12:46:56 +0000 |
commit | 9ee17208115482441953127615231c59a2f4d052 (patch) | |
tree | fea1c2465e14ae8c3d89e0cf07588155acf8a23d /lib/CodeGen/ShadowStackGC.cpp | |
parent | 45d95a1ad5eb72c65db8cc691a10339aa7c9c024 (diff) | |
download | llvm-9ee17208115482441953127615231c59a2f4d052.tar.gz llvm-9ee17208115482441953127615231c59a2f4d052.tar.bz2 llvm-9ee17208115482441953127615231c59a2f4d052.tar.xz |
back out r101364, as it trips the linux nightlybot on some clang C++ tests
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101368 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/ShadowStackGC.cpp')
-rw-r--r-- | lib/CodeGen/ShadowStackGC.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/CodeGen/ShadowStackGC.cpp b/lib/CodeGen/ShadowStackGC.cpp index e6cf7a89fc..0e6d4796e2 100644 --- a/lib/CodeGen/ShadowStackGC.cpp +++ b/lib/CodeGen/ShadowStackGC.cpp @@ -158,9 +158,9 @@ namespace { // Create a new invoke instruction. Args.clear(); - Args.append(CI->op_begin(), CI->op_end() - 1); + Args.append(CI->op_begin() + 1, CI->op_end()); - InvokeInst *II = InvokeInst::Create(CI->getCalledValue(), + InvokeInst *II = InvokeInst::Create(CI->getOperand(0), NewBB, CleanupBB, Args.begin(), Args.end(), CI->getName(), CallBB); @@ -194,7 +194,7 @@ Constant *ShadowStackGC::GetFrameMap(Function &F) { unsigned NumMeta = 0; SmallVector<Constant*,16> Metadata; for (unsigned I = 0; I != Roots.size(); ++I) { - Constant *C = cast<Constant>(Roots[I].first->getOperand(1)); + Constant *C = cast<Constant>(Roots[I].first->getOperand(2)); if (!C->isNullValue()) NumMeta = I + 1; Metadata.push_back(ConstantExpr::getBitCast(C, VoidPtr)); @@ -322,16 +322,16 @@ void ShadowStackGC::CollectRoots(Function &F) { assert(Roots.empty() && "Not cleaned up?"); - SmallVector<std::pair<CallInst*, AllocaInst*>,16> MetaRoots; + SmallVector<std::pair<CallInst*,AllocaInst*>,16> MetaRoots; for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB) for (BasicBlock::iterator II = BB->begin(), E = BB->end(); II != E;) if (IntrinsicInst *CI = dyn_cast<IntrinsicInst>(II++)) if (Function *F = CI->getCalledFunction()) if (F->getIntrinsicID() == Intrinsic::gcroot) { - std::pair<CallInst*, AllocaInst*> Pair = std::make_pair( - CI, cast<AllocaInst>(CI->getOperand(0)->stripPointerCasts())); - if (IsNullValue(CI->getOperand(1))) + std::pair<CallInst*,AllocaInst*> Pair = std::make_pair( + CI, cast<AllocaInst>(CI->getOperand(1)->stripPointerCasts())); + if (IsNullValue(CI->getOperand(2))) Roots.push_back(Pair); else MetaRoots.push_back(Pair); |