aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuncan Sands <baldrick@free.fr>2012-11-15 14:45:30 +0000
committerDuncan Sands <baldrick@free.fr>2012-11-15 14:45:30 +0000
commitb983f5d4ce5937cc6c3184d622d7fec5df22b3aa (patch)
treeb7aa2c9ab666b61874d473e227b04ff63d98220b
parent1839858983dcbaf1808a6a37f5cd64d92981f27e (diff)
downloadexternal_llvm-b983f5d4ce5937cc6c3184d622d7fec5df22b3aa.zip
external_llvm-b983f5d4ce5937cc6c3184d622d7fec5df22b3aa.tar.gz
external_llvm-b983f5d4ce5937cc6c3184d622d7fec5df22b3aa.tar.bz2
Do not handle void types in DataLayout. Patch by Patrick Hägglund.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@168042 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/DataLayout.h1
-rw-r--r--lib/VMCore/DataLayout.cpp3
2 files changed, 1 insertions, 3 deletions
diff --git a/include/llvm/DataLayout.h b/include/llvm/DataLayout.h
index 7d8eace..e10f9c7 100644
--- a/include/llvm/DataLayout.h
+++ b/include/llvm/DataLayout.h
@@ -281,6 +281,7 @@ public:
/// getTypeSizeInBits - Return the number of bits necessary to hold the
/// specified type. For example, returns 36 for i36 and 80 for x86_fp80.
+ /// The type passed must have a size (Type::isSized() must return true).
uint64_t getTypeSizeInBits(Type* Ty) const;
/// getTypeStoreSize - Return the maximum number of bytes that may be
diff --git a/lib/VMCore/DataLayout.cpp b/lib/VMCore/DataLayout.cpp
index 72dcb99..24111be 100644
--- a/lib/VMCore/DataLayout.cpp
+++ b/lib/VMCore/DataLayout.cpp
@@ -537,8 +537,6 @@ uint64_t DataLayout::getTypeSizeInBits(Type *Ty) const {
return getStructLayout(cast<StructType>(Ty))->getSizeInBits();
case Type::IntegerTyID:
return cast<IntegerType>(Ty)->getBitWidth();
- case Type::VoidTyID:
- return 8;
case Type::HalfTyID:
return 16;
case Type::FloatTyID:
@@ -600,7 +598,6 @@ unsigned DataLayout::getAlignment(Type *Ty, bool abi_or_pref) const {
return std::max(Align, Layout->getAlignment());
}
case Type::IntegerTyID:
- case Type::VoidTyID:
AlignType = INTEGER_ALIGN;
break;
case Type::HalfTyID: