Prep for merging 3.4: Undo changes from 3.3 branch

lib/CodeGen/IntrinsicLowering.cpp

 //===-- IntrinsicLowering.cpp - Intrinsic Lowering default implementation -===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the IntrinsicLowering class.
@@ skipping 435 matching lines @@
   }
 
   case Intrinsic::dbg_declare:
     break;    // Simply strip out debugging intrinsics
 
   case Intrinsic::eh_typeid_for:
     // Return something different to eh_selector.
     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
     
   case Intrinsic::memcpy: {
     Type *IntPtr = TD.getIntPtrType(Context);
     Value *Size = Builder.CreateIntCast(CI->getArgOperand(2), IntPtr,
                                         /* isSigned */ false);
     Value *Ops[3];
     Ops[0] = CI->getArgOperand(0);
     Ops[1] = CI->getArgOperand(1);
@@ skipping 90 matching lines @@
   Module *M = CI->getParent()->getParent()->getParent();
   Constant *Int = Intrinsic::getDeclaration(M, Intrinsic::bswap, Ty);
 
   Value *Op = CI->getArgOperand(0);
   Op = CallInst::Create(Int, Op, CI->getName(), CI);
 
   CI->replaceAllUsesWith(Op);
   CI->eraseFromParent();
   return true;
 }