PNaCl bitcode: Remove TYPE_CODE_POINTER entries from type table

There are now no uses of pointer type IDs in PNaCl bitcode, so we can
stop outputting pointer types into the type table.

BUG=https://code.google.com/p/nativeclient/issues/detail?id=3671
TEST=test/NaCl/Bitcode/*.ll

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

1 files changed, 12 insertions, 10 deletions

diff --git a/lib/Bitcode/NaCl/Writer/NaClValueEnumerator.cpp b/lib/Bitcode/NaCl/Writer/NaClValueEnumerator.cpp
index cabdc420c6..f1ae2584e1 100644
--- a/lib/Bitcode/NaCl/Writer/NaClValueEnumerator.cpp
+++ b/lib/Bitcode/NaCl/Writer/NaClValueEnumerator.cpp
@@ -298,25 +298,27 @@ void NaClValueEnumerator::EnumerateValue(const Value *VIn) {
 }
 
 
-Type *NaClValueEnumerator::NormalizeScalarType(Type *Ty) const {
-  // Strip pointer types.
-  if (Ty->isPointerTy() && PNaClVersion >= 2)
-    Ty = IntPtrType;
-  return Ty;
-}
-
 Type *NaClValueEnumerator::NormalizeType(Type *Ty) const {
+  if (PNaClVersion == 1)
+    return Ty;
+
+  if (Ty->isPointerTy())
+    return IntPtrType;
   if (FunctionType *FTy = dyn_cast<FunctionType>(Ty)) {
     SmallVector<Type *, 8> ArgTypes;
     for (unsigned I = 0, E = FTy->getNumParams(); I < E; ++I)
-      ArgTypes.push_back(NormalizeScalarType(FTy->getParamType(I)));
-    Ty = FunctionType::get(NormalizeScalarType(FTy->getReturnType()),
-                           ArgTypes, false);
+      ArgTypes.push_back(NormalizeType(FTy->getParamType(I)));
+    return FunctionType::get(NormalizeType(FTy->getReturnType()),
+                             ArgTypes, false);
   }
   return Ty;
 }
 
 void NaClValueEnumerator::EnumerateType(Type *Ty, bool InsideOptimizeTypes) {
+  // Pointer types do not need to be given type IDs.
+  if (Ty->isPointerTy() && PNaClVersion >= 2)
+    Ty = Ty->getPointerElementType();
+
   Ty = NormalizeType(Ty);
 
   // The label type does not need to be given a type ID.