Fix bug: CWriter/2003-05-12-IntegerSizeWarning.c

[oota-llvm.git] / lib / Target / TargetData.cpp

diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp
index 701b36640ec764423de608c80e6eaace5e5dd7f5..158f57e3accf2941e27022c9c5d7ada39d0eb432 100644 (file)
--- a/lib/Target/TargetData.cpp
+++ b/lib/Target/TargetData.cpp
@@ -82,8 +82,7 @@ Annotation *TargetData::TypeAnFactory(AnnotationID AID, const Annotable *T,
 //===----------------------------------------------------------------------===//
 
 TargetData::TargetData(const std::string &TargetName,
-                       bool isLittleEndian, unsigned char SubWordSize,
-                       unsigned char IntRegSize, unsigned char PtrSize,
+                       bool isLittleEndian, unsigned char PtrSize,
                        unsigned char PtrAl, unsigned char DoubleAl,
                        unsigned char FloatAl, unsigned char LongAl, 
                        unsigned char IntAl, unsigned char ShortAl,
@@ -91,12 +90,19 @@ TargetData::TargetData(const std::string &TargetName,
   : AID(AnnotationManager::getID("TargetData::" + TargetName)) {
   AnnotationManager::registerAnnotationFactory(AID, TypeAnFactory, this);
 
+  // If this assert triggers, a pass "required" TargetData information, but the
+  // top level tool did not provide once for it.  We do not want to default
+  // construct, or else we might end up using a bad endianness or pointer size!
+  //
+  assert(!TargetName.empty() &&
+         "ERROR: Tool did not specify a target data to use!");
+
   LittleEndian     = isLittleEndian;
-  SubWordDataSize  = SubWordSize;
-  IntegerRegSize   = IntRegSize;
   PointerSize      = PtrSize;
   PointerAlignment = PtrAl;
   DoubleAlignment  = DoubleAl;
+  assert(DoubleAlignment == PtrAl &&
+         "Double alignment and pointer alignment agree for now!");
   FloatAlignment   = FloatAl;
   LongAlignment    = LongAl;
   IntAlignment     = IntAl;
@@ -109,11 +115,9 @@ TargetData::TargetData(const std::string &ToolName, const Module *M)
   AnnotationManager::registerAnnotationFactory(AID, TypeAnFactory, this);
 
   LittleEndian     = M->isLittleEndian();
-  SubWordDataSize  = 1;
-  IntegerRegSize   = 8;
-  PointerSize      = M->has32BitPointers() ? 32 : 64;
+  PointerSize      = M->has32BitPointers() ? 4 : 8;
   PointerAlignment = PointerSize;
-  DoubleAlignment  = 8;
+  DoubleAlignment  = PointerSize;
   FloatAlignment   = 4;
   LongAlignment    = 8;
   IntAlignment     = 4;