Mercurial > projects > ldc

diff gen/typinf.c @ 81:3587401b6eeb trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn r85] Fixed: if a return statement appeared in the try block of a nested try-finally, only the inner-most finally block would be executed. Changed: Renamed all the LLVM_Dto... helper function to just Dto...
author lindquist
date Thu, 01 Nov 2007 17:27:18 +0100
parents b706170e24a9
children
line wrap: on
line diff
--- a/gen/typinf.c	Wed Oct 31 22:35:39 2007 +0100
+++ b/gen/typinf.c	Thu Nov 01 17:27:18 2007 +0100
@@ -302,24 +302,24 @@
 
     // char[] name
     char *name = sd->toPrettyChars();
-    sinits.push_back(LLVM_DtoConstString(name));
+    sinits.push_back(DtoConstString(name));
     assert(sinits.back()->getType() == initZ->getOperand(2)->getType());
 
     // void[] init
     const llvm::PointerType* initpt = llvm::PointerType::get(llvm::Type::Int8Ty);
     if (tinfo->isZeroInit() || !sd->init) // 0 initializer, or the same as the base type
     {
-        sinits.push_back(LLVM_DtoConstSlice(LLVM_DtoConstSize_t(0), llvm::ConstantPointerNull::get(initpt)));
+        sinits.push_back(DtoConstSlice(DtoConstSize_t(0), llvm::ConstantPointerNull::get(initpt)));
     }
     else
     {
-        llvm::Constant* ci = LLVM_DtoConstInitializer(sd->basetype, sd->init);
+        llvm::Constant* ci = DtoConstInitializer(sd->basetype, sd->init);
         std::string ciname(sd->mangle());
         ciname.append("__init");
-        llvm::GlobalVariable* civar = new llvm::GlobalVariable(LLVM_DtoType(sd->basetype),true,llvm::GlobalValue::InternalLinkage,ci,ciname,gIR->module);
+        llvm::GlobalVariable* civar = new llvm::GlobalVariable(DtoType(sd->basetype),true,llvm::GlobalValue::InternalLinkage,ci,ciname,gIR->module);
         llvm::Constant* cicast = llvm::ConstantExpr::getBitCast(civar, initpt);
-        size_t cisize = gTargetData->getTypeSize(LLVM_DtoType(sd->basetype));
-        sinits.push_back(LLVM_DtoConstSlice(LLVM_DtoConstSize_t(cisize), cicast));
+        size_t cisize = gTargetData->getTypeSize(DtoType(sd->basetype));
+        sinits.push_back(DtoConstSlice(DtoConstSize_t(cisize), cicast));
     }
 
     // create the symbol
@@ -366,25 +366,25 @@
 
     // char[] name
     char *name = sd->toPrettyChars();
-    sinits.push_back(LLVM_DtoConstString(name));
+    sinits.push_back(DtoConstString(name));
     assert(sinits.back()->getType() == initZ->getOperand(2)->getType());
 
     // void[] init
     const llvm::PointerType* initpt = llvm::PointerType::get(llvm::Type::Int8Ty);
     if (tinfo->isZeroInit() || !sd->defaultval) // 0 initializer, or the same as the base type
     {
-        sinits.push_back(LLVM_DtoConstSlice(LLVM_DtoConstSize_t(0), llvm::ConstantPointerNull::get(initpt)));
+        sinits.push_back(DtoConstSlice(DtoConstSize_t(0), llvm::ConstantPointerNull::get(initpt)));
     }
     else
     {
-        const llvm::Type* memty = LLVM_DtoType(sd->memtype);
+        const llvm::Type* memty = DtoType(sd->memtype);
         llvm::Constant* ci = llvm::ConstantInt::get(memty, sd->defaultval, !sd->memtype->isunsigned());
         std::string ciname(sd->mangle());
         ciname.append("__init");
         llvm::GlobalVariable* civar = new llvm::GlobalVariable(memty,true,llvm::GlobalValue::InternalLinkage,ci,ciname,gIR->module);
         llvm::Constant* cicast = llvm::ConstantExpr::getBitCast(civar, initpt);
         size_t cisize = gTargetData->getTypeSize(memty);
-        sinits.push_back(LLVM_DtoConstSlice(LLVM_DtoConstSize_t(cisize), cicast));
+        sinits.push_back(DtoConstSlice(DtoConstSize_t(cisize), cicast));
     }
 
     // create the symbol
@@ -544,7 +544,7 @@
 
     // char[] name
     char *name = sd->toPrettyChars();
-    sinits.push_back(LLVM_DtoConstString(name));
+    sinits.push_back(DtoConstString(name));
     Logger::println("************** A");
     assert(sinits.back()->getType() == stype->getElementType(1));
 
@@ -552,14 +552,14 @@
     const llvm::PointerType* initpt = llvm::PointerType::get(llvm::Type::Int8Ty);
     if (sd->zeroInit) // 0 initializer, or the same as the base type
     {
-        sinits.push_back(LLVM_DtoConstSlice(LLVM_DtoConstSize_t(0), llvm::ConstantPointerNull::get(initpt)));
+        sinits.push_back(DtoConstSlice(DtoConstSize_t(0), llvm::ConstantPointerNull::get(initpt)));
     }
     else
     {
         assert(sd->llvmInitZ);
         size_t cisize = gTargetData->getTypeSize(tc->llvmType);
         llvm::Constant* cicast = llvm::ConstantExpr::getBitCast(tc->llvmInit, initpt);
-        sinits.push_back(LLVM_DtoConstSlice(LLVM_DtoConstSize_t(cisize), cicast));
+        sinits.push_back(DtoConstSlice(DtoConstSize_t(cisize), cicast));
     }
 
     // toX functions ground work
@@ -684,7 +684,7 @@
     }
 
     // uint m_flags;
-    sinits.push_back(LLVM_DtoConstUint(tc->hasPointers()));
+    sinits.push_back(DtoConstUint(tc->hasPointers()));
 
     // create the symbol
     llvm::Constant* tiInit = llvm::ConstantStruct::get(stype, sinits);