[cfe-commits] r64341 - /cfe/trunk/lib/AST/ASTContext.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Wed Feb 11 17:59:18 2009
New Revision: 64341

URL: http://llvm.org/viewvc/llvm-project?rev=64341&view=rev
Log:
Last @encode'ing fix for objc2's nonfragile abi.
All relevant dejagnu enocding tests pass in this mode.

Modified:
    cfe/trunk/lib/AST/ASTContext.cpp

Modified: cfe/trunk/lib/AST/ASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTContext.cpp?rev=64341&r1=64340&r2=64341&view=diff

==============================================================================
--- cfe/trunk/lib/AST/ASTContext.cpp (original)
+++ cfe/trunk/lib/AST/ASTContext.cpp Wed Feb 11 17:59:18 2009
@@ -1915,15 +1915,18 @@
 
 /// getLegacyIntegralTypeEncoding -
 /// Another legacy compatibility encoding: 32-bit longs are encoded as 
-/// 'l' or 'L', but not always.  For typedefs, we need to use 
+/// 'l' or 'L' , but not always.  For typedefs, we need to use 
 /// 'i' or 'I' instead if encoding a struct field, or a pointer!
 ///
 void ASTContext::getLegacyIntegralTypeEncoding (QualType &PointeeTy) const {
   if (dyn_cast<TypedefType>(PointeeTy.getTypePtr())) {
     if (const BuiltinType *BT = PointeeTy->getAsBuiltinType()) {
-      if (BT->getKind() == BuiltinType::ULong)
+      if (BT->getKind() == BuiltinType::ULong &&
+          ((const_cast<ASTContext *>(this))->getIntWidth(PointeeTy) == 32))
         PointeeTy = UnsignedIntTy;
-        else if (BT->getKind() == BuiltinType::Long)
+      else 
+        if (BT->getKind() == BuiltinType::Long &&
+            ((const_cast<ASTContext *>(this))->getIntWidth(PointeeTy) == 32))
           PointeeTy = IntTy;
     }
   }