ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-29 15:43:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ICG creates offsetof statements that will not compile when using clang #327

Browse Source 
Added a check that was in 15 that tested the platform we are running on.  If we
are on an mac, we want to skip fully qualifying variable names because it creates
code that doesn't compile under clang.
This commit is contained in:
Alex Lin 2016-10-12 13:29:25 -05:00
parent 60348f8335
commit 23af89681e
1 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
trick_source/codegen/Interface_Code_Gen/ClassValues.cpp
View File

@ -2,9 +2,15 @@
#include <iostream>
#include <sstream>
#include "ClassValues.hh"
#include "FieldDescription.hh"
#ifdef __APPLE__
#include "llvm/Support/CommandLine.h"
extern llvm::cl::opt< bool > no_offset_of ;
#endif
ClassValues::ClassValues() :
has_init_attr_friend(false) ,
is_pod(false) ,
@ -23,18 +29,23 @@ ClassValues::~ClassValues() {
void ClassValues::addFieldDescription(FieldDescription * in_fdes) {
field_descripts.push_back(in_fdes) ;
// Test to see if the new field overloads a field of the same name. If it does
// then fully qualify the name of the inherited field (the one already in field_name_to_info).
std::map< std::string , FieldDescription * >::iterator mit = field_name_to_info_map.find(in_fdes->getName()) ;
if ( mit != field_name_to_info_map.end() ) {
// If the matched variable is inherited, qualify it with its container class name.
if ( (*mit).second->isInherited() ) {
(*mit).second->setName( (*mit).second->getContainerClass() + "::" + (*mit).second->getName() ) ;
field_name_to_info_map[(*mit).second->getName()] = (*mit).second ;
field_name_to_info_map.erase(mit) ;
#ifdef __APPLE__
if ( no_offset_of ) {
#else
{
#endif
// Test to see if the new field overloads a field of the same name. If it does
// then fully qualify the name of the inherited field (the one already in field_name_to_info).
std::map< std::string , FieldDescription * >::iterator mit = field_name_to_info_map.find(in_fdes->getName()) ;
if ( mit != field_name_to_info_map.end() ) {
// If the matched variable is inherited, qualify it with its container class name.
if ( (*mit).second->isInherited() ) {
(*mit).second->setName( (*mit).second->getContainerClass() + "::" + (*mit).second->getName() ) ;
field_name_to_info_map[(*mit).second->getName()] = (*mit).second ;
field_name_to_info_map.erase(mit) ;
}
}
}
field_name_to_info_map[in_fdes->getName()] = in_fdes ;
}
@ -45,44 +56,50 @@ void ClassValues::addInheritedFieldDescriptions(std::vector<FieldDescription *>
std::vector<FieldDescription *>::iterator fdit ;
// Loop through the incoming inherited variable names
for ( fdit = in_fdes.begin() ; fdit != in_fdes.end() ; fdit++ ) {
#ifdef __APPLE__
if ( no_offset_of ) {
#else
{
#endif
for ( fdit = in_fdes.begin() ; fdit != in_fdes.end() ; fdit++ ) {
(*fdit)->setBaseClassOffset( class_offset ) ;
(*fdit)->setInherited( true ) ;
(*fdit)->setVirtualInherited( virtual_inherited ) ;
// Adds the class offset to the field offset giving the total offset to the inherited variable
// The offset is stored in bits so multiply class_offset by 8.
(*fdit)->addOffset( class_offset * 8 ) ;
(*fdit)->setBaseClassOffset( class_offset ) ;
(*fdit)->setInherited( true ) ;
(*fdit)->setVirtualInherited( virtual_inherited ) ;
// Adds the class offset to the field offset giving the total offset to the inherited variable
// The offset is stored in bits so multiply class_offset by 8.
(*fdit)->addOffset( class_offset * 8 ) ;
std::string in_name = (*fdit)->getName() ;
// search existing names for incoming inherited variable name.
std::map< std::string , FieldDescription * >::iterator mit = field_name_to_info_map.find(in_name) ;
// if the variable name already exists we have overloaded variable names.
if ( mit != field_name_to_info_map.end() ) {
// the incoming variable is known to be inherited. Qualify it with its container class name.
(*fdit)->setName( (*fdit)->getContainerClass() + "::" + (*fdit)->getName() ) ;
field_name_to_info_map[(*fdit)->getName()] = *fdit ;
// If the matched variable is also inherited, qualify it with its container class name.
if ( (*mit).second->isInherited() ) {
(*mit).second->setName( (*mit).second->getContainerClass() + "::" + (*mit).second->getName() ) ;
field_name_to_info_map[(*mit).second->getName()] = (*mit).second ;
field_name_to_info_map.erase(mit) ;
// Mark this name is one that we always have to qualify.
field_names_to_qualify.insert(in_name) ;
}
} else {
// incoming name did not match an existing variable name.
// Test to see if there variables of this name need to be qualified.
if ( field_names_to_qualify.find(in_name) == field_names_to_qualify.end() ) {
// The name is not overloaded (yet), add the unqualified inherited name straight into map.
field_name_to_info_map[in_name] = *fdit ;
// Upgrade the inherited variable's container class to the current class.
//(*fdit)->setContainerClass( name ) ;
} else {
// The name is overloaded by other inherited variables... qualify the name.
std::string in_name = (*fdit)->getName() ;
// search existing names for incoming inherited variable name.
std::map< std::string , FieldDescription * >::iterator mit = field_name_to_info_map.find(in_name) ;
// if the variable name already exists we have overloaded variable names.
if ( mit != field_name_to_info_map.end() ) {
// the incoming variable is known to be inherited. Qualify it with its container class name.
(*fdit)->setName( (*fdit)->getContainerClass() + "::" + (*fdit)->getName() ) ;
field_name_to_info_map[(*fdit)->getName()] = *fdit ;
// If the matched variable is also inherited, qualify it with its container class name.
if ( (*mit).second->isInherited() ) {
(*mit).second->setName( (*mit).second->getContainerClass() + "::" + (*mit).second->getName() ) ;
field_name_to_info_map[(*mit).second->getName()] = (*mit).second ;
field_name_to_info_map.erase(mit) ;
// Mark this name is one that we always have to qualify.
field_names_to_qualify.insert(in_name) ;
}
} else {
// incoming name did not match an existing variable name.
// Test to see if there variables of this name need to be qualified.
if ( field_names_to_qualify.find(in_name) == field_names_to_qualify.end() ) {
// The name is not overloaded (yet), add the unqualified inherited name straight into map.
field_name_to_info_map[in_name] = *fdit ;
// Upgrade the inherited variable's container class to the current class.
//(*fdit)->setContainerClass( name ) ;
} else {
// The name is overloaded by other inherited variables... qualify the name.
(*fdit)->setName( (*fdit)->getContainerClass() + "::" + (*fdit)->getName() ) ;
field_name_to_info_map[(*fdit)->getName()] = *fdit ;
}
}
}
}