diff options
| author | Victor Hernandez <vhernandez@apple.com> | 2010-01-22 19:06:12 +0000 |
|---|---|---|
| committer | Victor Hernandez <vhernandez@apple.com> | 2010-01-22 19:06:12 +0000 |
| commit | 016b28675811058c14599c40fe8dba40dc88d094 (patch) | |
| tree | efe3242f288a9a8a79913dbb595980eb40385ecd /llvm/lib | |
| parent | 5f8c8c034a300455a6af3e224dc6a1f6e06aa6ee (diff) | |
| download | bcm5719-llvm-016b28675811058c14599c40fe8dba40dc88d094.tar.gz bcm5719-llvm-016b28675811058c14599c40fe8dba40dc88d094.zip | |
Fix/strengthen verification of llvm.dbg.declare
llvm-svn: 94195
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/VMCore/Verifier.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/llvm/lib/VMCore/Verifier.cpp b/llvm/lib/VMCore/Verifier.cpp index 91517ea7f6a..76d9d431176 100644 --- a/llvm/lib/VMCore/Verifier.cpp +++ b/llvm/lib/VMCore/Verifier.cpp @@ -1581,7 +1581,7 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) { // If the intrinsic takes MDNode arguments, verify that they are either global // or are local to *this* function. - for (unsigned i = 0, e = CI.getNumOperands(); i != e; ++i) + for (unsigned i = 1, e = CI.getNumOperands(); i != e; ++i) if (MDNode *MD = dyn_cast<MDNode>(CI.getOperand(i))) { if (!MD->isFunctionLocal()) continue; SmallPtrSet<MDNode *, 32> Visited; @@ -1591,12 +1591,17 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) { switch (ID) { default: break; - case Intrinsic::dbg_declare: // llvm.dbg.declare - if (MDNode *MD = dyn_cast<MDNode>(CI.getOperand(1))) + case Intrinsic::dbg_declare: { // llvm.dbg.declare + Assert1(CI.getOperand(1) && isa<MDNode>(CI.getOperand(1)), + "invalid llvm.dbg.declare intrinsic call 1", &CI); + MDNode *MD = cast<MDNode>(CI.getOperand(1)); + Assert1(MD->getNumOperands() == 1, + "invalid llvm.dbg.declare intrinsic call 2", &CI); + if (MD->getOperand(0)) if (Constant *C = dyn_cast<Constant>(MD->getOperand(0))) Assert1(C && !isa<ConstantPointerNull>(C), - "invalid llvm.dbg.declare intrinsic call", &CI); - break; + "invalid llvm.dbg.declare intrinsic call 3", &CI); + } break; case Intrinsic::memcpy: case Intrinsic::memmove: case Intrinsic::memset: |
