Prep for merging 3.4: Undo changes from 3.3 branch

lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

 //===-- SelectionDAGBuilder.cpp - Selection-DAG building ------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This implements routines for translating from LLVM IR into SelectionDAG IR.
@@ skipping 5016 matching lines @@
     EVT Ty = Arg.getValueType();
 
     if (CI->isZero())
       Res = DAG.getConstant(-1ULL, Ty);
     else
       Res = DAG.getConstant(0, Ty);
 
     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;
 
   case Intrinsic::init_trampoline: {
     const Function *F = cast<Function>(I.getArgOperand(1)->stripPointerCasts());
 
     SDValue Ops[6];
     Ops[0] = getRoot();
     Ops[1] = getValue(I.getArgOperand(0));
@@ skipping 1849 matching lines @@
         EVT VT = ValueVTs[vti];
         unsigned NumRegisters = TLI.getNumRegisters(*DAG.getContext(), VT);
         for (unsigned i = 0, e = NumRegisters; i != e; ++i)
           FuncInfo.PHINodesToUpdate.push_back(std::make_pair(MBBI++, Reg+i));
         Reg += NumRegisters;
       }
     }
   }
   ConstantsOut.clear();
 }