Revert "[compiler-rt] Move endif to correct place (#100342)"

hctim · hctim · commit e7a3aeb1f86b · 2024-07-24T16:46:34.000+02:00
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.
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
@@ -2237,7 +2237,6 @@ static const char *RegNumToRegName(int reg) {
     case 31:
       return "sp";
 #    endif
-#  endif  // SANITIZER_LINUX
     default:
       return NULL;
   }
@@ -2303,6 +2302,7 @@ static void DumpSingleReg(ucontext_t *ctx, int RegNum) {
   (void)RegName;
 #    endif
 }
+#  endif
 
 void SignalContext::DumpAllRegisters(void *context) {
   ucontext_t *ucontext = (ucontext_t *)context;

Original file line number	Diff line number	Diff line change
`@@ -2237,7 +2237,6 @@ static const char *RegNumToRegName(int reg) {`
`2237`	`2237`	`case 31:`
`2238`	`2238`	`return "sp";`
`2239`	`2239`	`# endif`
`2240`		`-# endif // SANITIZER_LINUX`
`2241`	`2240`	`default:`
`2242`	`2241`	`return NULL;`
`2243`	`2242`	`}`
`@@ -2303,6 +2302,7 @@ static void DumpSingleReg(ucontext_t *ctx, int RegNum) {`
`2303`	`2302`	`(void)RegName;`
`2304`	`2303`	`# endif`
`2305`	`2304`	`}`
	`2305`	`+# endif`
`2306`	`2306`
`2307`	`2307`	`void SignalContext::DumpAllRegisters(void *context) {`
`2308`	`2308`	`ucontext_t ucontext = (ucontext_t )context;`