Cold-Air-Networks/mirror-llvm-project
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 7

Write original source language when writing and reading AST (#208115)

Browse source 
FAIL: Clang :: Frontend/ast-main.c
FAIL: Clang :: Frontend/ast-main.cpp

were failing on z/OS; this change fixes these lit failures.

The issue here is that on z/OS the original source code language needs
to be passed through to the IR so that the backend can encode this
information in the PPA2 in the object file. That means that it needs to
be exported to the AST so that going from saved AST -> IR will carry the
language through.
This commit is contained in:
Ariel-Burton 2026-07-13 10:26:36 -04:00 committed by GitHub
parent ada4f7cffc
commit 695238ffaa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clang/lib/Serialization/ASTReader.cpp
View file

@ -6663,6 +6663,7 @@ bool ASTReader::ParseLanguageOptions(const RecordData &Record,
bool AllowCompatibleDifferences) {
LangOptions LangOpts;
unsigned Idx = 0;
LangOpts.LangStd = static_cast<LangStandard::Kind>(Record[Idx++]);
#define LANGOPT(Name, Bits, Default, Compatibility, Description) \
LangOpts.Name = Record[Idx++];
#define ENUM_LANGOPT(Name, Type, Bits, Default, Compatibility, Description) \

1
clang/lib/Serialization/ASTWriter.cpp
View file

@ -1608,6 +1608,7 @@ void ASTWriter::WriteControlBlock(Preprocessor &PP, StringRef isysroot) {
// Language options.
Record.clear();
const LangOptions &LangOpts = PP.getLangOpts();
Record.push_back(static_cast<unsigned>(LangOpts.LangStd));
const uint64_t LanguageOptionValues[] = {
#define LANGOPT(Name, Bits, Default, Compatibility, Description) LangOpts.Name,
#define ENUM_LANGOPT(Name, Type, Bits, Default, Compatibility, Description) \

27
clang/test/CodeGen/SystemZ/zos-check-lanuage.c Normal file
View file

@ -0,0 +1,27 @@
// This chunk is based on Clang :: Frontend/ast-main.c,
// but targeted for z/OS. (Ensure we have no fatal error.)
// We also duplicate for C++.
// RUN: env SDKROOT="/" %clang -target s390x-none-zos -emit-llvm -S -o - -x c - < %s | grep -v DIFile > %t1.ll
// RUN: env SDKROOT="/" %clang -target s390x-none-zos -emit-ast -o %t.ast %s
// RUN: env SDKROOT="/" %clang -target s390x-none-zos -emit-llvm -S -o - -x ast - < %t.ast | grep -v DIFile > %t2.ll
// RUN: diff %t1.ll %t2.ll
// check that the langage attribute has come through
// RUN: FileCheck --check-prefix CHECK-C %s < %t1.ll
// CHECK-C: !"zos_cu_language", !"C"}
// RUN: env SDKROOT="/" %clang -target s390x-none-zos -emit-llvm -S -o - -x c++ - < %s | grep -v DIFile > %t1.ll
// RUN: env SDKROOT="/" %clang -target s390x-none-zos -emit-ast -o %t.ast -x c++ %s
// RUN: env SDKROOT="/" %clang -target s390x-none-zos -emit-llvm -S -o - -x ast - < %t.ast | grep -v DIFile > %t2.ll
// RUN: diff %t1.ll %t2.ll
// check that the langage attribute has come through
// RUN: FileCheck --check-prefix CHECK-CPP %s < %t1.ll
// CHECK-CPP: !"zos_cu_language", !"C++"}
int main(void) {
return 0;
}