[rust] Remove constexpr from functions that call non-constexpr functions

The CHECK macros will call non-constexpr functions on failure. While this is legal C++14 as long as the function doesn't actually get called, GCC 5.4 will choke on it.
rust-lang · Feb 10, 2022 · 75fef2e · 75fef2e
1 parent 8b2c25d
commit 75fef2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common.h b/compiler-rt/lib/sanitizer_common/sanitizer_common.h
@@ -426,7 +426,7 @@ inline uptr RoundUpToPowerOfTwo(uptr size) {
   return 1ULL << (up + 1);
 }
 
-inline constexpr uptr RoundUpTo(uptr size, uptr boundary) {
+inline uptr RoundUpTo(uptr size, uptr boundary) {
   RAW_CHECK(IsPowerOfTwo(boundary));
   return (size + boundary - 1) & ~(boundary - 1);
 }

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_stack_store.h b/compiler-rt/lib/sanitizer_common/sanitizer_stack_store.h
@@ -61,7 +61,7 @@ class StackStore {
     return frame_idx % kBlockSizeFrames;
   }
 
-  static constexpr uptr IdToOffset(Id id) {
+  static uptr IdToOffset(Id id) {
     CHECK_NE(id, 0);
     return id - 1;  // Avoid zero as id.
   }