Skip to content

Revert "[llvm] annotate interfaces in llvm/Option and llvm/Remarks for DLL export (#142856) #144412

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

Closed

Conversation

fahadnayyar
Copy link
Contributor

@fahadnayyar fahadnayyar commented Jun 16, 2025

Trying to resolve a GreenDragon bot build failure :

This reverts commit 1c8206b.

Copy link

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:
git-clang-format --diff HEAD~1 HEAD --extensions h -- llvm/include/llvm/Option/Arg.h llvm/include/llvm/Option/ArgList.h llvm/include/llvm/Option/OptSpecifier.h llvm/include/llvm/Option/OptTable.h llvm/include/llvm/Option/Option.h llvm/include/llvm/Remarks/Remark.h llvm/include/llvm/Remarks/RemarkFormat.h llvm/include/llvm/Remarks/RemarkLinker.h llvm/include/llvm/Remarks/RemarkParser.h llvm/include/llvm/Remarks/RemarkSerializer.h llvm/include/llvm/Remarks/RemarkStringTable.h llvm/include/llvm/Remarks/YAMLRemarkSerializer.h
View the diff from clang-format here.
diff --git a/llvm/include/llvm/Option/Arg.h b/llvm/include/llvm/Option/Arg.h
index 5a718438b..fcdd10583 100644
--- a/llvm/include/llvm/Option/Arg.h
+++ b/llvm/include/llvm/Option/Arg.h
@@ -72,10 +72,10 @@ private:
 public:
   Arg(const Option Opt, StringRef Spelling, unsigned Index,
       const Arg *BaseArg = nullptr);
-  Arg(const Option Opt, StringRef Spelling, unsigned Index,
-      const char *Value0, const Arg *BaseArg = nullptr);
-  Arg(const Option Opt, StringRef Spelling, unsigned Index,
-      const char *Value0, const char *Value1, const Arg *BaseArg = nullptr);
+  Arg(const Option Opt, StringRef Spelling, unsigned Index, const char *Value0,
+      const Arg *BaseArg = nullptr);
+  Arg(const Option Opt, StringRef Spelling, unsigned Index, const char *Value0,
+      const char *Value1, const Arg *BaseArg = nullptr);
   Arg(const Arg &) = delete;
   Arg &operator=(const Arg &) = delete;
   ~Arg();
diff --git a/llvm/include/llvm/Option/ArgList.h b/llvm/include/llvm/Option/ArgList.h
index 09812f976..97734ba4c 100644
--- a/llvm/include/llvm/Option/ArgList.h
+++ b/llvm/include/llvm/Option/ArgList.h
@@ -11,11 +11,11 @@
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/iterator_range.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Twine.h"
+#include "llvm/ADT/iterator_range.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/OptSpecifier.h"
 #include "llvm/Option/Option.h"
@@ -351,8 +351,7 @@ public:
   /// \param Joined - If true, render the argument as joined with
   /// the option specifier.
   void AddAllArgsTranslated(ArgStringList &Output, OptSpecifier Id0,
-                            const char *Translation,
-                            bool Joined = false) const;
+                            const char *Translation, bool Joined = false) const;
 
   /// ClaimAllArgs - Claim all arguments which match the given
   /// option id.
@@ -382,7 +381,7 @@ public:
   /// Create an arg string for (\p LHS + \p RHS), reusing the
   /// string at \p Index if possible.
   const char *GetOrMakeJoinedArgString(unsigned Index, StringRef LHS,
-                                        StringRef RHS) const;
+                                       StringRef RHS) const;
 
   void print(raw_ostream &O) const;
   void dump() const;

@wlei-llvm
Copy link
Contributor

wlei-llvm commented Jun 17, 2025

For #142856, perhaps we can have an easy fix like #144460

cc @andrurogerz

@andrurogerz
Copy link
Contributor

For #142856, perhaps we can have an easy fix like #144460

@wlei-llvm yes, #144460 is definitely the correct fix here-- I apologize that I missed the #include in that file.

@fahadnayyar
Copy link
Contributor Author

@wlei-llvm @andrurogerz
Closing this draft of the revert PR in the hope that PR-144464 resolves the bot failure.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants