diff options
| -rw-r--r-- | include/llvm/Type.h | 9 | ||||
| -rw-r--r-- | lib/VMCore/Type.cpp | 15 |
2 files changed, 22 insertions, 2 deletions
diff --git a/include/llvm/Type.h b/include/llvm/Type.h index e25bfe1e0f..1598f0b97f 100644 --- a/include/llvm/Type.h +++ b/include/llvm/Type.h @@ -206,8 +206,8 @@ public: /// TargetData subsystem to do this. /// bool isSized() const { - return ID != VoidTyID && ID != TypeTyID && - ID != FunctionTyID && ID != LabelTyID && ID != OpaqueTyID; + return (ID >= BoolTyID && ID <= DoubleTyID) || ID == PointerTyID || + isSizedDerivedType(); } /// getPrimitiveSize - Return the basic size of this type if it is a primative @@ -306,6 +306,11 @@ public: RefCountIsZero(); } private: + /// isSizedDerivedType - Derived types like structures and arrays are sized + /// iff all of the members of the type are sized as well. Since asking for + /// their size is relatively uncommon, move this operation out of line. + bool isSizedDerivedType() const; + virtual void RefCountIsZero() const { abort(); // only on derived types! } diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp index 7798489242..eefcee98d4 100644 --- a/lib/VMCore/Type.cpp +++ b/lib/VMCore/Type.cpp @@ -159,6 +159,21 @@ unsigned Type::getPrimitiveSize() const { } } +/// isSizedDerivedType - Derived types like structures and arrays are sized +/// iff all of the members of the type are sized as well. Since asking for +/// their size is relatively uncommon, move this operation out of line. +bool Type::isSizedDerivedType() const { + if (const ArrayType *ATy = dyn_cast<ArrayType>(this)) + return ATy->getElementType()->isSized(); + + if (!isa<StructType>(this)) return false; + + // Okay, our struct is sized if all of the elements are... + for (subtype_iterator I = subtype_begin(), E = subtype_end(); I != E; ++I) + if (!(*I)->isSized()) return false; + + return true; +} /// getForwardedTypeInternal - This method is used to implement the union-find /// algorithm for when a type is being forwarded to another type. |