Skip to content
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

Revert "Make two texts static in ReplayInlineAdvisor" #82071

Merged
merged 1 commit into from
Apr 1, 2024

Conversation

vitalybuka
Copy link
Collaborator

Reverts #79489

We know that the issues was with asan/annotations. We can revert it.

@llvmbot
Copy link
Collaborator

llvmbot commented Feb 16, 2024

@llvm/pr-subscribers-llvm-analysis

Author: Vitaly Buka (vitalybuka)

Changes

Reverts llvm/llvm-project#79489

We know that the issues was with asan/annotations. We can revert it.


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

1 Files Affected:

  • (modified) llvm/lib/Analysis/ReplayInlineAdvisor.cpp (+2-2)
diff --git a/llvm/lib/Analysis/ReplayInlineAdvisor.cpp b/llvm/lib/Analysis/ReplayInlineAdvisor.cpp
index 0814483db343ce..2ca02eb1741712 100644
--- a/llvm/lib/Analysis/ReplayInlineAdvisor.cpp
+++ b/llvm/lib/Analysis/ReplayInlineAdvisor.cpp
@@ -43,8 +43,8 @@ ReplayInlineAdvisor::ReplayInlineAdvisor(
   //   main:3:1.1;
   // We use the callsite string after `at callsite` to replay inlining.
   line_iterator LineIt(*BufferOrErr.get(), /*SkipBlanks=*/true);
-  static const std::string PositiveRemark = "' inlined into '";
-  static const std::string NegativeRemark = "' will not be inlined into '";
+  const std::string PositiveRemark = "' inlined into '";
+  const std::string NegativeRemark = "' will not be inlined into '";
 
   for (; !LineIt.is_at_eof(); ++LineIt) {
     StringRef Line = *LineIt;

Copy link
Member

@AdvenamTacet AdvenamTacet left a comment

Choose a reason for hiding this comment

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

LGTM with green CI.

@vitalybuka vitalybuka force-pushed the revert-79489-fix-ReplayInlineAdvisor branch from ceecdbf to a6319c3 Compare February 22, 2024 00:06
@vitalybuka vitalybuka merged commit 2bfb19e into main Apr 1, 2024
4 checks passed
@vitalybuka vitalybuka deleted the revert-79489-fix-ReplayInlineAdvisor branch April 1, 2024 02:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants