ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-05-03 17:23:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

1279 llvm 14 (#1282)

Browse Source 
* traverse enum type on llvm 14 #1279
This commit is contained in:
Scott Fennell 2022-06-09 09:42:06 -05:00 committed by GitHub
parent ae55e7f5ab
commit 33d2a53e12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/test_linux.yml vendored
View File

@ -95,7 +95,7 @@ jobs:
#-------- RHEL 7-based Only Dependencies ---------------- #-------- RHEL 7-based Only Dependencies ----------------
- cfg: { arch: rhel, arch_ver: 7 } - cfg: { arch: rhel, arch_ver: 7 }
pkg_mgr: yum pkg_mgr: yum
conf_pkg: | conf_pkg: |
yum -y install epel-release yum -y install epel-release
yum -y update yum -y update
os_deps: >- os_deps: >-
@ -124,23 +124,12 @@ jobs:
cmake . cmake .
make make
cp libgtest* /usr/lib/ cp libgtest* /usr/lib/
tag_deps: >-
llvm-dev
libclang-dev
#-------- Debian 11-based Only Dependencies ---------------- #-------- Debian 11-based Only Dependencies ----------------
- cfg: { arch: debian, arch_ver: 11 } - cfg: { arch: debian, arch_ver: 11 }
conf_pkg: | conf_pkg: |
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
apt-get update apt-get update
apt-get install -y tzdata apt-get install -y tzdata
tag_deps: >-
llvm-dev
libclang-dev
#-------- Debian 12-based Only Dependencies ----------------
- cfg: { arch: debian, arch_ver: 12 }
tag_deps: >-
llvm-13-dev
libclang-13-dev
#-------- OS and Version Specific Dependencies ---------------- #-------- OS and Version Specific Dependencies ----------------
- cfg: { os: oraclelinux } - cfg: { os: oraclelinux }
install_gtest: | install_gtest: |
@ -170,7 +159,7 @@ jobs:
export PYTHON_VERSION=${{matrix.python}} export PYTHON_VERSION=${{matrix.python}}
./configure ./configure
- name: Build Trick - name: Build Trick
run: | run: |
export MAKEFLAGS=-j`nproc` export MAKEFLAGS=-j`nproc`
make make
- name: Test - name: Test

6
trick_source/codegen/Interface_Code_Gen/ClassVisitor.cpp
View File

@ -79,7 +79,13 @@ bool CXXRecordVisitor::TraverseDecl(clang::Decl *d) {
/* This is an embedded enumeration within a class. Only process it if is public */ /* This is an embedded enumeration within a class. Only process it if is public */
if ( ed->getAccess() == clang::AS_public ) { if ( ed->getAccess() == clang::AS_public ) {
EnumVisitor evis(ci, hsd) ; EnumVisitor evis(ci, hsd) ;
// Before llvm 14, TraverseDecl also traversed the type.
// llvm believed this to be a bug, so now we call TraverseType
// in addition to TraverseDecl.
evis.TraverseDecl(ed) ; evis.TraverseDecl(ed) ;
#if (LIBCLANG_MAJOR >= 14)
evis.TraverseType(clang::QualType(ed->getTypeForDecl(), 0));
#endif
pa.printEnum(evis.get_enum_data()) ; pa.printEnum(evis.get_enum_data()) ;
} else { } else {
// protected and private embedded classes cannot be used outside of their class // protected and private embedded classes cannot be used outside of their class

6
trick_source/codegen/Interface_Code_Gen/TranslationUnitVisitor.cpp
View File

@ -98,7 +98,13 @@ bool TranslationUnitVisitor::TraverseDecl(clang::Decl *d) {
clang::EnumDecl * ed = static_cast<clang::EnumDecl *>(d) ; clang::EnumDecl * ed = static_cast<clang::EnumDecl *>(d) ;
if ( isInUserCode(ci , ed->RBRACELOC(), hsd) ) { if ( isInUserCode(ci , ed->RBRACELOC(), hsd) ) {
EnumVisitor evis(ci, hsd) ; EnumVisitor evis(ci, hsd) ;
// Before llvm 14, TraverseDecl also traversed the type.
// llvm believed this to be a bug, so now we call TraverseType
// in addition to TraverseDecl.
evis.TraverseDecl(ed) ; evis.TraverseDecl(ed) ;
#if (LIBCLANG_MAJOR >= 14)
evis.TraverseType(clang::QualType(ed->getTypeForDecl(), 0));
#endif
//if ( evis.get_enum_data() != NULL ) { //if ( evis.get_enum_data() != NULL ) {
pa.printEnum(evis.get_enum_data()) ; pa.printEnum(evis.get_enum_data()) ;
//} //}