diff --git a/llvm/include/llvm/IntrinsicInst.h b/llvm/include/llvm/IntrinsicInst.h
index 775726d42ad841f35dbf7492ecbb244815a9c838..847b06d7bbec2c5f843877bf694f16c4de8fbce0 100644
--- a/llvm/include/llvm/IntrinsicInst.h
+++ b/llvm/include/llvm/IntrinsicInst.h
@@ -76,7 +76,6 @@ namespace llvm {
       case Intrinsic::dbg_region_start:
       case Intrinsic::dbg_region_end:
       case Intrinsic::dbg_func_start:
-      case Intrinsic::dbg_declare:
         return true;
       default: return false;
       }
diff --git a/llvm/lib/CodeGen/IntrinsicLowering.cpp b/llvm/lib/CodeGen/IntrinsicLowering.cpp
index a02d464981497cff61345b21ee5caf4ee0dfb5e1..82ca3c254b2913b5648bdb2c04a0b6f0d3e6c42a 100644
--- a/llvm/lib/CodeGen/IntrinsicLowering.cpp
+++ b/llvm/lib/CodeGen/IntrinsicLowering.cpp
@@ -402,7 +402,6 @@ void DefaultIntrinsicLowering::LowerIntrinsicCall(CallInst *CI) {
   case Intrinsic::dbg_stoppoint:
   case Intrinsic::dbg_region_start:
   case Intrinsic::dbg_region_end:
-  case Intrinsic::dbg_declare:
   case Intrinsic::dbg_func_start:
     if (CI->getType() != Type::VoidTy)
       CI->replaceAllUsesWith(Constant::getNullValue(CI->getType()));
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 58cf1853ca76ecf2830d94dfe4a65035d5b60030..26a8717999160d488668562eeee98d538654af3d 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -1003,10 +1003,6 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
     if (I.getType() != Type::VoidTy)
       setValue(&I, DAG.getNode(ISD::UNDEF, TLI.getValueType(I.getType())));
     return 0;
-  case Intrinsic::dbg_declare:
-    if (I.getType() != Type::VoidTy)
-      setValue(&I, DAG.getNode(ISD::UNDEF, TLI.getValueType(I.getType())));
-    return 0;
     
   case Intrinsic::isunordered_f32:
   case Intrinsic::isunordered_f64:
diff --git a/llvm/lib/VMCore/Function.cpp b/llvm/lib/VMCore/Function.cpp
index 15fd436c45a99677c94d84cc9d84b5946c9940b2..438fce38ec62d7736c596e8ca5e35ce436248f51 100644
--- a/llvm/lib/VMCore/Function.cpp
+++ b/llvm/lib/VMCore/Function.cpp
@@ -232,7 +232,6 @@ unsigned Function::getIntrinsicID() const {
     if (Name == "llvm.dbg.region.start")return Intrinsic::dbg_region_start;
     if (Name == "llvm.dbg.region.end")  return Intrinsic::dbg_region_end;
     if (Name == "llvm.dbg.func.start")  return Intrinsic::dbg_func_start;
-    if (Name == "llvm.dbg.declare")     return Intrinsic::dbg_declare;
     break;
   case 'f':
     if (Name == "llvm.frameaddress")  return Intrinsic::frameaddress;
diff --git a/llvm/lib/VMCore/Verifier.cpp b/llvm/lib/VMCore/Verifier.cpp
index ef88f0d87a1bc12196c6707f1e92627d28a909dc..540b2c0fe9e6b72ba5bf331e0d13b3de999d77dc 100644
--- a/llvm/lib/VMCore/Verifier.cpp
+++ b/llvm/lib/VMCore/Verifier.cpp
@@ -909,7 +909,6 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) {
   case Intrinsic::dbg_region_start:NumArgs = 1; break;
   case Intrinsic::dbg_region_end:  NumArgs = 1; break;
   case Intrinsic::dbg_func_start:  NumArgs = 1; break;
-  case Intrinsic::dbg_declare:     NumArgs = 1; break;
 
   case Intrinsic::memcpy_i32:      NumArgs = 4; break;
   case Intrinsic::memcpy_i64:      NumArgs = 4; break;