Skip to content

Commit 9d830d3

Browse files
authored
Merge pull request #25243 from protocolbuffers/fixing_msan_error
removing upb_Xsan_MarkInitialized function
2 parents 496387e + 95bce33 commit 9d830d3

File tree

3 files changed

+0
-33
lines changed

3 files changed

+0
-33
lines changed

php/ext/google/protobuf/php-upb.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -873,17 +873,6 @@ UPB_INLINE void UPB_PRIVATE(upb_Xsan_Init)(upb_Xsan *xsan) {
873873
#endif
874874
}
875875

876-
UPB_INLINE void UPB_PRIVATE(upb_Xsan_MarkInitialized)(void* addr, size_t size) {
877-
#if UPB_HAS_FEATURE(memory_sanitizer)
878-
if (size) {
879-
__msan_unpoison(addr, size);
880-
}
881-
#else
882-
UPB_UNUSED(addr);
883-
UPB_UNUSED(size);
884-
#endif
885-
}
886-
887876
// Marks the given region as poisoned, meaning that it is not accessible until
888877
// it is unpoisoned.
889878
UPB_INLINE void UPB_PRIVATE(upb_Xsan_PoisonRegion)(const void *addr,

ruby/ext/google/protobuf_c/ruby-upb.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -875,17 +875,6 @@ UPB_INLINE void UPB_PRIVATE(upb_Xsan_Init)(upb_Xsan *xsan) {
875875
#endif
876876
}
877877

878-
UPB_INLINE void UPB_PRIVATE(upb_Xsan_MarkInitialized)(void* addr, size_t size) {
879-
#if UPB_HAS_FEATURE(memory_sanitizer)
880-
if (size) {
881-
__msan_unpoison(addr, size);
882-
}
883-
#else
884-
UPB_UNUSED(addr);
885-
UPB_UNUSED(size);
886-
#endif
887-
}
888-
889878
// Marks the given region as poisoned, meaning that it is not accessible until
890879
// it is unpoisoned.
891880
UPB_INLINE void UPB_PRIVATE(upb_Xsan_PoisonRegion)(const void *addr,

upb/port/sanitizers.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,6 @@ UPB_INLINE void UPB_PRIVATE(upb_Xsan_Init)(upb_Xsan *xsan) {
6767
#endif
6868
}
6969

70-
UPB_INLINE void UPB_PRIVATE(upb_Xsan_MarkInitialized)(void* addr, size_t size) {
71-
#if UPB_HAS_FEATURE(memory_sanitizer)
72-
if (size) {
73-
__msan_unpoison(addr, size);
74-
}
75-
#else
76-
UPB_UNUSED(addr);
77-
UPB_UNUSED(size);
78-
#endif
79-
}
80-
8170
// Marks the given region as poisoned, meaning that it is not accessible until
8271
// it is unpoisoned.
8372
UPB_INLINE void UPB_PRIVATE(upb_Xsan_PoisonRegion)(const void *addr,

0 commit comments

Comments
 (0)