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

[Duncan Sands]

Author: baldrick
Date: Thu Jul 28 03:19:29 2011
New Revision: 136342

URL: http://llvm.org/viewvc/llvm-project?rev=136342&view=rev
Log:
Port hack to fix some issues with new type system from dragonegg.
This bootstraps for me (including Fortran).

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=136342&r1=136341&r2=136342&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-types.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Thu Jul 28 03:19:29 2011
@@ -575,9 +575,14 @@
     ConversionStatus SavedCS = RecursionStatus;
     if (RecursionStatus == CS_Struct)
       RecursionStatus = CS_StructPtr;
-    
-    Type *Ty = ConvertType(TREE_TYPE(type));
-    
+
+    Type *Ty;
+    if (RecursionStatus != CS_StructPtr)
+      Ty = ConvertType(TREE_TYPE(type));
+    else
+      // FIXME: Hack to avoid crashes with the new LLVM type system.
+      Ty = Type::getInt8Ty(Context);
+
     RecursionStatus = SavedCS;
     
     if (Ty->isVoidTy())