Use Intrinsic::getDeclaration to obtain the nacl_read_tp intrinsic

lib/Transforms/NaCl/ExpandTls.cpp

 //===- ExpandTls.cpp - Convert TLS variables to a concrete layout----------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This pass expands out uses of thread-local (TLS) variables into
@@ skipping 11 matching lines @@
 //
 //===----------------------------------------------------------------------===//
 
 #include <vector>
 
 #include "llvm/Pass.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Instructions.h"
+#include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Transforms/NaCl.h"
 
 using namespace llvm;
 
 namespace {
   struct VarInfo {
     GlobalVariable *TlsVar;
     bool IsBss; // Whether variable is in zero-intialized part of template
@@ skipping 184 matching lines @@
       ConstantInt::get(M.getContext(), APInt(32, State.Alignment)));
   setGlobalVariableValue(M, AlignmentSymbol, AlignmentVar);
   AlignmentVar->setName(AlignmentSymbol);
 
   return TemplatePtrType;
 }
 
 static void rewriteTlsVars(Module &M, std::vector<VarInfo> *TlsVars,
                            PointerType *TemplatePtrType) {
   // Set up the intrinsic that reads the thread pointer.
-  Type *i8 = Type::getInt8Ty(M.getContext());
-  FunctionType *ReadTpType = FunctionType::get(PointerType::get(i8, 0),
-                                               /*isVarArg=*/false);
-  AttrBuilder B;
-  B.addAttribute(Attribute::ReadOnly);
-  B.addAttribute(Attribute::NoUnwind);
-  AttributeSet ReadTpAttrs = AttributeSet::get(
-      M.getContext(), AttributeSet::FunctionIndex, B);
-  Constant *ReadTpFunc = M.getOrInsertTargetIntrinsic("llvm.nacl.read.tp",
-                                                      ReadTpType,
-                                                      ReadTpAttrs);
+  Function *ReadTpFunc = Intrinsic::getDeclaration(&M, Intrinsic::nacl_read_tp);
 
   for (std::vector<VarInfo>::iterator VarInfo = TlsVars->begin();
        VarInfo != TlsVars->end();
        ++VarInfo) {
     GlobalVariable *Var = VarInfo->TlsVar;
     while (!Var->use_empty()) {
       Use *U = &Var->use_begin().getUse();
       Instruction *InsertPt = PhiSafeInsertPt(U);
       Value *RawThreadPtr = CallInst::Create(ReadTpFunc, "tls_raw", InsertPt);
       Value *TypedThreadPtr = new BitCastInst(RawThreadPtr, TemplatePtrType,
@@ skipping 77 matching lines @@
   rewriteTlsVars(M, &TlsVars, TemplatePtrType);
 
   defineTlsLayoutIntrinsics(M);
 
   return true;
 }
 
 ModulePass *llvm::createExpandTlsPass() {
   return new ExpandTls();
 }