Nigel
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed cases where we were translating "long long" types to use the "long" 

types when they are the same size. The new code will use the correct type 
now when converting DWARF built-in types into clang types.

llvm-svn: 118003
This commit is contained in:
Greg Clayton 2010-11-02 03:48:39 +00:00
parent 2856d46252
commit 19de37f730
1 changed files with 37 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
lldb/source/Symbol/ClangASTContext.cpp
View File

@ -521,49 +521,40 @@ ClangASTContext::GetBuiltinTypeForDWARFEncodingAndBitSize (const char *type_name
case DW_ATE_signed: case DW_ATE_signed:
if (type_name) if (type_name)
{ {
if (streq(type_name, "int") || if (strstr(type_name, "long long"))
streq(type_name, "signed int"))
{ {
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->IntTy))
return ast_context->IntTy.getAsOpaquePtr();
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->Int128Ty))
return ast_context->Int128Ty.getAsOpaquePtr();
}
if (streq(type_name, "long int") ||
streq(type_name, "long long int") ||
streq(type_name, "signed long long"))
{
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->LongTy))
return ast_context->LongTy.getAsOpaquePtr();
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->LongLongTy)) if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->LongLongTy))
return ast_context->LongLongTy.getAsOpaquePtr(); return ast_context->LongLongTy.getAsOpaquePtr();
} }
else if (strstr(type_name, "long"))
if (streq(type_name, "short") || {
streq(type_name, "short int") || if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->LongTy))
streq(type_name, "signed short") || return ast_context->LongTy.getAsOpaquePtr();
streq(type_name, "short signed int")) }
else if (strstr(type_name, "short"))
{ {
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->ShortTy)) if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->ShortTy))
return ast_context->ShortTy.getAsOpaquePtr(); return ast_context->ShortTy.getAsOpaquePtr();
} }
else if (strstr(type_name, "char"))
if (streq(type_name, "char") ||
streq(type_name, "signed char"))
{ {
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->CharTy)) if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->CharTy))
return ast_context->CharTy.getAsOpaquePtr(); return ast_context->CharTy.getAsOpaquePtr();
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->SignedCharTy)) if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->SignedCharTy))
return ast_context->SignedCharTy.getAsOpaquePtr(); return ast_context->SignedCharTy.getAsOpaquePtr();
} }
else if (strstr(type_name, "int"))
if (streq(type_name, "wchar_t")) {
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->IntTy))
return ast_context->IntTy.getAsOpaquePtr();
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->Int128Ty))
return ast_context->Int128Ty.getAsOpaquePtr();
}
else if (streq(type_name, "wchar_t"))
{ {
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->WCharTy)) if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->WCharTy))
return ast_context->WCharTy.getAsOpaquePtr(); return ast_context->WCharTy.getAsOpaquePtr();
} }
} }
// We weren't able to match up a type name, just search by size // We weren't able to match up a type name, just search by size
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->CharTy)) if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->CharTy))
@ -598,36 +589,33 @@ ClangASTContext::GetBuiltinTypeForDWARFEncodingAndBitSize (const char *type_name
case DW_ATE_unsigned: case DW_ATE_unsigned:
if (type_name) if (type_name)
{ {
if (streq(type_name, "unsigned int")) if (strstr(type_name, "long long"))
{
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedLongLongTy))
return ast_context->UnsignedLongLongTy.getAsOpaquePtr();
}
else if (strstr(type_name, "long"))
{
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedLongTy))
return ast_context->UnsignedLongTy.getAsOpaquePtr();
}
else if (strstr(type_name, "short"))
{
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedShortTy))
return ast_context->UnsignedShortTy.getAsOpaquePtr();
}
else if (strstr(type_name, "char"))
{
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedCharTy))
return ast_context->UnsignedCharTy.getAsOpaquePtr();
}
else if (strstr(type_name, "int"))
{ {
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedIntTy)) if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedIntTy))
return ast_context->UnsignedIntTy.getAsOpaquePtr(); return ast_context->UnsignedIntTy.getAsOpaquePtr();
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedInt128Ty)) if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedInt128Ty))
return ast_context->UnsignedInt128Ty.getAsOpaquePtr(); return ast_context->UnsignedInt128Ty.getAsOpaquePtr();
} }
if (streq(type_name, "unsigned int") ||
streq(type_name, "long unsigned int") ||
streq(type_name, "unsigned long long"))
{
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedLongTy))
return ast_context->UnsignedLongTy.getAsOpaquePtr();
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedLongLongTy))
return ast_context->UnsignedLongLongTy.getAsOpaquePtr();
}
if (streq(type_name, "unsigned short") ||
streq(type_name, "short unsigned int"))
{
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedShortTy))
return ast_context->UnsignedShortTy.getAsOpaquePtr();
}
if (streq(type_name, "unsigned char"))
{
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedCharTy))
return ast_context->UnsignedCharTy.getAsOpaquePtr();
}
} }
// We weren't able to match up a type name, just search by size // We weren't able to match up a type name, just search by size
if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedCharTy)) if (QualTypeMatchesBitSize (bit_size, ast_context, ast_context->UnsignedCharTy))