PNaCl bitcode: Strip pointer types from intrinsic declarations' parameters

Change the writer to strip pointer types from intrinsics' argument and
return types, replacing them with i32.  This simplifies the PNaCl
bitcode format so that pointer types don't need to be represented
here.

Change the reader to restore the pointer types so that the intrinsic
declarations pass the LLVM and PNaCl verifiers.

BUG=https://code.google.com/p/nativeclient/issues/detail?id=3671
TEST=intrinsic tests in call-elide.ll
  + intrinsic-pointer-args.ll
  + run small_tests with bitcode v2 enabled

Review URL: https://codereview.chromium.org/23793005

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h
index 318fcb1470..56a894c7d4 100644
--- a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h
+++ b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.h
@@ -130,6 +130,10 @@ public:
   // replaces uses of the global variable forward reference with the
   // value GV.
   void AssignGlobalVar(GlobalVariable *GV, unsigned Idx);
+
+  // Assigns Idx to the given value, overwriting the existing entry
+  // and possibly modifying the type of the entry.
+  void OverwriteValue(Value *V, unsigned Idx);
 };
 
 
@@ -333,6 +337,9 @@ private:
   /// \brief Install instruction I into basic block BB.
   bool InstallInstruction(BasicBlock *BB, Instruction *I);
 
+  FunctionType *AddPointerTypesToIntrinsicType(StringRef Name,
+                                               FunctionType *FTy);
+  void AddPointerTypesToIntrinsicParams();
   bool ParseModule(bool Resume);
   bool ParseTypeTable();
   bool ParseTypeTableBody();