archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8256275: Optimized build is broken

Browse source 
Reviewed-by: redestad, coleenp
This commit is contained in:
Vladimir Ivanov 2020-11-13 11:07:53 +00:00
parent b0c28fadaa
commit 8c31bd2939
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hotspot/share/classfile/vmIntrinsics.cpp
View file

@ -705,7 +705,7 @@ const char* vmIntrinsics::short_name_as_C_string(vmIntrinsics::ID id, char* buf,
#define ID4(x, y, z, f) ((ID3(x, y, z) << vmIntrinsics::log2_FLAG_LIMIT) | (jlong) (f))
#ifdef ASSERT
#ifndef PRODUCT
static const jlong intrinsic_info_array[vmIntrinsics::ID_LIMIT+1] = {
#define VM_INTRINSIC_INFO(ignore_id, klass, name, sig, fcode) \
ID4(SID_ENUM(klass), SID_ENUM(name), SID_ENUM(sig), vmIntrinsics::fcode),
@ -747,4 +747,4 @@ vmIntrinsics::Flags vmIntrinsics::flags_for(vmIntrinsics::ID id) {
assert(((ID4(1021,1022,1023,15) >> shift) & mask) == 15, "");
return Flags( (info >> shift) & mask );
}
#endif // ASSERT
#endif // !PRODUCT

2
src/hotspot/share/classfile/vmIntrinsics.hpp
View file

@ -1092,7 +1092,7 @@ public:
return id;
}
#ifdef ASSERT
#ifndef PRODUCT
// Find out the symbols behind an intrinsic:
static vmSymbolID class_for(ID id);
static vmSymbolID name_for(ID id);

2
src/hotspot/share/gc/g1/g1RemSet.hpp
View file

@ -68,7 +68,7 @@ private:
void print_merge_heap_roots_stats();
void assert_scan_top_is_null(uint hrm_index) PRODUCT_RETURN;
void assert_scan_top_is_null(uint hrm_index) NOT_DEBUG_RETURN;
public:
typedef CardTable::CardValue CardValue;

2
src/hotspot/share/runtime/stackWatermark.hpp
View file

@ -101,7 +101,7 @@ protected:
void yield_processing();
static bool has_barrier(const frame& f);
void ensure_safe(const frame& f);
void assert_is_frame_safe(const frame& f) PRODUCT_RETURN;
void assert_is_frame_safe(const frame& f) NOT_DEBUG_RETURN;
bool is_frame_safe(const frame& f);
// API for consumers of the stack watermark barrier.