aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #683 from ifilippov/trunk

Browse Source 
Match LLVM trunk - deleting isPrimitiveType()
This commit is contained in:
Dmitry Babokin
2013-12-12 07:55:46 -08:00
parent eef436b889 b19937c4dc
commit 7bc1a41814
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cbackend.cpp
View File

@@ -660,7 +660,7 @@ void CWriter::printStructReturnPointerFunctionType(llvm::raw_ostream &Out,
llvm::raw_ostream & llvm::raw_ostream &
CWriter::printSimpleType(llvm::raw_ostream &Out, llvm::Type *Ty, bool isSigned, CWriter::printSimpleType(llvm::raw_ostream &Out, llvm::Type *Ty, bool isSigned,
const std::string &NameSoFar) { const std::string &NameSoFar) {
assert((Ty->isPrimitiveType() || Ty->isIntegerTy() || Ty->isVectorTy()) && assert((Ty->isFloatingPointTy() || Ty->isX86_MMXTy() || Ty->isIntegerTy() || Ty->isVectorTy() || Ty->isVoidTy()) &&
"Invalid type for printSimpleType"); "Invalid type for printSimpleType");
switch (Ty->getTypeID()) { switch (Ty->getTypeID()) {
case llvm::Type::VoidTyID: return Out << "void " << NameSoFar; case llvm::Type::VoidTyID: return Out << "void " << NameSoFar;
@@ -756,7 +756,7 @@ llvm::raw_ostream &CWriter::printType(llvm::raw_ostream &Out, llvm::Type *Ty,
#endif #endif
) { ) {
if (Ty->isPrimitiveType() || Ty->isIntegerTy() || Ty->isVectorTy()) { if (Ty->isFloatingPointTy() || Ty->isX86_MMXTy() || Ty->isIntegerTy() || Ty->isVectorTy() || Ty->isVoidTy()) {
printSimpleType(Out, Ty, isSigned, NameSoFar); printSimpleType(Out, Ty, isSigned, NameSoFar);
return Out; return Out;
} }
@@ -2737,7 +2737,7 @@ void CWriter::printModuleTypes() {
void CWriter::printContainedStructs(llvm::Type *Ty, void CWriter::printContainedStructs(llvm::Type *Ty,
llvm::SmallPtrSet<llvm::Type *, 16> &Printed) { llvm::SmallPtrSet<llvm::Type *, 16> &Printed) {
// Don't walk through pointers. // Don't walk through pointers.
if (Ty->isPointerTy() || Ty->isPrimitiveType() || Ty->isIntegerTy()) if (!(Ty->isStructTy() || Ty->isArrayTy()))
return; return;
// Print all contained types first. // Print all contained types first.

3
ispc.cpp
View File

@@ -944,7 +944,8 @@ Target::GetISATargetString() const {
static bool static bool
lGenericTypeLayoutIndeterminate(llvm::Type *type) { lGenericTypeLayoutIndeterminate(llvm::Type *type) {
if (type->isPrimitiveType() || type->isIntegerTy()) if (type->isFloatingPointTy() || type->isX86_MMXTy() || type->isVoidTy() ||
type->isIntegerTy() || type->isLabelTy() || type->isMetadataTy())
return false; return false;
if (type == LLVMTypes::BoolVectorType || if (type == LLVMTypes::BoolVectorType ||