From ab62196c9de5eb6fb46ed20641fa627c1301ee15 Mon Sep 17 00:00:00 2001
From: Victor Hernandez <vhernandez@apple.com>
Date: Wed, 20 Jan 2010 07:37:49 +0000
Subject: [PATCH] Backout r93990

llvm-svn: 93995
---
 llvm/lib/VMCore/Verifier.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/llvm/lib/VMCore/Verifier.cpp b/llvm/lib/VMCore/Verifier.cpp
index 6e473489956a..91517ea7f6ad 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 = 1, e = CI.getNumOperands(); i != e; ++i)
+  for (unsigned i = 0, e = CI.getNumOperands(); i != e; ++i)
     if (MDNode *MD = dyn_cast<MDNode>(CI.getOperand(i))) {
       if (!MD->isFunctionLocal()) continue;
       SmallPtrSet<MDNode *, 32> Visited;
@@ -1591,17 +1591,12 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) {
   switch (ID) {
   default:
     break;
-  case Intrinsic::dbg_declare: {  // llvm.dbg.declare
-    Assert1(CI.getOperand(1) && isa<MDNode>(CI.getOperand(1)),
-                "invalid llvm.dbg.declare intrinsic call", &CI);
-    MDNode *MD = cast<MDNode>(CI.getOperand(1));
-    Assert1(MD->getNumOperands() == 1,
-                "invalid llvm.dbg.declare intrinsic call", &CI);
-    if (MD->getOperand(0))
+  case Intrinsic::dbg_declare:  // llvm.dbg.declare
+    if (MDNode *MD = dyn_cast<MDNode>(CI.getOperand(1)))
       if (Constant *C = dyn_cast<Constant>(MD->getOperand(0)))
         Assert1(C && !isa<ConstantPointerNull>(C),
                 "invalid llvm.dbg.declare intrinsic call", &CI);
-  } break;
+    break;
   case Intrinsic::memcpy:
   case Intrinsic::memmove:
   case Intrinsic::memset: