Prep for merging 3.4: Undo changes from 3.3 branch

lib/CodeGen/IntrinsicLowering.cpp

Index: lib/CodeGen/IntrinsicLowering.cpp
diff --git a/lib/CodeGen/IntrinsicLowering.cpp b/lib/CodeGen/IntrinsicLowering.cpp
index d894f664dcb3dd19c2abd33e0c3dd8a54f2704fb..07f0ccf52f8c9a7afe91ca55d266750f83d4edc2 100644
--- a/lib/CodeGen/IntrinsicLowering.cpp
+++ b/lib/CodeGen/IntrinsicLowering.cpp
@@ -453,12 +453,6 @@ void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) {
     CI->replaceAllUsesWith(ConstantInt::get(CI->getType(), 1));
     break;
 
-  case Intrinsic::annotation:
-  case Intrinsic::ptr_annotation:
-    // Just drop the annotation, but forward the value
-    CI->replaceAllUsesWith(CI->getOperand(0));
-    break;
-
   case Intrinsic::var_annotation:
     break;   // Strip out annotate intrinsic