ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-21 01:31:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ICG errors while processing system header files #1189 (#1190)

Browse Source 
* Fix ICG errors while processing system header files #1189

Found an InitPreprocessor call and am using it.  Not sure which version
of clang it was added, just using for the version I'm on (10) and above.
Also found some GCC defines that are used during normal compilation.
Added these to our list of defines during ICG.  This clears up all of
the errors I've been seeing.

* Fix ICG errors while processing system header files #1189

OK, found the flag that activates the ATOMIC defines I was previously
hardcoding.
This commit is contained in:
Alex Lin 2021-10-12 11:30:49 -05:00 committed by GitHub
parent 0ccfed9b9b
commit 9f9fd7ca20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp
View File

@ -380,8 +380,8 @@ void HeaderSearchDirs::addDefines ( std::vector<std::string> & defines ) {
// Add -D command line arguments as well as "#define TRICK_ICG" to the preprocessor
unsigned int ii ;
std::string predefines("#define TRICK_ICG\n") ;
predefines += "#define __STRICT_ANSI__\n" ;
std::string predefines("#define TRICK_ICG\n");
predefines += "#define __STRICT_ANSI__\n";
for ( ii = 0 ; ii < defines.size() ; ii++ ) {
size_t found = defines[ii].find("=") ;
if ( found != defines[ii].npos ) {
@ -392,7 +392,6 @@ void HeaderSearchDirs::addDefines ( std::vector<std::string> & defines ) {
predefines += std::string("#define ") + defines[ii] + "\n" ;
}
pp.setPredefines(pp.getPredefines() + "\n" + predefines) ;
}
void HeaderSearchDirs::addTrickICGFoundFile ( std::string file_name ) {

45
trick_source/codegen/Interface_Code_Gen/main.cpp
View File

@ -51,6 +51,24 @@ llvm::cl::alias compat15_alias ("compat15" , llvm::cl::desc("Alias for -c") , ll
llvm::cl::opt<bool> m32("m32", llvm::cl::desc("Generate io code for use with 32bit mode"), llvm::cl::init(false), llvm::cl::ZeroOrMore) ;
void set_lang_opts(clang::CompilerInstance & ci) {
ci.getLangOpts().CXXExceptions = true ;
// Activate C++11 parsing
ci.getLangOpts().Bool = true ;
ci.getLangOpts().WChar = true ;
ci.getLangOpts().CPlusPlus = true ;
ci.getLangOpts().CPlusPlus11 = true ;
ci.getLangOpts().CXXOperatorNames = true ;
#if (LIBCLANG_MAJOR >= 6)
ci.getLangOpts().CPlusPlus14 = true ;
ci.getLangOpts().DoubleSquareBracketAttributes = true ;
#endif
// Activate C++17 parsing
#if (LIBCLANG_MAJOR >= 10)
ci.getLangOpts().GNUCVersion = true ;
ci.getLangOpts().CPlusPlus17 = true ;
#endif
}
/**
Most of the main program is pieced together from examples on the web. We are doing the following:
@ -99,19 +117,7 @@ int main(int argc, char * argv[]) {
ci.createDiagnostics();
ci.getDiagnosticOpts().ShowColors = 1 ;
ci.getDiagnostics().setIgnoreAllWarnings(true) ;
ci.getLangOpts().CXXExceptions = true ;
// Activate C++11 parsing
ci.getLangOpts().Bool = true ;
ci.getLangOpts().WChar = true ;
ci.getLangOpts().CPlusPlus = true ;
ci.getLangOpts().CPlusPlus11 = true ;
#if (LIBCLANG_MAJOR >= 6)
ci.getLangOpts().CPlusPlus14 = true ;
#endif
ci.getLangOpts().CXXOperatorNames = true ;
#if (LIBCLANG_MAJOR >= 6)
ci.getLangOpts().DoubleSquareBracketAttributes = true ;
#endif
set_lang_opts(ci);
// Create all of the necessary managers.
ci.createFileManager();
@ -157,14 +163,17 @@ int main(int argc, char * argv[]) {
#else
clang::CompilerInvocation::setLangDefaults(ci.getLangOpts(), clang::IK_CXX, trip, ppo) ;
#endif
// setting the language defaults clears the c++11 flag.
ci.getLangOpts().CPlusPlus11 = true ;
#if (LIBCLANG_MAJOR >= 6)
ci.getLangOpts().CPlusPlus14 = true ;
#endif
// setting the language defaults clears some of the language opts, set them again.
set_lang_opts(ci);
#endif
clang::Preprocessor& pp = ci.getPreprocessor();
#if (LIBCLANG_MAJOR >= 10)
clang::InitializePreprocessor(pp, ppo, ci.getPCHContainerReader(), ci.getFrontendOpts());
#endif
// Add all of the include directories to the preprocessor
HeaderSearchDirs hsd(ci.getPreprocessor().getHeaderSearchInfo(), ci.getHeaderSearchOpts(), pp, sim_services_flag);
hsd.addSearchDirs(include_dirs, isystem_dirs);