Skip to content

Conversation

@llvmbot
Copy link
Member

@llvmbot llvmbot commented Aug 5, 2024

Backport e60ee1f

Requested by: @kiranchandramohan

@llvmbot llvmbot added this to the LLVM 19.X Release milestone Aug 5, 2024
@llvmbot
Copy link
Member Author

llvmbot commented Aug 5, 2024

@banach-space What do you think about merging this PR to the release branch?

@llvmbot llvmbot requested a review from banach-space August 5, 2024 11:50
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Aug 5, 2024
@llvmbot
Copy link
Member Author

llvmbot commented Aug 5, 2024

@llvm/pr-subscribers-clang-driver

@llvm/pr-subscribers-clang

Author: None (llvmbot)

Changes

Backport e60ee1f

Requested by: @kiranchandramohan


Full diff: https://github.com/llvm/llvm-project/pull/101963.diff

1 Files Affected:

  • (modified) clang/include/clang/Driver/Options.td (+3-2)
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
index 359a698ea87dd..014a2bd85fdc6 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -932,8 +932,9 @@ def O_flag : Flag<["-"], "O">, Visibility<[ClangOption, CC1Option, FC1Option]>,
   Alias<O>, AliasArgs<["1"]>;
 def Ofast : Joined<["-"], "Ofast">, Group<O_Group>,
   Visibility<[ClangOption, CC1Option, FlangOption]>,
-  HelpText<"Deprecated; use '-O3 -ffast-math' for the same behavior,"
-  " or '-O3' to enable only conforming optimizations">;
+  HelpTextForVariants<[ClangOption, CC1Option],
+                      "Deprecated; use '-O3 -ffast-math' for the same behavior,"
+                      " or '-O3' to enable only conforming optimizations">;
 def P : Flag<["-"], "P">,
   Visibility<[ClangOption, CC1Option, FlangOption, FC1Option]>,
   Group<Preprocessor_Group>,

@AaronBallman AaronBallman added clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' flang Flang issues not falling into any other category labels Aug 5, 2024
Copy link
Collaborator

@AaronBallman AaronBallman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for a backport

The discussion about this in Flang
(https://discourse.llvm.org/t/rfc-deprecate-ofast-in-flang/80243) has
not concluded hence restricting the deprecation only to Clang.

(cherry picked from commit e60ee1f)
@tru tru merged commit 4ab5313 into llvm:release/19.x Aug 10, 2024
@github-actions
Copy link

@kiranchandramohan (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' clang Clang issues not falling into any other category flang Flang issues not falling into any other category

Projects

Development

Successfully merging this pull request may close these issues.

4 participants