Skip to content

Commit f80a606

Browse files
author
Paul Hohensee
committed
8253375: OSX build fails with Xcode 12.0 (12A7209)
Replace double array with short array in AdapterHandlerLibrary::create_native_wrapper, add parens around ?: in CSystemColors:getColor Reviewed-by: prr, kbarrett, lucy
1 parent 04775f1 commit f80a606

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/hotspot/share/runtime/sharedRuntime.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2856,8 +2856,8 @@ void AdapterHandlerLibrary::create_native_wrapper(const methodHandle& method) {
28562856
BufferBlob* buf = buffer_blob(); // the temporary code buffer in CodeCache
28572857
if (buf != NULL) {
28582858
CodeBuffer buffer(buf);
2859-
double locs_buf[20];
2860-
buffer.insts()->initialize_shared_locs((relocInfo*)locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
2859+
struct { double data[20]; } locs_buf;
2860+
buffer.insts()->initialize_shared_locs((relocInfo*)&locs_buf, sizeof(locs_buf) / sizeof(relocInfo));
28612861
#if defined(AARCH64)
28622862
// On AArch64 with ZGC and nmethod entry barriers, we need all oops to be
28632863
// in the constant pool to ensure ordering between the barrier and oops

0 commit comments

Comments
 (0)