-
Notifications
You must be signed in to change notification settings - Fork 0
[PowerPC][AIX] Support #pragma comment copyright for AIX #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: XCOFFAssociatedMetadata
Are you sure you want to change the base?
Changes from 3 commits
fbbb701
cfa6019
82254ee
7af5f2d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -587,6 +587,10 @@ class CodeGenModule : public CodeGenTypeCache { | |
| /// A vector of metadata strings for dependent libraries for ELF. | ||
| SmallVector<llvm::MDNode *, 16> ELFDependentLibraries; | ||
|
|
||
| /// Single module-level copyright comment for AIX (if any). | ||
| /// We only ever accept one per TU. | ||
| llvm::MDNode *AIXCopyrightComment = nullptr; | ||
tonykuttai marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| /// @name Cache for Objective-C runtime types | ||
| /// @{ | ||
|
|
||
|
|
@@ -1458,6 +1462,8 @@ class CodeGenModule : public CodeGenTypeCache { | |
| /// Appends a dependent lib to the appropriate metadata value. | ||
| void AddDependentLib(StringRef Lib); | ||
|
|
||
| /// Record the AIX copyright comment in module-level metadata. | ||
| void ProcessPragmaCommentCopyright(StringRef Comment); | ||
|
|
||
| llvm::GlobalVariable::LinkageTypes getFunctionLinkage(GlobalDecl GD); | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // RUN: split-file %s %t | ||
|
|
||
| // Build the module interface to a PCM | ||
| // RUN: %clang_cc1 -std=c++20 -triple powerpc-ibm-aix \ | ||
| // RUN: -emit-module-interface %t/copymod.cppm -o %t/copymod.pcm | ||
|
|
||
| // verify that module interface emit copyright string when compiled to assembly | ||
| // RUN: %clang_cc1 -std=c++20 -triple powerpc-ibm-aix -S %t/copymod.cppm -o - \ | ||
| // RUN: | FileCheck %s --check-prefix=CHECK-MOD | ||
| // CHECK-MOD: .string "module me" | ||
|
Comment on lines
+7
to
+10
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The test can be written to check LLVM IR (to avoid the PowerPC backend requirement). |
||
|
|
||
| // Compile an importing TU that uses the prebuilt module and verify that it | ||
| // does NOT re-emit the module's copyright string. | ||
| // RUN: %clang_cc1 -std=c++20 -triple powerpc-ibm-aix \ | ||
| // RUN: -fprebuilt-module-path=%t -S %t/importmod.cc -o - \ | ||
| // RUN: | FileCheck %s | ||
| // CHECK-NOT: .string "module me" | ||
|
|
||
| //--- copymod.cppm | ||
| export module copymod; | ||
| #pragma comment(copyright, "module me") | ||
| export inline void f() {} | ||
|
|
||
| //--- importmod.cc | ||
| import copymod; | ||
| void g() { f(); } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| // RUN: %clang_cc1 %s -triple powerpc-ibm-aix -O0 -disable-llvm-passes -emit-llvm -o - | FileCheck %s | ||
| // RUN: %clang_cc1 %s -triple powerpc64-ibm-aix -O0 -disable-llvm-passes -emit-llvm -o - | FileCheck %s | ||
| // RUN: %clang_cc1 %s -triple powerpc-ibm-aix -verify | ||
| // RUN: %clang_cc1 %s -triple powerpc64-ibm-aix -verify | ||
| // RUN: %clang_cc1 %s -DTEST_EMPTY_COPYRIGHT -triple powerpc-ibm-aix -verify | ||
|
|
||
| // RUN: %clang_cc1 %s -x c++ -triple powerpc-ibm-aix -O0 -disable-llvm-passes -emit-llvm -o - | FileCheck %s | ||
| // RUN: %clang_cc1 %s -x c++ -triple powerpc64-ibm-aix -O0 -disable-llvm-passes -emit-llvm -o - | FileCheck %s | ||
| // RUN: %clang_cc1 %s -x c++ -triple powerpc-ibm-aix -verify | ||
| // RUN: %clang_cc1 %s -x c++ -triple powerpc64-ibm-aix -verify | ||
| // RUN: %clang_cc1 %s -x c++ -DTEST_EMPTY_COPYRIGHT -triple powerpc-ibm-aix -verify | ||
|
|
||
| #ifndef TEST_EMPTY_COPYRIGHT | ||
| // Test basic pragma comment types | ||
| #pragma comment(copyright, "@(#) Copyright") | ||
|
|
||
| // Test duplicate copyright - should warn and ignore | ||
| #pragma comment(copyright, "Duplicate Copyright") // expected-warning {{'#pragma comment copyright' can be specified only once per translation unit - ignored}} | ||
|
|
||
| int main() { return 0; } | ||
|
|
||
| // Check that both metadata sections are present | ||
| // CHECK: !aix.copyright.comment = !{![[copyright:[0-9]+]]} | ||
|
|
||
| // Check individual metadata content | ||
| // CHECK: ![[copyright]] = !{!"@(#) Copyright"} | ||
|
|
||
| #else | ||
| // Test empty copyright string - valid with no warning | ||
| #pragma comment(copyright, "") // expected-no-diagnostics | ||
|
|
||
| int main() { return 0; } | ||
|
|
||
| #endif |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| //===-- CopyrightMetadataPass.h - Lower AIX copyright metadata -*- C++ -*-===// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| #ifndef LLVM_TRANSFORMS_UTILS_COPYRIGHTMETADATAPASS_H | ||
| #define LLVM_TRANSFORMS_UTILS_COPYRIGHTMETADATAPASS_H | ||
|
|
||
| #include "llvm/IR/PassManager.h" | ||
|
|
||
| namespace llvm { | ||
| class CopyrightMetadataPass : public PassInfoMixin<CopyrightMetadataPass> { | ||
| public: | ||
| PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM); | ||
|
|
||
| static bool isRequired() { return true; } | ||
| }; | ||
|
|
||
|
|
||
| } // namespace llvm | ||
|
|
||
| #endif // LLVM_TRANSFORMS_UTILS_COPYRIGHTMETADATAPASS_H |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you rename "aix.copyright.comment" to be something generic so other platforms can use it. Something like "comment.module". Hubert had a better suggestion than the word "module". I'd use that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed to
loadtime.copyright.commentThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Drop copyright from the name. That reflects a use, not the purpose.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Additionally, it may be helpful (in case there are additional
#pragma commentIR annotations in the future) to name itcomment_string.loadtimeso that we can have a family ofcomment_string.*annotations with the "high-order qualifier" first (assuming that the comments will uniformly be generated as strings out of the front-end).