From b6d123f660a2fcee8e037fa56591f01b053cfad8 Mon Sep 17 00:00:00 2001 From: Igor Veresov Date: Wed, 22 Nov 2017 01:12:23 -0800 Subject: [PATCH] 8191683: Compile problem on ARM after JDK-8043070 Make nmethod::_state explicitly a signed char Reviewed-by: thartmann --- src/hotspot/share/code/nmethod.hpp | 2 +- src/hotspot/share/runtime/vmStructs.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp index 4ac6ab9226d..c2862c84a0b 100644 --- a/src/hotspot/share/code/nmethod.hpp +++ b/src/hotspot/share/code/nmethod.hpp @@ -124,7 +124,7 @@ class nmethod : public CompiledMethod { bool _unload_reported; // Protected by Patching_lock - volatile char _state; // {not_installed, in_use, not_entrant, zombie, unloaded} + volatile signed char _state; // {not_installed, in_use, not_entrant, zombie, unloaded} #ifdef ASSERT bool _oops_are_stale; // indicates that it's no longer safe to access oops section diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp index 0466f7ae7db..f1b0eac2407 100644 --- a/src/hotspot/share/runtime/vmStructs.cpp +++ b/src/hotspot/share/runtime/vmStructs.cpp @@ -830,7 +830,7 @@ typedef PaddedEnd PaddedObjectMonitor; nonstatic_field(nmethod, _osr_link, nmethod*) \ nonstatic_field(nmethod, _scavenge_root_link, nmethod*) \ nonstatic_field(nmethod, _scavenge_root_state, jbyte) \ - nonstatic_field(nmethod, _state, volatile char) \ + nonstatic_field(nmethod, _state, volatile signed char) \ nonstatic_field(nmethod, _exception_offset, int) \ nonstatic_field(nmethod, _orig_pc_offset, int) \ nonstatic_field(nmethod, _stub_offset, int) \ @@ -1350,8 +1350,8 @@ typedef PaddedEnd PaddedObjectMonitor; declare_integer_type(int) \ declare_integer_type(long) \ declare_integer_type(char) \ + declare_integer_type(volatile signed char) \ declare_unsigned_integer_type(unsigned char) \ - declare_unsigned_integer_type(volatile char) \ declare_unsigned_integer_type(u_char) \ declare_unsigned_integer_type(unsigned int) \ declare_unsigned_integer_type(uint) \