[llvm-commits] [llvm-gcc-4.2] r45832 - /llvm-gcc-4.2/trunk/gcc/llvm-types.cpp

[Duncan Sands]

Author: baldrick
Date: Thu Jan 10 03:58:07 2008
New Revision: 45832

URL: http://llvm.org/viewvc/llvm-project?rev=45832&view=rev
Log:
Fix the Ada build.  Based on a patch by  
Dale Johannesen.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-types.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-types.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-types.cpp?rev=45832&r1=45831&r2=45832&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-types.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Thu Jan 10 03:58:07 2008
@@ -1696,6 +1696,8 @@
         TREE_CODE(TREE_TYPE(Field))==RECORD_TYPE &&
         TYPE_SIZE(TREE_TYPE(Field)) &&
         DECL_SIZE(Field) &&
+        TREE_CODE(DECL_SIZE(Field))==INTEGER_CST &&
+        TREE_CODE(TYPE_SIZE(TREE_TYPE(Field)))==INTEGER_CST &&
         TREE_INT_CST_LOW(DECL_SIZE(Field)) < 
               TREE_INT_CST_LOW(TYPE_SIZE(TREE_TYPE(Field))))
       TREE_TYPE(Field) = FixBaseClassField(Field);
@@ -1739,7 +1741,9 @@
         TREE_CODE(DECL_FIELD_OFFSET(Field))==INTEGER_CST &&
         TREE_CODE(TREE_TYPE(Field))==RECORD_TYPE &&
         TYPE_SIZE(TREE_TYPE(Field)) &&
-        DECL_SIZE(Field)) {
+        DECL_SIZE(Field) &&
+        TREE_CODE(DECL_SIZE(Field))==INTEGER_CST &&
+        TREE_CODE(TYPE_SIZE(TREE_TYPE(Field)))==INTEGER_CST) {
       tree &oldTy = BaseTypesMap[TREE_TYPE(Field)];
       if (oldTy)
         TREE_TYPE(Field) = oldTy;