From: Chris Lattner <sabre@nondot.org>
Date: Fri, 8 Apr 2011 17:56:47 +0000 (+0000)
Subject: fix this to build with the recent StructType changes.
X-Git-Tag: android-x86-6.0-r1~964^2~1731
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cad3f77fa8618ac940aa519cd40c403800977273;p=android-x86%2Fexternal-llvm.git

fix this to build with the recent StructType changes.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@129139 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/examples/ExceptionDemo/ExceptionDemo.cpp b/examples/ExceptionDemo/ExceptionDemo.cpp
index 95ccd24a689..e4fd0dbe49f 100644
--- a/examples/ExceptionDemo/ExceptionDemo.cpp
+++ b/examples/ExceptionDemo/ExceptionDemo.cpp
@@ -1637,6 +1637,8 @@ void runExceptionThrow(llvm::ExecutionEngine* engine,
 // End test functions
 //
 
+typedef llvm::ArrayRef<const llvm::Type*> TypeArray;
+
 /// This initialization routine creates type info globals and 
 /// adds external function declarations to module.
 /// @param numTypeInfos number of linear type info associated type info types
@@ -1660,23 +1662,21 @@ static void createStandardUtilityFunctions(unsigned numTypeInfos,
                     llvm::ConstantInt::get(llvm::Type::getInt8Ty(context), 2),
 
 
+  
     // Create our type info type
     ourTypeInfoType = llvm::StructType::get(context, 
-                                            builder.getInt32Ty(), 
-                                            NULL);
+                                            TypeArray(builder.getInt32Ty()));
 
     // Create OurException type
     ourExceptionType = llvm::StructType::get(context, 
-                                             ourTypeInfoType,
-                                             NULL);
+                                             TypeArray(ourTypeInfoType));
 
     // Create portion of _Unwind_Exception type
     //
     // Note: Declaring only a portion of the _Unwind_Exception struct.
     //       Does this cause problems?
     ourUnwindExceptionType = llvm::StructType::get(context, 
-                                                   builder.getInt64Ty(),
-                                                   NULL);
+                                               TypeArray(builder.getInt64Ty()));
     struct OurBaseException_t dummyException;
 
     // Calculate offset of OurException::unwindException member.