Prep for merging 3.4: Undo changes from 3.3 branch

lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

Index: lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 4e5798e8ae8cae93b196abcfe39941bcab937f4a..f732d1b70edb09e9109dc688b37221323773a2b9 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -5034,11 +5034,6 @@ SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I, unsigned Intrinsic) {
     setValue(&I, Res);
     return 0;
   }
-  case Intrinsic::annotation:
-  case Intrinsic::ptr_annotation:
-    // Drop the intrinsic, but forward the value
-    setValue(&I, getValue(I.getOperand(0)));
-    return 0;
   case Intrinsic::var_annotation:
     // Discard annotate attributes
     return 0;