Move CallbackVHs dtor inline, it can be devirtualized in many cases. Move the other...

[oota-llvm.git] / lib / VMCore / Function.cpp

diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp
index 9aa7d0eadebdb48d791090888b0738fff0b901bf..5a2a56637e6b8643fb04cc9ea7ee73cdd16d0bd0 100644 (file)
--- a/lib/VMCore/Function.cpp
+++ b/lib/VMCore/Function.cpp
@@ -361,13 +361,12 @@ std::string Intrinsic::getName(ID id, ArrayRef<Type*> Tys) {
 #include "llvm/Intrinsics.gen"
 #undef GET_INTRINSTIC_GENERATOR_GLOBAL
 
-static Type *DecodeFixedType(unsigned &TableVal, ArrayRef<Type*> Tys,
-                             LLVMContext &Context) {
-  unsigned Nibble = TableVal & 0xF;
-  TableVal >>= 4;
+static Type *DecodeFixedType(unsigned &NextElt, ArrayRef<unsigned char> Infos,
+                             ArrayRef<Type*> Tys, LLVMContext &Context) {
+  IIT_Info Info = IIT_Info(Infos[NextElt++]);
+  unsigned StructElts = 2;
   
-  switch ((IIT_Info)Nibble) {
-  default: assert(0 && "Unknown argument type!");
+  switch (Info) {
   case IIT_Done: return Type::getVoidTy(Context);
   case IIT_I1: return Type::getInt1Ty(Context);
   case IIT_I8: return Type::getInt8Ty(Context);
@@ -377,21 +376,41 @@ static Type *DecodeFixedType(unsigned &TableVal, ArrayRef<Type*> Tys,
   case IIT_F32: return Type::getFloatTy(Context);
   case IIT_F64: return Type::getDoubleTy(Context);
   case IIT_MMX: return Type::getX86_MMXTy(Context);
+  case IIT_METADATA: return Type::getMetadataTy(Context);
+  case IIT_EMPTYSTRUCT: return StructType::get(Context);
   case IIT_V2:
-    return VectorType::get(DecodeFixedType(TableVal, Tys, Context), 2);
+    return VectorType::get(DecodeFixedType(NextElt, Infos, Tys, Context), 2);
   case IIT_V4:
-    return VectorType::get(DecodeFixedType(TableVal, Tys, Context), 4);
+    return VectorType::get(DecodeFixedType(NextElt, Infos, Tys, Context), 4);
   case IIT_V8:
-    return VectorType::get(DecodeFixedType(TableVal, Tys, Context), 8);
+    return VectorType::get(DecodeFixedType(NextElt, Infos, Tys, Context), 8);
   case IIT_V16:
-    return VectorType::get(DecodeFixedType(TableVal, Tys, Context), 16);
+    return VectorType::get(DecodeFixedType(NextElt, Infos, Tys, Context), 16);
+  case IIT_V32:
+    return VectorType::get(DecodeFixedType(NextElt, Infos, Tys, Context), 32);
   case IIT_PTR:
-    return PointerType::getUnqual(DecodeFixedType(TableVal, Tys, Context));
-  case IIT_ARG: {
-    unsigned ArgNo = TableVal & 0xF;
-    TableVal >>= 4;
+    return PointerType::getUnqual(DecodeFixedType(NextElt, Infos, Tys,Context));
+  case IIT_ARG:
+  case IIT_EXTEND_VEC_ARG:
+  case IIT_TRUNC_VEC_ARG: {
+    unsigned ArgNo = NextElt == Infos.size() ? 0 : Infos[NextElt++];
     assert(ArgNo < Tys.size() && "Not enough types specified!");
-    return Tys[ArgNo];
+    Type *T = Tys[ArgNo];
+   
+    if (Info == IIT_EXTEND_VEC_ARG)
+      T = VectorType::getExtendedElementVectorType(cast<VectorType>(T));
+    if (Info == IIT_TRUNC_VEC_ARG)
+      T = VectorType::getTruncatedElementVectorType(cast<VectorType>(T));
+    return T;
+  }
+  case IIT_STRUCT5: ++StructElts; // FALL THROUGH.
+  case IIT_STRUCT4: ++StructElts; // FALL THROUGH.
+  case IIT_STRUCT3: ++StructElts; // FALL THROUGH.
+  case IIT_STRUCT2: {
+    Type *Elts[5];
+    for (unsigned i = 0; i != StructElts; ++i)
+      Elts[i] = DecodeFixedType(NextElt, Infos, Tys, Context);
+    return StructType::get(Context, ArrayRef<Type*>(Elts, StructElts));
   }
   }
   llvm_unreachable("unhandled");
@@ -400,23 +419,34 @@ static Type *DecodeFixedType(unsigned &TableVal, ArrayRef<Type*> Tys,
 
 FunctionType *Intrinsic::getType(LLVMContext &Context,
                                  ID id, ArrayRef<Type*> Tys) {
-  Type *ResultTy = 0;
-  SmallVector<Type*, 8> ArgTys;
-  
   // Check to see if the intrinsic's type was expressible by the table.
   unsigned TableVal = IIT_Table[id-1];
-  if (TableVal != ~0U) {
-    ResultTy = DecodeFixedType(TableVal, Tys, Context);
+  
+  // Decode the TableVal into an array of IITValues.
+  SmallVector<unsigned char, 8> IITValues;
+  ArrayRef<unsigned char> IITEntries;
+  unsigned NextElt = 0;
+  if ((TableVal >> 31) != 0) {
+    // This is an offset into the IIT_LongEncodingTable.
+    IITEntries = IIT_LongEncodingTable;
     
-    while (TableVal)
-      ArgTys.push_back(DecodeFixedType(TableVal, Tys, Context));
-
-    return FunctionType::get(ResultTy, ArgTys, false); 
+    // Strip sentinel bit.
+    NextElt = (TableVal << 1) >> 1;
+  } else {
+    do {
+      IITValues.push_back(TableVal & 0xF);
+      TableVal >>= 4;
+    } while (TableVal);
+    
+    IITEntries = IITValues;
+    NextElt = 0;
   }
-  
-#define GET_INTRINSIC_GENERATOR
-#include "llvm/Intrinsics.gen"
-#undef GET_INTRINSIC_GENERATOR
+    
+  Type *ResultTy = DecodeFixedType(NextElt, IITEntries, Tys, Context);
+    
+  SmallVector<Type*, 8> ArgTys;
+  while (NextElt != IITEntries.size() && IITEntries[NextElt] != 0)
+    ArgTys.push_back(DecodeFixedType(NextElt, IITEntries, Tys, Context));
 
   return FunctionType::get(ResultTy, ArgTys, false); 
 }