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

[compiler-rt] Move endif to correct place #100342

Merged
merged 4 commits into from
Jul 24, 2024

Conversation

chestnykh
Copy link
Contributor

A couple of previous commits leaded to wrong endif placement inside the source that caused build problem in
https://lab.llvm.org/buildbot/#/builders/13/builds/1020

See #99613 #99049

@llvmbot
Copy link
Collaborator

llvmbot commented Jul 24, 2024

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Dmitry Chestnykh (chestnykh)

Changes

A couple of previous commits leaded to wrong endif placement inside the source that caused build problem in
https://lab.llvm.org/buildbot/#/builders/13/builds/1020

See #99613 #99049


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

1 Files Affected:

  • (modified) compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp (+1-1)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
index bc2cb247f2a8a..afb6693017740 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
@@ -2239,6 +2239,7 @@ static const char *RegNumToRegName(int reg) {
 #    endif
     default:
       return NULL;
+#endif
   }
   return NULL;
 }
@@ -2302,7 +2303,6 @@ static void DumpSingleReg(ucontext_t *ctx, int RegNum) {
   (void)RegName;
 #    endif
 }
-#  endif
 
 void SignalContext::DumpAllRegisters(void *context) {
   ucontext_t *ucontext = (ucontext_t *)context;

@chestnykh chestnykh requested a review from devnexen July 24, 2024 10:46
A couple of previous commits leaded to wrong endif
placement inside the source that caused build problem in
https://lab.llvm.org/buildbot/#/builders/13/builds/1020

See llvm#99613 llvm#99049
Copy link

github-actions bot commented Jul 24, 2024

✅ With the latest revision this PR passed the C/C++ code formatter.

@chestnykh chestnykh merged commit 558a895 into llvm:main Jul 24, 2024
6 checks passed
hctim added a commit that referenced this pull request Jul 24, 2024
This reverts commit 558a895.

This was a fix-forward for
#99613 that unfortunately
didn't work for the Android sanitizer buildbot. More information in that
pull request.
chestnykh added a commit to chestnykh/llvm-project that referenced this pull request Jul 24, 2024
vitalybuka pushed a commit that referenced this pull request Jul 25, 2024
yuxuanchen1997 pushed a commit that referenced this pull request Jul 25, 2024
Summary:
A couple of previous commits leaded to wrong endif placement inside the
source that caused build problem in
https://lab.llvm.org/buildbot/#/builders/13/builds/1020

See #99613 #99049

Test Plan: 

Reviewers: 

Subscribers: 

Tasks: 

Tags: 


Differential Revision: https://phabricator.intern.facebook.com/D60250654
yuxuanchen1997 pushed a commit that referenced this pull request Jul 25, 2024
Summary:
This reverts commit 558a895.

This was a fix-forward for
#99613 that unfortunately
didn't work for the Android sanitizer buildbot. More information in that
pull request.

Test Plan: 

Reviewers: 

Subscribers: 

Tasks: 

Tags: 


Differential Revision: https://phabricator.intern.facebook.com/D60250687
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.

3 participants