JDK-8340801

MBaesken · Sep 25, 2024 · a2f89ec · a2f89ec
1 parent 1b9898a
commit a2f89ec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/java.base/unix/native/include/jni_md.h b/src/java.base/unix/native/include/jni_md.h
@@ -54,6 +54,15 @@
 
 #define JNICALL
 
+/* macro/attribute to disable undefined behaviour sanitizer checking */
+#ifndef ATTRIBUTE_NO_UBSAN
+#if defined(__clang__) || defined(__GNUC__)
+#define ATTRIBUTE_NO_UBSAN __attribute__((no_sanitize("undefined")))
+#else
+#define ATTRIBUTE_NO_UBSAN
+#endif
+#endif
+
 typedef int jint;
 #ifdef _LP64
 typedef long jlong;

diff --git a/src/java.base/windows/native/include/jni_md.h b/src/java.base/windows/native/include/jni_md.h
@@ -32,6 +32,10 @@
 #define JNIIMPORT __declspec(dllimport)
 #define JNICALL __stdcall
 
+#ifndef ATTRIBUTE_NO_UBSAN
+#define ATTRIBUTE_NO_UBSAN
+#endif
+
 typedef int jint;
 typedef long long jlong;
 typedef signed char jbyte;

diff --git a/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.c b/src/java.desktop/share/native/libawt/java2d/loops/IntRgb.c
@@ -166,6 +166,7 @@ DEFINE_ALPHA_MASKBLIT(IntArgbPre, IntRgb, 4ByteArgb)
 
 DEFINE_ALPHA_MASKBLIT(IntRgb, IntRgb, 4ByteArgb)
 
+ATTRIBUTE_NO_UBSAN
 DEFINE_SOLID_DRAWGLYPHLISTAA(IntRgb, 3ByteRgb)
 
 DEFINE_SOLID_DRAWGLYPHLISTLCD(IntRgb, 3ByteRgb)