Changes in directory llvm/lib/VMCore:
Type.cpp updated: 1.183 -> 1.184 --- Log message: Fix a problem where primitive types lose their name after llvm_shutdown is called. This also reduces the amount of work done at static construction time. --- Diffs of the changes: (+16 -12) Type.cpp | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) Index: llvm/lib/VMCore/Type.cpp diff -u llvm/lib/VMCore/Type.cpp:1.183 llvm/lib/VMCore/Type.cpp:1.184 --- llvm/lib/VMCore/Type.cpp:1.183 Mon Apr 16 22:26:42 2007 +++ llvm/lib/VMCore/Type.cpp Fri Apr 20 17:33:47 2007 @@ -63,13 +63,6 @@ static ManagedStatic<std::map<const Type*, std::string> > AbstractTypeDescriptions; -Type::Type(const char *Name, TypeID id) - : ID(id), Abstract(false), SubclassData(0), RefCount(0), ForwardType(0), - NumContainedTys(0), ContainedTys(0) { - assert(Name && Name[0] && "Should use other ctor if no name!"); - (*ConcreteTypeDescriptions)[this] = Name; -} - /// Because of the way Type subclasses are allocated, this function is necessary /// to use the correct kind of "delete" operator to deallocate the Type object. /// Some type objects (FunctionTy, StructTy) allocate additional space after @@ -250,7 +243,18 @@ if (!Ty->isAbstract()) { // Base case for the recursion std::map<const Type*, std::string>::iterator I = ConcreteTypeDescriptions->find(Ty); - if (I != ConcreteTypeDescriptions->end()) return I->second; + if (I != ConcreteTypeDescriptions->end()) + return I->second; + + if (Ty->isPrimitiveType()) { + switch (Ty->getTypeID()) { + default: assert(0 && "Unknown prim type!"); + case Type::VoidTyID: return (*ConcreteTypeDescriptions)[Ty] = "void"; + case Type::FloatTyID: return (*ConcreteTypeDescriptions)[Ty] = "float"; + case Type::DoubleTyID: return (*ConcreteTypeDescriptions)[Ty] = "double"; + case Type::LabelTyID: return (*ConcreteTypeDescriptions)[Ty] = "label"; + } + } } // Check to see if the Type is already on the stack... @@ -391,10 +395,10 @@ // Primitive 'Type' data //===----------------------------------------------------------------------===// -const Type *Type::VoidTy = new Type("void", Type::VoidTyID); -const Type *Type::FloatTy = new Type("float", Type::FloatTyID); -const Type *Type::DoubleTy = new Type("double", Type::DoubleTyID); -const Type *Type::LabelTy = new Type("label", Type::LabelTyID); +const Type *Type::VoidTy = new Type(Type::VoidTyID); +const Type *Type::FloatTy = new Type(Type::FloatTyID); +const Type *Type::DoubleTy = new Type(Type::DoubleTyID); +const Type *Type::LabelTy = new Type(Type::LabelTyID); namespace { struct BuiltinIntegerType : public IntegerType { _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits