diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp --- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_ASSEMBLER_AARCH64_HPP -#define CPU_AARCH64_VM_ASSEMBLER_AARCH64_HPP +#pragma once #include "asm/register.hpp" @@ -2753,5 +2752,3 @@ class BiasedLockingCounters; extern "C" void das(uint64_t start, int len); - -#endif // CPU_AARCH64_VM_ASSEMBLER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp --- a/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp +++ b/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp @@ -23,11 +23,8 @@ * */ -#ifndef CPU_AARCH64_VM_ASSEMBLER_AARCH64_INLINE_HPP -#define CPU_AARCH64_VM_ASSEMBLER_AARCH64_INLINE_HPP +#pragma once #include "asm/assembler.inline.hpp" #include "asm/codeBuffer.hpp" #include "code/codeCache.hpp" - -#endif // CPU_AARCH64_VM_ASSEMBLER_AARCH64_INLINE_HPP diff --git a/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp b/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp --- a/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp @@ -23,9 +23,6 @@ * */ -#ifndef CPU_AARCH64_VM_BYTECODES_AARCH64_HPP -#define CPU_AARCH64_VM_BYTECODES_AARCH64_HPP +#pragma once // No aarch64 specific bytecodes - -#endif // CPU_AARCH64_VM_BYTECODES_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/bytes_aarch64.hpp b/src/hotspot/cpu/aarch64/bytes_aarch64.hpp --- a/src/hotspot/cpu/aarch64/bytes_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/bytes_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_BYTES_AARCH64_HPP -#define CPU_AARCH64_VM_BYTES_AARCH64_HPP +#pragma once #include "memory/allocation.hpp" @@ -62,5 +61,3 @@ // The following header contains the implementations of swap_u2, swap_u4, and swap_u8[_base] #include OS_CPU_HEADER_INLINE(bytes) - -#endif // CPU_AARCH64_VM_BYTES_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp --- a/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_C1_DEFS_AARCH64_HPP -#define CPU_AARCH64_VM_C1_DEFS_AARCH64_HPP +#pragma once // native word offsets from memory address (little endian) enum { @@ -77,5 +76,3 @@ enum { pd_float_saved_as_double = false }; - -#endif // CPU_AARCH64_VM_C1_DEFS_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp --- a/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp @@ -23,10 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_C1_FPUSTACKSIM_HPP -#define CPU_AARCH64_VM_C1_FPUSTACKSIM_HPP +#pragma once // No FPU stack on AARCH64 class FpuStackSim; - -#endif // CPU_AARCH64_VM_C1_FPUSTACKSIM_HPP diff --git a/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp --- a/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_C1_FRAMEMAP_AARCH64_HPP -#define CPU_AARCH64_VM_C1_FRAMEMAP_AARCH64_HPP +#pragma once // On AArch64 the frame looks as follows: // @@ -143,6 +142,3 @@ static int nof_caller_save_cpu_regs() { return pd_nof_caller_save_cpu_regs_frame_map; } static int last_cpu_reg() { return pd_last_cpu_reg; } static int last_byte_reg() { return pd_last_byte_reg; } - -#endif // CPU_AARCH64_VM_C1_FRAMEMAP_AARCH64_HPP - diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp --- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP -#define CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP +#pragma once // ArrayCopyStub needs access to bailout friend class ArrayCopyStub; @@ -80,5 +79,3 @@ void store_parameter(Register r, int offset_from_esp_in_words); void store_parameter(jint c, int offset_from_esp_in_words); void store_parameter(jobject c, int offset_from_esp_in_words); - -#endif // CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp --- a/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_C1_LINEARSCAN_HPP -#define CPU_AARCH64_VM_C1_LINEARSCAN_HPP +#pragma once inline bool LinearScan::is_processed_reg_num(int reg_num) { return reg_num <= FrameMap::last_cpu_reg() || reg_num >= pd_nof_cpu_regs_frame_map; @@ -71,6 +70,3 @@ } return false; } - - -#endif // CPU_AARCH64_VM_C1_LINEARSCAN_HPP diff --git a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp --- a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP -#define CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP +#pragma once using MacroAssembler::build_frame; using MacroAssembler::null_check; @@ -110,5 +109,3 @@ void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); } void load_parameter(int offset_in_words, Register reg); - -#endif // CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp --- a/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP -#define CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -73,5 +72,3 @@ define_pd_global(bool, OptimizeSinglePrecision, true ); define_pd_global(bool, CSEArrayLength, false); define_pd_global(bool, TwoOperandLIRForm, false ); - -#endif // CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp --- a/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_C2_GLOBALS_AARCH64_HPP -#define CPU_AARCH64_VM_C2_GLOBALS_AARCH64_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -86,5 +85,3 @@ define_pd_global(bool, NeverActAsServerClassMachine, false); define_pd_global(bool, TrapBasedRangeChecks, false); // Not needed. - -#endif // CPU_AARCH64_VM_C2_GLOBALS_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp b/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp --- a/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp @@ -23,13 +23,10 @@ * */ -#ifndef CPU_AARCH64_VM_CODEBUFFER_AARCH64_HPP -#define CPU_AARCH64_VM_CODEBUFFER_AARCH64_HPP +#pragma once private: void pd_initialize() {} public: void flush_bundle(bool start_new_bundle) {} - -#endif // CPU_AARCH64_VM_CODEBUFFER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/copy_aarch64.hpp b/src/hotspot/cpu/aarch64/copy_aarch64.hpp --- a/src/hotspot/cpu/aarch64/copy_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/copy_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_COPY_AARCH64_HPP -#define CPU_AARCH64_VM_COPY_AARCH64_HPP +#pragma once // Inline functions for memory copy and fill. @@ -55,5 +54,3 @@ static void pd_zero_to_bytes(void* to, size_t count) { (void)memset(to, 0, count); } - -#endif // CPU_AARCH64_VM_COPY_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp b/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp --- a/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp @@ -23,9 +23,6 @@ * */ -#ifndef CPU_AARCH64_VM_DEPCHECKER_AARCH64_HPP -#define CPU_AARCH64_VM_DEPCHECKER_AARCH64_HPP +#pragma once // Nothing to do on aarch64 - -#endif // CPU_AARCH64_VM_DEPCHECKER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp b/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp --- a/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_DISASSEMBLER_AARCH64_HPP -#define CPU_AARCH64_VM_DISASSEMBLER_AARCH64_HPP +#pragma once static int pd_instruction_alignment() { return 1; @@ -33,5 +32,3 @@ static const char* pd_cpu_opts() { return ""; } - -#endif // CPU_AARCH64_VM_DISASSEMBLER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.hpp --- a/src/hotspot/cpu/aarch64/frame_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/frame_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_FRAME_AARCH64_HPP -#define CPU_AARCH64_VM_FRAME_AARCH64_HPP +#pragma once #include "runtime/synchronizer.hpp" @@ -159,5 +158,3 @@ void interpreter_frame_set_last_sp(intptr_t* sp); static jint interpreter_frame_expression_stack_direction() { return -1; } - -#endif // CPU_AARCH64_VM_FRAME_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp --- a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp +++ b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_FRAME_AARCH64_INLINE_HPP -#define CPU_AARCH64_VM_FRAME_AARCH64_INLINE_HPP +#pragma once #include "code/codeCache.hpp" #include "code/vmreg.inline.hpp" @@ -249,5 +248,3 @@ *result_adr = obj; } - -#endif // CPU_AARCH64_VM_FRAME_AARCH64_INLINE_HPP diff --git a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp --- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_AARCH64_GC_G1_G1BARRIERSETASSEMBLER_AARCH64_HPP -#define CPU_AARCH64_GC_G1_G1BARRIERSETASSEMBLER_AARCH64_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/modRefBarrierSetAssembler.hpp" @@ -71,5 +70,3 @@ void load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Register dst, Address src, Register tmp1, Register tmp_thread); }; - -#endif // CPU_AARCH64_GC_G1_G1BARRIERSETASSEMBLER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp --- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_AARCH64_GC_SHARED_BARRIERSETASSEMBLER_AARCH64_HPP -#define CPU_AARCH64_GC_SHARED_BARRIERSETASSEMBLER_AARCH64_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "memory/allocation.hpp" @@ -73,5 +72,3 @@ ); virtual void barrier_stubs_init() {} }; - -#endif // CPU_AARCH64_GC_SHARED_BARRIERSETASSEMBLER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp --- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_AARCH64_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_AARCH64_HPP -#define CPU_AARCH64_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_AARCH64_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/modRefBarrierSetAssembler.hpp" @@ -38,5 +37,3 @@ Address dst, Register val, Register tmp1, Register tmp2); }; - -#endif // #ifndef CPU_AARCH64_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp --- a/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_AARCH64_GC_SHARED_MODREFBARRIERSETASSEMBLER_AARCH64_HPP -#define CPU_AARCH64_GC_SHARED_MODREFBARRIERSETASSEMBLER_AARCH64_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/barrierSetAssembler.hpp" @@ -50,5 +49,3 @@ virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Address dst, Register val, Register tmp1, Register tmp2); }; - -#endif // CPU_AARCH64_GC_SHARED_MODREFBARRIERSETASSEMBLER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp --- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp @@ -21,8 +21,7 @@ * */ -#ifndef CPU_AARCH64_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_AARCH64_HPP -#define CPU_AARCH64_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_AARCH64_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/barrierSetAssembler.hpp" @@ -98,5 +97,3 @@ virtual void barrier_stubs_init(); }; - -#endif // CPU_AARCH64_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp --- a/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP -#define CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP +#pragma once const int StackAlignmentInBytes = 16; @@ -52,5 +51,3 @@ #define SUPPORT_RESERVED_STACK_AREA #define THREAD_LOCAL_POLL - -#endif // CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/globals_aarch64.hpp b/src/hotspot/cpu/aarch64/globals_aarch64.hpp --- a/src/hotspot/cpu/aarch64/globals_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/globals_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_GLOBALS_AARCH64_HPP -#define CPU_AARCH64_VM_GLOBALS_AARCH64_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -164,6 +163,3 @@ "Value -1 means off.") \ range(-1, 4096) #endif - - -#endif // CPU_AARCH64_VM_GLOBALS_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/icache_aarch64.hpp b/src/hotspot/cpu/aarch64/icache_aarch64.hpp --- a/src/hotspot/cpu/aarch64/icache_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/icache_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_ICACHE_AARCH64_HPP -#define CPU_AARCH64_VM_ICACHE_AARCH64_HPP +#pragma once // Interface for updating the instruction cache. Whenever the VM // modifies code, part of the processor instruction cache potentially @@ -40,5 +39,3 @@ __clear_cache((char *)start, (char *)(start + nbytes)); } }; - -#endif // CPU_AARCH64_VM_ICACHE_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp --- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP -#define CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "interpreter/invocationCounter.hpp" @@ -294,5 +293,3 @@ MacroAssembler::_call_Unimplemented(call_site); } }; - -#endif // CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP diff --git a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp --- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP -#define CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP +#pragma once // This is included in the middle of class Interpreter. // Do not include files here. @@ -57,5 +56,3 @@ static Register to(); static Register temp(); }; - -#endif // CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp b/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp --- a/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_JAVAFRAMEANCHOR_AARCH64_HPP -#define CPU_AARCH64_VM_JAVAFRAMEANCHOR_AARCH64_HPP +#pragma once private: @@ -83,5 +82,3 @@ intptr_t* last_Java_fp(void) { return _last_Java_fp; } // Assert (last_Java_sp == NULL || fp == NULL) void set_last_Java_fp(intptr_t* fp) { OrderAccess::release(); _last_Java_fp = fp; } - -#endif // CPU_AARCH64_VM_JAVAFRAMEANCHOR_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp b/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp --- a/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_JNITYPES_AARCH64_HPP -#define CPU_AARCH64_VM_JNITYPES_AARCH64_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -103,5 +102,3 @@ static inline jdouble get_double(intptr_t *from) { return *(jdouble *)(from + _JNI_SLOT_OFFSET); } #undef _JNI_SLOT_OFFSET }; - -#endif // CPU_AARCH64_VM_JNITYPES_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp --- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_HPP -#define CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_HPP +#pragma once #include "asm/assembler.hpp" @@ -1390,5 +1389,3 @@ Label _after; Label _branches; }; - -#endif // CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp --- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp +++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp @@ -23,13 +23,10 @@ * */ -#ifndef CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_INLINE_HPP -#define CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_INLINE_HPP +#pragma once #include "asm/assembler.hpp" #ifndef PRODUCT #endif // ndef PRODUCT - -#endif // CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_INLINE_HPP diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp --- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP -#define CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP +#pragma once #include "asm/assembler.hpp" #include "runtime/icache.hpp" @@ -703,4 +702,3 @@ assert(nativeInstruction_at(addr)->is_Imm_LdSt(), "no immediate load/store found"); return (NativeLdSt*)addr; } -#endif // CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp b/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp --- a/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_REGISTERMAP_AARCH64_HPP -#define CPU_AARCH64_VM_REGISTERMAP_AARCH64_HPP +#pragma once // machine-dependent implemention for register maps friend class frame; @@ -41,5 +40,3 @@ void pd_clear() {} void pd_initialize() {} void pd_initialize_from(const RegisterMap* map) {} - -#endif // CPU_AARCH64_VM_REGISTERMAP_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/register_aarch64.hpp b/src/hotspot/cpu/aarch64/register_aarch64.hpp --- a/src/hotspot/cpu/aarch64/register_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/register_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_REGISTER_AARCH64_HPP -#define CPU_AARCH64_VM_REGISTER_AARCH64_HPP +#pragma once #include "asm/register.hpp" @@ -257,5 +256,3 @@ uint32_t bits() const { return _bitset; } }; - -#endif // CPU_AARCH64_VM_REGISTER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp b/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp --- a/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_RELOCINFO_AARCH64_HPP -#define CPU_AARCH64_VM_RELOCINFO_AARCH64_HPP +#pragma once // machine-dependent parts of class relocInfo private: @@ -40,5 +39,3 @@ // This platform has no oops in the code that are not also // listed in the oop section. static bool mustIterateImmediateOopsInCode() { return false; } - -#endif // CPU_AARCH64_VM_RELOCINFO_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp --- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_STUBROUTINES_AARCH64_HPP -#define CPU_AARCH64_VM_STUBROUTINES_AARCH64_HPP +#pragma once // This file holds the platform specific parts of the StubRoutines // definition. See stubRoutines.hpp for a description on how to @@ -194,5 +193,3 @@ static jdouble _dcos_coef[]; // end trigonometric tables block }; - -#endif // CPU_AARCH64_VM_STUBROUTINES_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp b/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp --- a/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_TEMPLATETABLE_AARCH64_64_HPP -#define CPU_AARCH64_VM_TEMPLATETABLE_AARCH64_64_HPP +#pragma once static void prepare_invoke(int byte_no, Register method, // linked method (or i-klass) @@ -38,5 +37,3 @@ // Helpers static void index_check(Register array, Register index); static void index_check_without_pop(Register array, Register index); - -#endif // CPU_AARCH64_VM_TEMPLATETABLE_AARCH64_64_HPP diff --git a/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp b/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp --- a/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_VMSTRUCTS_AARCH64_HPP -#define CPU_AARCH64_VM_VMSTRUCTS_AARCH64_HPP +#pragma once // These are the CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -38,5 +37,3 @@ #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // CPU_AARCH64_VM_VMSTRUCTS_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp --- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP -#define CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP +#pragma once #include "runtime/globals_extension.hpp" #include "runtime/vm_version.hpp" @@ -120,5 +119,3 @@ return (1 << ((_psr_info.ctr_el0 >> 16) & 0x0f)) * 4; } }; - -#endif // CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp b/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp --- a/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_AARCH64_VM_VM_VERSION_EXT_AARCH64_HPP -#define CPU_AARCH64_VM_VM_VERSION_EXT_AARCH64_HPP +#pragma once #include "utilities/macros.hpp" #include "vm_version_aarch64.hpp" @@ -50,5 +49,3 @@ static void initialize_cpu_information(void); }; - -#endif // CPU_AARCH64_VM_VM_VERSION_EXT_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp b/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp --- a/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_VMREG_AARCH64_HPP -#define CPU_AARCH64_VM_VMREG_AARCH64_HPP +#pragma once inline bool is_Register() { return (unsigned int) value() < (unsigned int) ConcreteRegisterImpl::max_gpr; @@ -51,5 +50,3 @@ assert(is_reg(), "must be"); return is_even(value()); } - -#endif // CPU_AARCH64_VM_VMREG_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp --- a/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp +++ b/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_AARCH64_VM_VMREG_AARCH64_INLINE_HPP -#define CPU_AARCH64_VM_VMREG_AARCH64_INLINE_HPP +#pragma once inline VMReg RegisterImpl::as_VMReg() { if( this==noreg ) return VMRegImpl::Bad(); @@ -34,5 +33,3 @@ inline VMReg FloatRegisterImpl::as_VMReg() { return VMRegImpl::as_VMReg((encoding() << 1) + ConcreteRegisterImpl::max_gpr); } - -#endif // CPU_AARCH64_VM_VMREG_AARCH64_INLINE_HPP diff --git a/src/hotspot/cpu/arm/assembler_arm.hpp b/src/hotspot/cpu/arm/assembler_arm.hpp --- a/src/hotspot/cpu/arm/assembler_arm.hpp +++ b/src/hotspot/cpu/arm/assembler_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_ASSEMBLER_ARM_HPP -#define CPU_ARM_VM_ASSEMBLER_ARM_HPP +#pragma once #include "utilities/macros.hpp" @@ -324,6 +323,3 @@ #endif #include "assembler_arm_32.hpp" - - -#endif // CPU_ARM_VM_ASSEMBLER_ARM_HPP diff --git a/src/hotspot/cpu/arm/assembler_arm.inline.hpp b/src/hotspot/cpu/arm/assembler_arm.inline.hpp --- a/src/hotspot/cpu/arm/assembler_arm.inline.hpp +++ b/src/hotspot/cpu/arm/assembler_arm.inline.hpp @@ -22,8 +22,4 @@ * */ -#ifndef CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP -#define CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP - - -#endif // CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP +#pragma once diff --git a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp --- a/src/hotspot/cpu/arm/assembler_arm_32.hpp +++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_ASSEMBLER_ARM_32_HPP -#define CPU_ARM_VM_ASSEMBLER_ARM_32_HPP +#pragma once // ARM Addressing Mode 1 - Data processing operands class AsmOperand { @@ -1248,6 +1247,3 @@ extern double __aeabi_dsub_glibc(double, double); }; #endif // __SOFTFP__ - - -#endif // CPU_ARM_VM_ASSEMBLER_ARM_32_HPP diff --git a/src/hotspot/cpu/arm/bytes_arm.hpp b/src/hotspot/cpu/arm/bytes_arm.hpp --- a/src/hotspot/cpu/arm/bytes_arm.hpp +++ b/src/hotspot/cpu/arm/bytes_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_BYTES_ARM_HPP -#define CPU_ARM_VM_BYTES_ARM_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/macros.hpp" @@ -185,5 +184,3 @@ // The following header contains the implementations of swap_u2, swap_u4, and swap_u8 #include OS_CPU_HEADER_INLINE(bytes) - -#endif // CPU_ARM_VM_BYTES_ARM_HPP diff --git a/src/hotspot/cpu/arm/c1_Defs_arm.hpp b/src/hotspot/cpu/arm/c1_Defs_arm.hpp --- a/src/hotspot/cpu/arm/c1_Defs_arm.hpp +++ b/src/hotspot/cpu/arm/c1_Defs_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_C1_DEFS_ARM_HPP -#define CPU_ARM_VM_C1_DEFS_ARM_HPP +#pragma once // native word offsets from memory address (little endian) enum { @@ -77,5 +76,3 @@ #define PATCHED_ADDR (204) #define CARDTABLEBARRIERSET_POST_BARRIER_HELPER #define GENERATE_ADDRESS_IS_PREFERRED - -#endif // CPU_ARM_VM_C1_DEFS_ARM_HPP diff --git a/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp b/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp --- a/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp +++ b/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp @@ -22,9 +22,6 @@ * */ -#ifndef CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP -#define CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP +#pragma once // Nothing needed here - -#endif // CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP diff --git a/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp b/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp --- a/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp +++ b/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP -#define CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP +#pragma once public: @@ -107,5 +106,3 @@ static int last_cpu_reg() { return pd_last_cpu_reg; } - -#endif // CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp --- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp +++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP -#define CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP +#pragma once private: @@ -64,5 +63,3 @@ void store_parameter(jint c, int offset_from_sp_in_words); void store_parameter(Metadata* m, int offset_from_sp_in_words); - -#endif // CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP diff --git a/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp b/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp --- a/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp +++ b/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP -#define CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP +#pragma once inline bool LinearScan::is_processed_reg_num(int reg_num) { return reg_num < pd_nof_cpu_regs_processed_in_linearscan || @@ -67,5 +66,3 @@ _last_reg = pd_first_cpu_reg + FrameMap::adjust_reg_range(pd_nof_cpu_regs_reg_alloc) - 1; return true; } - -#endif // CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP diff --git a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp --- a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp +++ b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP -#define CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP +#pragma once private: @@ -65,5 +64,3 @@ // This platform only uses signal-based null checks. The Label is not needed. void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); } - -#endif // CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP diff --git a/src/hotspot/cpu/arm/c1_globals_arm.hpp b/src/hotspot/cpu/arm/c1_globals_arm.hpp --- a/src/hotspot/cpu/arm/c1_globals_arm.hpp +++ b/src/hotspot/cpu/arm/c1_globals_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_C1_GLOBALS_ARM_HPP -#define CPU_ARM_VM_C1_GLOBALS_ARM_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -69,5 +68,3 @@ define_pd_global(bool, OptimizeSinglePrecision, true); define_pd_global(bool, CSEArrayLength, true); define_pd_global(bool, TwoOperandLIRForm, false); - -#endif // CPU_ARM_VM_C1_GLOBALS_ARM_HPP diff --git a/src/hotspot/cpu/arm/c2_globals_arm.hpp b/src/hotspot/cpu/arm/c2_globals_arm.hpp --- a/src/hotspot/cpu/arm/c2_globals_arm.hpp +++ b/src/hotspot/cpu/arm/c2_globals_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_C2_GLOBALS_ARM_HPP -#define CPU_ARM_VM_C2_GLOBALS_ARM_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -107,5 +106,3 @@ // Ergonomics related flags define_pd_global(bool, NeverActAsServerClassMachine, false); - -#endif // CPU_ARM_VM_C2_GLOBALS_ARM_HPP diff --git a/src/hotspot/cpu/arm/codeBuffer_arm.hpp b/src/hotspot/cpu/arm/codeBuffer_arm.hpp --- a/src/hotspot/cpu/arm/codeBuffer_arm.hpp +++ b/src/hotspot/cpu/arm/codeBuffer_arm.hpp @@ -22,13 +22,10 @@ * */ -#ifndef CPU_ARM_VM_CODEBUFFER_ARM_HPP -#define CPU_ARM_VM_CODEBUFFER_ARM_HPP +#pragma once private: void pd_initialize() {} public: void flush_bundle(bool start_new_bundle) {} - -#endif // CPU_ARM_VM_CODEBUFFER_ARM_HPP diff --git a/src/hotspot/cpu/arm/copy_arm.hpp b/src/hotspot/cpu/arm/copy_arm.hpp --- a/src/hotspot/cpu/arm/copy_arm.hpp +++ b/src/hotspot/cpu/arm/copy_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_COPY_ARM_HPP -#define CPU_ARM_VM_COPY_ARM_HPP +#pragma once #include "utilities/macros.hpp" @@ -55,5 +54,3 @@ static void pd_zero_to_bytes(void* to, size_t count) { memset(to, 0, count); } - -#endif // CPU_ARM_VM_COPY_ARM_HPP diff --git a/src/hotspot/cpu/arm/depChecker_arm.hpp b/src/hotspot/cpu/arm/depChecker_arm.hpp --- a/src/hotspot/cpu/arm/depChecker_arm.hpp +++ b/src/hotspot/cpu/arm/depChecker_arm.hpp @@ -22,9 +22,6 @@ * */ -#ifndef CPU_ARM_VM_DEPCHECKER_ARM_HPP -#define CPU_ARM_VM_DEPCHECKER_ARM_HPP +#pragma once // Nothing to do - -#endif // CPU_ARM_VM_DEPCHECKER_ARM_HPP diff --git a/src/hotspot/cpu/arm/disassembler_arm.hpp b/src/hotspot/cpu/arm/disassembler_arm.hpp --- a/src/hotspot/cpu/arm/disassembler_arm.hpp +++ b/src/hotspot/cpu/arm/disassembler_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_DISASSEMBLER_ARM_HPP -#define CPU_ARM_VM_DISASSEMBLER_ARM_HPP +#pragma once static int pd_instruction_alignment() { return sizeof(int); @@ -32,5 +31,3 @@ static const char* pd_cpu_opts() { return ""; } - -#endif // CPU_ARM_VM_DISASSEMBLER_ARM_HPP diff --git a/src/hotspot/cpu/arm/frame_arm.hpp b/src/hotspot/cpu/arm/frame_arm.hpp --- a/src/hotspot/cpu/arm/frame_arm.hpp +++ b/src/hotspot/cpu/arm/frame_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_FRAME_ARM_HPP -#define CPU_ARM_VM_FRAME_ARM_HPP +#pragma once #include "runtime/synchronizer.hpp" @@ -117,5 +116,3 @@ static void update_map_with_saved_link(RegisterMap* map, intptr_t** link_addr); static jint interpreter_frame_expression_stack_direction() { return -1; } - -#endif // CPU_ARM_VM_FRAME_ARM_HPP diff --git a/src/hotspot/cpu/arm/frame_arm.inline.hpp b/src/hotspot/cpu/arm/frame_arm.inline.hpp --- a/src/hotspot/cpu/arm/frame_arm.inline.hpp +++ b/src/hotspot/cpu/arm/frame_arm.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_FRAME_ARM_INLINE_HPP -#define CPU_ARM_VM_FRAME_ARM_INLINE_HPP +#pragma once #include "code/codeCache.hpp" #include "code/vmreg.inline.hpp" @@ -227,5 +226,3 @@ guarantee(result_adr != NULL, "bad register save location"); *result_adr = obj; } - -#endif // CPU_ARM_VM_FRAME_ARM_INLINE_HPP diff --git a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.hpp b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.hpp --- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.hpp +++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_GC_G1_G1BARRIERSETASSEMBLER_ARM_HPP -#define CPU_ARM_GC_G1_G1BARRIERSETASSEMBLER_ARM_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/modRefBarrierSetAssembler.hpp" @@ -71,5 +70,3 @@ void generate_c1_post_barrier_runtime_stub(StubAssembler* sasm); #endif }; - -#endif // CPU_ARM_GC_G1_G1BARRIERSETASSEMBLER_ARM_HPP diff --git a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.hpp b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.hpp --- a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.hpp +++ b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_GC_SHARED_BARRIERSETASSEMBLER_ARM_HPP -#define CPU_ARM_GC_SHARED_BARRIERSETASSEMBLER_ARM_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "memory/allocation.hpp" @@ -73,5 +72,3 @@ // Default implementation does not need to do anything. } }; - -#endif // CPU_ARM_GC_SHARED_BARRIERSETASSEMBLER_ARM_HPP diff --git a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp --- a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp +++ b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ARM_HPP -#define CPU_ARM_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ARM_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/modRefBarrierSetAssembler.hpp" @@ -42,5 +41,3 @@ virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Address obj, Register new_val, Register tmp1, Register tmp2, Register tmp3, bool is_null); }; - -#endif // #ifndef CPU_ARM_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ARM_HPP diff --git a/src/hotspot/cpu/arm/gc/shared/modRefBarrierSetAssembler_arm.hpp b/src/hotspot/cpu/arm/gc/shared/modRefBarrierSetAssembler_arm.hpp --- a/src/hotspot/cpu/arm/gc/shared/modRefBarrierSetAssembler_arm.hpp +++ b/src/hotspot/cpu/arm/gc/shared/modRefBarrierSetAssembler_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_GC_SHARED_MODREFBARRIERSETASSEMBLER_ARM_HPP -#define CPU_ARM_GC_SHARED_MODREFBARRIERSETASSEMBLER_ARM_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/barrierSetAssembler.hpp" @@ -50,5 +49,3 @@ virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Address obj, Register val, Register tmp1, Register tmp2, Register tmp3, bool is_null); }; - -#endif // CPU_ARM_GC_SHARED_MODREFBARRIERSETASSEMBLER_ARM_HPP diff --git a/src/hotspot/cpu/arm/globalDefinitions_arm.hpp b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp --- a/src/hotspot/cpu/arm/globalDefinitions_arm.hpp +++ b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP -#define CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP +#pragma once const int StackAlignmentInBytes = 8; @@ -58,5 +57,3 @@ #define BREAKPOINT __asm__ volatile ("bkpt") #endif #endif - -#endif // CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP diff --git a/src/hotspot/cpu/arm/globals_arm.hpp b/src/hotspot/cpu/arm/globals_arm.hpp --- a/src/hotspot/cpu/arm/globals_arm.hpp +++ b/src/hotspot/cpu/arm/globals_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_GLOBALS_ARM_HPP -#define CPU_ARM_VM_GLOBALS_ARM_HPP +#pragma once // // Sets the default values for platform dependent flags used by the runtime system. @@ -87,4 +86,3 @@ range, \ constraint, \ writeable) -#endif // CPU_ARM_VM_GLOBALS_ARM_HPP diff --git a/src/hotspot/cpu/arm/icache_arm.hpp b/src/hotspot/cpu/arm/icache_arm.hpp --- a/src/hotspot/cpu/arm/icache_arm.hpp +++ b/src/hotspot/cpu/arm/icache_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_ICACHE_ARM_HPP -#define CPU_ARM_VM_ICACHE_ARM_HPP +#pragma once // Interface for updating the instruction cache. Whenever the VM modifies // code, part of the processor instruction cache potentially has to be flushed. @@ -36,5 +35,3 @@ log2_line_size = LogBytesPerWord // log2(line_size) }; }; - -#endif // CPU_ARM_VM_ICACHE_ARM_HPP diff --git a/src/hotspot/cpu/arm/interp_masm_arm.hpp b/src/hotspot/cpu/arm/interp_masm_arm.hpp --- a/src/hotspot/cpu/arm/interp_masm_arm.hpp +++ b/src/hotspot/cpu/arm/interp_masm_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_INTERP_MASM_ARM_HPP -#define CPU_ARM_VM_INTERP_MASM_ARM_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "interpreter/invocationCounter.hpp" @@ -276,5 +275,3 @@ Register reg2 = noreg, Register reg3 = noreg); }; - -#endif // CPU_ARM_VM_INTERP_MASM_ARM_HPP diff --git a/src/hotspot/cpu/arm/interpreterRT_arm.hpp b/src/hotspot/cpu/arm/interpreterRT_arm.hpp --- a/src/hotspot/cpu/arm/interpreterRT_arm.hpp +++ b/src/hotspot/cpu/arm/interpreterRT_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_INTERPRETERRT_ARM_HPP -#define CPU_ARM_VM_INTERPRETERRT_ARM_HPP +#pragma once // native method calls @@ -59,5 +58,3 @@ // ARM provides a normalized fingerprint for native calls (to increase // sharing). See normalize_fast_native_fingerprint #define SHARING_FAST_NATIVE_FINGERPRINTS - -#endif // CPU_ARM_VM_INTERPRETERRT_ARM_HPP diff --git a/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp b/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp --- a/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp +++ b/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP -#define CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP +#pragma once private: @@ -82,5 +81,3 @@ intptr_t* last_Java_fp(void) { return _last_Java_fp; } // Assert (last_Java_sp == NULL || fp == NULL) void set_last_Java_fp(intptr_t* fp) { _last_Java_fp = fp; } - -#endif // CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP diff --git a/src/hotspot/cpu/arm/jniTypes_arm.hpp b/src/hotspot/cpu/arm/jniTypes_arm.hpp --- a/src/hotspot/cpu/arm/jniTypes_arm.hpp +++ b/src/hotspot/cpu/arm/jniTypes_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_JNITYPES_ARM_HPP -#define CPU_ARM_VM_JNITYPES_ARM_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -78,5 +77,3 @@ static inline void put_double(jdouble *from, intptr_t *to, int& pos) { put_int2r((jint *) from, to, pos); } }; - -#endif // CPU_ARM_VM_JNITYPES_ARM_HPP diff --git a/src/hotspot/cpu/arm/macroAssembler_arm.hpp b/src/hotspot/cpu/arm/macroAssembler_arm.hpp --- a/src/hotspot/cpu/arm/macroAssembler_arm.hpp +++ b/src/hotspot/cpu/arm/macroAssembler_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_MACROASSEMBLER_ARM_HPP -#define CPU_ARM_VM_MACROASSEMBLER_ARM_HPP +#pragma once #include "code/relocInfo.hpp" #include "code/relocInfo_ext.hpp" @@ -1095,6 +1094,3 @@ int _size_in_instrs; bool _enabled; }; - - -#endif // CPU_ARM_VM_MACROASSEMBLER_ARM_HPP diff --git a/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp b/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp --- a/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp +++ b/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP -#define CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP +#pragma once #include "asm/assembler.inline.hpp" #include "asm/codeBuffer.hpp" @@ -62,5 +61,3 @@ } } } - -#endif // CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP diff --git a/src/hotspot/cpu/arm/nativeInst_arm.hpp b/src/hotspot/cpu/arm/nativeInst_arm.hpp --- a/src/hotspot/cpu/arm/nativeInst_arm.hpp +++ b/src/hotspot/cpu/arm/nativeInst_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_NATIVEINST_ARM_HPP -#define CPU_ARM_VM_NATIVEINST_ARM_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "runtime/icache.hpp" @@ -31,6 +30,3 @@ #include "nativeInst_arm_32.hpp" - - -#endif // CPU_ARM_VM_NATIVEINST_ARM_HPP diff --git a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp --- a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp +++ b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_NATIVEINST_ARM_32_HPP -#define CPU_ARM_VM_NATIVEINST_ARM_32_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "code/codeCache.hpp" @@ -428,5 +427,3 @@ inline NativeCall* nativeCall_before(address return_address) { return (NativeCall *) rawNativeCall_before(return_address); } - -#endif // CPU_ARM_VM_NATIVEINST_ARM_32_HPP diff --git a/src/hotspot/cpu/arm/registerMap_arm.hpp b/src/hotspot/cpu/arm/registerMap_arm.hpp --- a/src/hotspot/cpu/arm/registerMap_arm.hpp +++ b/src/hotspot/cpu/arm/registerMap_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_REGISTERMAP_ARM_HPP -#define CPU_ARM_VM_REGISTERMAP_ARM_HPP +#pragma once // machine-dependent implemention for register maps friend class frame; @@ -40,5 +39,3 @@ void pd_clear() {} void pd_initialize() {} void pd_initialize_from(const RegisterMap* map) {} - -#endif // CPU_ARM_VM_REGISTERMAP_ARM_HPP diff --git a/src/hotspot/cpu/arm/register_arm.hpp b/src/hotspot/cpu/arm/register_arm.hpp --- a/src/hotspot/cpu/arm/register_arm.hpp +++ b/src/hotspot/cpu/arm/register_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_REGISTER_ARM_HPP -#define CPU_ARM_VM_REGISTER_ARM_HPP +#pragma once #include "asm/register.hpp" #include "vm_version_arm.hpp" @@ -435,6 +434,3 @@ #define j_rarg1 c_rarg1 #define j_rarg2 c_rarg2 #define j_rarg3 c_rarg3 - - -#endif // CPU_ARM_VM_REGISTER_ARM_HPP diff --git a/src/hotspot/cpu/arm/relocInfo_arm.hpp b/src/hotspot/cpu/arm/relocInfo_arm.hpp --- a/src/hotspot/cpu/arm/relocInfo_arm.hpp +++ b/src/hotspot/cpu/arm/relocInfo_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_RELOCINFO_ARM_HPP -#define CPU_ARM_VM_RELOCINFO_ARM_HPP +#pragma once private: @@ -37,5 +36,3 @@ // This platform has no oops in the code that are not also // listed in the oop section. static bool mustIterateImmediateOopsInCode() { return false; } - -#endif // CPU_ARM_VM_RELOCINFO_ARM_HPP diff --git a/src/hotspot/cpu/arm/stubRoutines_arm.hpp b/src/hotspot/cpu/arm/stubRoutines_arm.hpp --- a/src/hotspot/cpu/arm/stubRoutines_arm.hpp +++ b/src/hotspot/cpu/arm/stubRoutines_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_STUBROUTINES_ARM_HPP -#define CPU_ARM_VM_STUBROUTINES_ARM_HPP +#pragma once // This file holds the platform specific parts of the StubRoutines // definition. See stubRoutines.hpp for a description on how to @@ -58,6 +57,3 @@ static address atomic_load_long_entry() { return _atomic_load_long_entry; } static address atomic_store_long_entry() { return _atomic_store_long_entry; } - - -#endif // CPU_ARM_VM_STUBROUTINES_ARM_HPP diff --git a/src/hotspot/cpu/arm/templateTable_arm.hpp b/src/hotspot/cpu/arm/templateTable_arm.hpp --- a/src/hotspot/cpu/arm/templateTable_arm.hpp +++ b/src/hotspot/cpu/arm/templateTable_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_TEMPLATETABLE_ARM_HPP -#define CPU_ARM_VM_TEMPLATETABLE_ARM_HPP +#pragma once static void prepare_invoke(int byte_no, Register method, // linked method (or i-klass) @@ -58,5 +57,3 @@ static Address get_array_elem_addr_same_base(BasicType elemType, Register array, Register index, Register temp); static void jvmti_post_fast_field_mod(TosState state); - -#endif // CPU_ARM_VM_TEMPLATETABLE_ARM_HPP diff --git a/src/hotspot/cpu/arm/vmStructs_arm.hpp b/src/hotspot/cpu/arm/vmStructs_arm.hpp --- a/src/hotspot/cpu/arm/vmStructs_arm.hpp +++ b/src/hotspot/cpu/arm/vmStructs_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_VMSTRUCTS_ARM_HPP -#define CPU_ARM_VM_VMSTRUCTS_ARM_HPP +#pragma once // These are the CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -44,5 +43,3 @@ #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // CPU_ARM_VM_VMSTRUCTS_ARM_HPP diff --git a/src/hotspot/cpu/arm/vm_version_arm.hpp b/src/hotspot/cpu/arm/vm_version_arm.hpp --- a/src/hotspot/cpu/arm/vm_version_arm.hpp +++ b/src/hotspot/cpu/arm/vm_version_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_VM_VERSION_ARM_HPP -#define CPU_ARM_VM_VM_VERSION_ARM_HPP +#pragma once #include "runtime/globals_extension.hpp" #include "runtime/vm_version.hpp" @@ -105,5 +104,3 @@ friend class VM_Version_StubGenerator; }; - -#endif // CPU_ARM_VM_VM_VERSION_ARM_HPP diff --git a/src/hotspot/cpu/arm/vm_version_ext_arm.hpp b/src/hotspot/cpu/arm/vm_version_ext_arm.hpp --- a/src/hotspot/cpu/arm/vm_version_ext_arm.hpp +++ b/src/hotspot/cpu/arm/vm_version_ext_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_VM_VERSION_EXT_ARM_HPP -#define CPU_ARM_VM_VM_VERSION_EXT_ARM_HPP +#pragma once #include "utilities/macros.hpp" #include "vm_version_arm.hpp" @@ -50,5 +49,3 @@ static void initialize_cpu_information(void); }; - -#endif // CPU_ARM_VM_VM_VERSION_EXT_ARM_HPP diff --git a/src/hotspot/cpu/arm/vmreg_arm.hpp b/src/hotspot/cpu/arm/vmreg_arm.hpp --- a/src/hotspot/cpu/arm/vmreg_arm.hpp +++ b/src/hotspot/cpu/arm/vmreg_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_VMREG_ARM_HPP -#define CPU_ARM_VM_VMREG_ARM_HPP +#pragma once inline bool is_Register() { return (unsigned int) value() < (unsigned int) ConcreteRegisterImpl::max_gpr; @@ -54,5 +53,3 @@ return false; } } - -#endif // CPU_ARM_VM_VMREG_ARM_HPP diff --git a/src/hotspot/cpu/arm/vmreg_arm.inline.hpp b/src/hotspot/cpu/arm/vmreg_arm.inline.hpp --- a/src/hotspot/cpu/arm/vmreg_arm.inline.hpp +++ b/src/hotspot/cpu/arm/vmreg_arm.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ARM_VM_VMREG_ARM_INLINE_HPP -#define CPU_ARM_VM_VMREG_ARM_INLINE_HPP +#pragma once inline VMReg RegisterImpl::as_VMReg() { return VMRegImpl::as_VMReg(encoding() << ConcreteRegisterImpl::log_vmregs_per_gpr); @@ -32,4 +31,3 @@ inline VMReg FloatRegisterImpl::as_VMReg() { return VMRegImpl::as_VMReg((encoding() << ConcreteRegisterImpl::log_vmregs_per_fpr) + ConcreteRegisterImpl::max_gpr); } -#endif // CPU_ARM_VM_VMREG_ARM_INLINE_HPP diff --git a/src/hotspot/cpu/ppc/assembler_ppc.hpp b/src/hotspot/cpu/ppc/assembler_ppc.hpp --- a/src/hotspot/cpu/ppc/assembler_ppc.hpp +++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_ASSEMBLER_PPC_HPP -#define CPU_PPC_VM_ASSEMBLER_PPC_HPP +#pragma once #include "asm/register.hpp" @@ -2448,6 +2447,3 @@ void test_asm(); #endif }; - - -#endif // CPU_PPC_VM_ASSEMBLER_PPC_HPP diff --git a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp --- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp +++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP -#define CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP +#pragma once #include "asm/assembler.inline.hpp" #include "asm/codeBuffer.hpp" @@ -1126,5 +1125,3 @@ lis(d, i >> 16); ori(d, d, i & 0xFFFF); } - -#endif // CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP diff --git a/src/hotspot/cpu/ppc/bytes_ppc.hpp b/src/hotspot/cpu/ppc/bytes_ppc.hpp --- a/src/hotspot/cpu/ppc/bytes_ppc.hpp +++ b/src/hotspot/cpu/ppc/bytes_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_BYTES_PPC_HPP -#define CPU_PPC_VM_BYTES_PPC_HPP +#pragma once #include "memory/allocation.hpp" @@ -267,5 +266,3 @@ }; #include OS_CPU_HEADER_INLINE(bytes) - -#endif // CPU_PPC_VM_BYTES_PPC_HPP diff --git a/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp b/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp --- a/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp +++ b/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_C1_DEFS_PPC_HPP -#define CPU_PPC_VM_C1_DEFS_PPC_HPP +#pragma once // Native word offsets from memory address. enum { @@ -72,5 +71,3 @@ enum { pd_float_saved_as_double = true }; - -#endif // CPU_PPC_VM_C1_DEFS_PPC_HPP diff --git a/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp b/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp --- a/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp +++ b/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp @@ -23,10 +23,7 @@ * */ -#ifndef CPU_PPC_VM_C1_FPUSTACKSIM_PPC_HPP -#define CPU_PPC_VM_C1_FPUSTACKSIM_PPC_HPP +#pragma once // No FPU stack on PPC. class FpuStackSim; - -#endif // CPU_PPC_VM_C1_FPUSTACKSIM_PPC_HPP diff --git a/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp b/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp --- a/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp +++ b/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_C1_FRAMEMAP_PPC_HPP -#define CPU_PPC_VM_C1_FRAMEMAP_PPC_HPP +#pragma once public: @@ -198,5 +197,3 @@ // R16: java thread // R29: global TOC static bool reg_needs_save(Register r) { return r != R0 && r != R1 && r != R13 && r != R16 && r != R29; } - -#endif // CPU_PPC_VM_C1_FRAMEMAP_PPC_HPP diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp --- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp +++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP -#define CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP +#pragma once private: @@ -76,5 +75,3 @@ return _static_call_stub_size; } } - -#endif // CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP diff --git a/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp b/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp --- a/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp +++ b/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_C1_LINEARSCAN_PPC_HPP -#define CPU_PPC_VM_C1_LINEARSCAN_PPC_HPP +#pragma once inline bool LinearScan::is_processed_reg_num(int reg_num) { assert(FrameMap::R0_opr->cpu_regnr() == FrameMap::last_cpu_reg() + 1, "wrong assumption below"); @@ -69,5 +68,3 @@ } return false; } - -#endif // CPU_PPC_VM_C1_LINEARSCAN_PPC_HPP diff --git a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp --- a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp +++ b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_C1_MACROASSEMBLER_PPC_HPP -#define CPU_PPC_VM_C1_MACROASSEMBLER_PPC_HPP +#pragma once void pd_init() { /* nothing to do */ } @@ -89,5 +88,3 @@ void null_check(Register r, Label *Lnull = NULL); address call_c_with_frame_resize(address dest, int frame_resize); - -#endif // CPU_PPC_VM_C1_MACROASSEMBLER_PPC_HPP diff --git a/src/hotspot/cpu/ppc/c1_globals_ppc.hpp b/src/hotspot/cpu/ppc/c1_globals_ppc.hpp --- a/src/hotspot/cpu/ppc/c1_globals_ppc.hpp +++ b/src/hotspot/cpu/ppc/c1_globals_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_C1_GLOBALS_PPC_HPP -#define CPU_PPC_VM_C1_GLOBALS_PPC_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -64,5 +63,3 @@ define_pd_global(bool, OptimizeSinglePrecision, false); define_pd_global(bool, CSEArrayLength, true); define_pd_global(bool, TwoOperandLIRForm, false); - -#endif // CPU_PPC_VM_C1_GLOBALS_PPC_HPP diff --git a/src/hotspot/cpu/ppc/c2_globals_ppc.hpp b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp --- a/src/hotspot/cpu/ppc/c2_globals_ppc.hpp +++ b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_C2_GLOBALS_PPC_HPP -#define CPU_PPC_VM_C2_GLOBALS_PPC_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -100,5 +99,3 @@ // Ergonomics related flags define_pd_global(bool, NeverActAsServerClassMachine, false); - -#endif // CPU_PPC_VM_C2_GLOBALS_PPC_HPP diff --git a/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp b/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp --- a/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp +++ b/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp @@ -23,13 +23,10 @@ * */ -#ifndef CPU_PPC_VM_CODEBUFFER_PPC_HPP -#define CPU_PPC_VM_CODEBUFFER_PPC_HPP +#pragma once private: void pd_initialize() {} public: void flush_bundle(bool start_new_bundle) {} - -#endif // CPU_PPC_VM_CODEBUFFER_PPC_HPP diff --git a/src/hotspot/cpu/ppc/copy_ppc.hpp b/src/hotspot/cpu/ppc/copy_ppc.hpp --- a/src/hotspot/cpu/ppc/copy_ppc.hpp +++ b/src/hotspot/cpu/ppc/copy_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_COPY_PPC_HPP -#define CPU_PPC_VM_COPY_PPC_HPP +#pragma once #ifndef PPC64 #error "copy currently only implemented for PPC64" @@ -167,5 +166,3 @@ static void pd_zero_to_bytes(void* to, size_t count) { (void)memset(to, 0, count); } - -#endif // CPU_PPC_VM_COPY_PPC_HPP diff --git a/src/hotspot/cpu/ppc/depChecker_ppc.hpp b/src/hotspot/cpu/ppc/depChecker_ppc.hpp --- a/src/hotspot/cpu/ppc/depChecker_ppc.hpp +++ b/src/hotspot/cpu/ppc/depChecker_ppc.hpp @@ -23,9 +23,6 @@ * */ -#ifndef CPU_PPC_VM_DEPCHECKER_PPC_HPP -#define CPU_PPC_VM_DEPCHECKER_PPC_HPP +#pragma once // Nothing to do on ppc64 - -#endif // CPU_PPC_VM_DEPCHECKER_PPC_HPP diff --git a/src/hotspot/cpu/ppc/disassembler_ppc.hpp b/src/hotspot/cpu/ppc/disassembler_ppc.hpp --- a/src/hotspot/cpu/ppc/disassembler_ppc.hpp +++ b/src/hotspot/cpu/ppc/disassembler_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_DISASSEMBLER_PPC_HPP -#define CPU_PPC_VM_DISASSEMBLER_PPC_HPP +#pragma once static int pd_instruction_alignment() { return sizeof(int); @@ -33,5 +32,3 @@ static const char* pd_cpu_opts() { return "ppc64"; } - -#endif // CPU_PPC_VM_DISASSEMBLER_PPC_HPP diff --git a/src/hotspot/cpu/ppc/frame_ppc.hpp b/src/hotspot/cpu/ppc/frame_ppc.hpp --- a/src/hotspot/cpu/ppc/frame_ppc.hpp +++ b/src/hotspot/cpu/ppc/frame_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_FRAME_PPC_HPP -#define CPU_PPC_VM_FRAME_PPC_HPP +#pragma once #include "runtime/synchronizer.hpp" @@ -426,5 +425,3 @@ }; static jint interpreter_frame_expression_stack_direction() { return -1; } - -#endif // CPU_PPC_VM_FRAME_PPC_HPP diff --git a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp --- a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp +++ b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_FRAME_PPC_INLINE_HPP -#define CPU_PPC_VM_FRAME_PPC_INLINE_HPP +#pragma once #include "code/codeCache.hpp" #include "code/vmreg.inline.hpp" @@ -219,5 +218,3 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) { *((oop*)map->location(R3->as_VMReg())) = obj; } - -#endif // CPU_PPC_VM_FRAME_PPC_INLINE_HPP diff --git a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp --- a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp +++ b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_GC_G1_G1BARRIERSETASSEMBLER_PPC_HPP -#define CPU_PPC_GC_G1_G1BARRIERSETASSEMBLER_PPC_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/modRefBarrierSetAssembler.hpp" @@ -65,5 +64,3 @@ virtual void resolve_jobject(MacroAssembler* masm, Register value, Register tmp1, Register tmp2, bool needs_frame); }; - -#endif // CPU_PPC_GC_G1_G1BARRIERSETASSEMBLER_PPC_HPP diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp --- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp +++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_GC_SHARED_BARRIERSETASSEMBLER_PPC_HPP -#define CPU_PPC_GC_SHARED_BARRIERSETASSEMBLER_PPC_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "memory/allocation.hpp" @@ -51,5 +50,3 @@ virtual void barrier_stubs_init() {} }; - -#endif // CPU_PPC_GC_SHARED_BARRIERSETASSEMBLER_PPC_HPP diff --git a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp --- a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp +++ b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_PPC_HPP -#define CPU_PPC_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_PPC_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/modRefBarrierSetAssembler.hpp" @@ -42,5 +41,3 @@ Register base, RegisterOrConstant ind_or_offs, Register val, Register tmp1, Register tmp2, Register tmp3, bool needs_frame); }; - -#endif // CPU_PPC_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_PPC_HPP diff --git a/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.hpp b/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.hpp --- a/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.hpp +++ b/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_GC_SHARED_MODREFBARRIERSETASSEMBLER_PPC_HPP -#define CPU_PPC_GC_SHARED_MODREFBARRIERSETASSEMBLER_PPC_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/barrierSetAssembler.hpp" @@ -52,5 +51,3 @@ Register base, RegisterOrConstant ind_or_offs, Register val, Register tmp1, Register tmp2, Register tmp3, bool needs_frame); }; - -#endif // CPU_PPC_GC_SHARED_MODREFBARRIERSETASSEMBLER_PPC_HPP diff --git a/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp b/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp --- a/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp +++ b/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP -#define CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP +#pragma once #ifdef CC_INTERP #error "CC_INTERP is no longer supported. Removed in change 8145117." @@ -59,5 +58,3 @@ // Otherwise, we fall back to usage of the polling page in nmethods. // Define the condition to use this -XX flag. #define USE_POLL_BIT_ONLY UseSIGTRAP - -#endif // CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP diff --git a/src/hotspot/cpu/ppc/globals_ppc.hpp b/src/hotspot/cpu/ppc/globals_ppc.hpp --- a/src/hotspot/cpu/ppc/globals_ppc.hpp +++ b/src/hotspot/cpu/ppc/globals_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_GLOBALS_PPC_HPP -#define CPU_PPC_VM_GLOBALS_PPC_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -205,6 +204,4 @@ "for RTM locking") \ \ experimental(bool, UseRTMXendForLockBusy, true, \ - "Use RTM Xend instead of Xabort when lock busy") \ - -#endif // CPU_PPC_VM_GLOBALS_PPC_HPP + "Use RTM Xend instead of Xabort when lock busy") diff --git a/src/hotspot/cpu/ppc/icache_ppc.hpp b/src/hotspot/cpu/ppc/icache_ppc.hpp --- a/src/hotspot/cpu/ppc/icache_ppc.hpp +++ b/src/hotspot/cpu/ppc/icache_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_ICACHE_PPC_HPP -#define CPU_PPC_VM_ICACHE_PPC_HPP +#pragma once // Interface for updating the instruction cache. Whenever the VM modifies // code, part of the processor instruction cache potentially has to be flushed. @@ -48,5 +47,3 @@ ppc64_flush_icache(start - line_offset, (bytes + line_offset + line_size - 1) >> log2_line_size, 0); } }; - -#endif // CPU_PPC_VM_ICACHE_PPC_HPP diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp --- a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp +++ b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_INTERP_MASM_PPC_HPP -#define CPU_PPC_VM_INTERP_MASM_PPC_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "interpreter/invocationCounter.hpp" @@ -265,5 +264,3 @@ void notify_method_exit(bool is_native_method, TosState state, NotifyMethodExitMode mode, bool check_exceptions); }; - -#endif // CPU_PPC_VM_INTERP_MASM_PPC_HPP diff --git a/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp b/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp --- a/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp +++ b/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_INTERPRETERRT_PPC_HPP -#define CPU_PPC_VM_INTERPRETERRT_PPC_HPP +#pragma once // This is included in the middle of class Interpreter. // Do not include files here. @@ -56,5 +55,3 @@ // A function to get the signature. static address get_signature(JavaThread* thread, Method* method); - -#endif // CPU_PPC_VM_INTERPRETERRT_PPC_HPP diff --git a/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp b/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp --- a/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp +++ b/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP -#define CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP +#pragma once public: // Each arch must define reset, save, restore @@ -74,5 +73,3 @@ address last_Java_pc(void) { return _last_Java_pc; } void set_last_Java_sp(intptr_t* sp) { OrderAccess::release(); _last_Java_sp = sp; } - -#endif // CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP diff --git a/src/hotspot/cpu/ppc/jniTypes_ppc.hpp b/src/hotspot/cpu/ppc/jniTypes_ppc.hpp --- a/src/hotspot/cpu/ppc/jniTypes_ppc.hpp +++ b/src/hotspot/cpu/ppc/jniTypes_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_JNITYPES_PPC_HPP -#define CPU_PPC_VM_JNITYPES_PPC_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -106,5 +105,3 @@ static inline jfloat get_float (intptr_t *from) { return *(jfloat *) from; } static inline jdouble get_double(intptr_t *from) { return *(jdouble *)(from + 1); } }; - -#endif // CPU_PPC_VM_JNITYPES_PPC_HPP diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp --- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp +++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_MACROASSEMBLER_PPC_HPP -#define CPU_PPC_VM_MACROASSEMBLER_PPC_HPP +#pragma once #include "asm/assembler.hpp" #include "oops/accessDecorators.hpp" @@ -969,5 +968,3 @@ const bool* flag_addr, Label& label); ~SkipIfEqualZero(); }; - -#endif // CPU_PPC_VM_MACROASSEMBLER_PPC_HPP diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp --- a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp +++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP -#define CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP +#pragma once #include "asm/assembler.inline.hpp" #include "asm/macroAssembler.hpp" @@ -479,5 +478,3 @@ #else inline address MacroAssembler::function_entry() { return emit_fd(); } #endif - -#endif // CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP diff --git a/src/hotspot/cpu/ppc/nativeInst_ppc.hpp b/src/hotspot/cpu/ppc/nativeInst_ppc.hpp --- a/src/hotspot/cpu/ppc/nativeInst_ppc.hpp +++ b/src/hotspot/cpu/ppc/nativeInst_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_NATIVEINST_PPC_HPP -#define CPU_PPC_VM_NATIVEINST_PPC_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "runtime/icache.hpp" @@ -502,5 +501,3 @@ return test; } }; - -#endif // CPU_PPC_VM_NATIVEINST_PPC_HPP diff --git a/src/hotspot/cpu/ppc/registerMap_ppc.hpp b/src/hotspot/cpu/ppc/registerMap_ppc.hpp --- a/src/hotspot/cpu/ppc/registerMap_ppc.hpp +++ b/src/hotspot/cpu/ppc/registerMap_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_REGISTERMAP_PPC_HPP -#define CPU_PPC_VM_REGISTERMAP_PPC_HPP +#pragma once // machine-dependent implemention for register maps friend class frame; @@ -41,5 +40,3 @@ void pd_clear() {} void pd_initialize() {} void pd_initialize_from(const RegisterMap* map) {} - -#endif // CPU_PPC_VM_REGISTERMAP_PPC_HPP diff --git a/src/hotspot/cpu/ppc/register_ppc.hpp b/src/hotspot/cpu/ppc/register_ppc.hpp --- a/src/hotspot/cpu/ppc/register_ppc.hpp +++ b/src/hotspot/cpu/ppc/register_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_REGISTER_PPC_HPP -#define CPU_PPC_VM_REGISTER_PPC_HPP +#pragma once #include "asm/register.hpp" @@ -817,5 +816,3 @@ #define R11_scratch1 AS_REGISTER(Register, R11) #define R12_scratch2 AS_REGISTER(Register, R12) #endif - -#endif // CPU_PPC_VM_REGISTER_PPC_HPP diff --git a/src/hotspot/cpu/ppc/relocInfo_ppc.hpp b/src/hotspot/cpu/ppc/relocInfo_ppc.hpp --- a/src/hotspot/cpu/ppc/relocInfo_ppc.hpp +++ b/src/hotspot/cpu/ppc/relocInfo_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_RELOCINFO_PPC_HPP -#define CPU_PPC_VM_RELOCINFO_PPC_HPP +#pragma once // machine-dependent parts of class relocInfo private: @@ -48,5 +47,3 @@ // This platform has no oops in the code that are not also // listed in the oop section. static bool mustIterateImmediateOopsInCode() { return false; } - -#endif // CPU_PPC_VM_RELOCINFO_PPC_HPP diff --git a/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp b/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp --- a/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp +++ b/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_STUBROUTINES_PPC_HPP -#define CPU_PPC_VM_STUBROUTINES_PPC_HPP +#pragma once // This file holds the platform specific parts of the StubRoutines // definition. See stubRoutines.hpp for a description on how to @@ -71,5 +70,3 @@ static juint* generate_crc_constants(juint reverse_poly); static juint* generate_crc_barret_constants(juint reverse_poly); }; - -#endif // CPU_PPC_VM_STUBROUTINES_PPC_HPP diff --git a/src/hotspot/cpu/ppc/templateTable_ppc.hpp b/src/hotspot/cpu/ppc/templateTable_ppc.hpp --- a/src/hotspot/cpu/ppc/templateTable_ppc.hpp +++ b/src/hotspot/cpu/ppc/templateTable_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_TEMPLATETABLE_PPC_HPP -#define CPU_PPC_VM_TEMPLATETABLE_PPC_HPP +#pragma once static void prepare_invoke(int byte_no, Register Rmethod, Register Rret_addr, Register Rindex, Register Rrecv, Register Rflags, Register Rscratch); static void invokevfinal_helper(Register Rmethod, Register Rflags, Register Rscratch1, Register Rscratch2); @@ -34,5 +33,3 @@ // Branch_conditional which takes TemplateTable::Condition. static void branch_conditional(ConditionRegister crx, TemplateTable::Condition cc, Label& L, bool invert = false); static void if_cmp_common(Register Rfirst, Register Rsecond, Register Rscratch1, Register Rscratch2, Condition cc, bool is_jint, bool cmp0); - -#endif // CPU_PPC_VM_TEMPLATETABLE_PPC_HPP diff --git a/src/hotspot/cpu/ppc/vmStructs_ppc.hpp b/src/hotspot/cpu/ppc/vmStructs_ppc.hpp --- a/src/hotspot/cpu/ppc/vmStructs_ppc.hpp +++ b/src/hotspot/cpu/ppc/vmStructs_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_VMSTRUCTS_PPC_HPP -#define CPU_PPC_VM_VMSTRUCTS_PPC_HPP +#pragma once // These are the CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -37,5 +36,3 @@ #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // CPU_PPC_VM_VMSTRUCTS_PPC_HPP diff --git a/src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp b/src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp --- a/src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp +++ b/src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_PPC_VM_VM_VERSION_EXT_PPC_HPP -#define CPU_PPC_VM_VM_VERSION_EXT_PPC_HPP +#pragma once #include "utilities/macros.hpp" #include "vm_version_ppc.hpp" @@ -58,5 +57,3 @@ static const char* cpu_name(void); static const char* cpu_description(void); }; - -#endif // CPU_PPC_VM_VM_VERSION_EXT_PPC_HPP diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.hpp b/src/hotspot/cpu/ppc/vm_version_ppc.hpp --- a/src/hotspot/cpu/ppc/vm_version_ppc.hpp +++ b/src/hotspot/cpu/ppc/vm_version_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_VM_VERSION_PPC_HPP -#define CPU_PPC_VM_VM_VERSION_PPC_HPP +#pragma once #include "runtime/globals_extension.hpp" #include "runtime/vm_version.hpp" @@ -122,5 +121,3 @@ // POWER 8: DSCR current value. static uint64_t _dscr_val; }; - -#endif // CPU_PPC_VM_VM_VERSION_PPC_HPP diff --git a/src/hotspot/cpu/ppc/vmreg_ppc.hpp b/src/hotspot/cpu/ppc/vmreg_ppc.hpp --- a/src/hotspot/cpu/ppc/vmreg_ppc.hpp +++ b/src/hotspot/cpu/ppc/vmreg_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_VMREG_PPC_HPP -#define CPU_PPC_VM_VMREG_PPC_HPP +#pragma once inline bool is_Register() { return (unsigned int)value() < (unsigned int)ConcreteRegisterImpl::max_gpr; @@ -49,5 +48,3 @@ assert(is_reg(), "must be"); return is_even(value()); } - -#endif // CPU_PPC_VM_VMREG_PPC_HPP diff --git a/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp b/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp --- a/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp +++ b/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_PPC_VM_VMREG_PPC_INLINE_HPP -#define CPU_PPC_VM_VMREG_PPC_INLINE_HPP +#pragma once inline VMReg RegisterImpl::as_VMReg() { if (this == noreg) return VMRegImpl::Bad(); @@ -48,6 +47,3 @@ inline VMReg SpecialRegisterImpl::as_VMReg() { return VMRegImpl::as_VMReg((encoding()) + ConcreteRegisterImpl::max_cnd); } - - -#endif // CPU_PPC_VM_VMREG_PPC_INLINE_HPP diff --git a/src/hotspot/cpu/s390/assembler_s390.hpp b/src/hotspot/cpu/s390/assembler_s390.hpp --- a/src/hotspot/cpu/s390/assembler_s390.hpp +++ b/src/hotspot/cpu/s390/assembler_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_ASSEMBLER_S390_HPP -#define CPU_S390_VM_ASSEMBLER_S390_HPP +#pragma once #undef LUCY_DBG @@ -3283,5 +3282,3 @@ Assembler(CodeBuffer* code) : AbstractAssembler(code) { } }; - -#endif // CPU_S390_VM_ASSEMBLER_S390_HPP diff --git a/src/hotspot/cpu/s390/assembler_s390.inline.hpp b/src/hotspot/cpu/s390/assembler_s390.inline.hpp --- a/src/hotspot/cpu/s390/assembler_s390.inline.hpp +++ b/src/hotspot/cpu/s390/assembler_s390.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP -#define CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP +#pragma once #include "asm/assembler.inline.hpp" #include "asm/codeBuffer.hpp" @@ -1459,5 +1458,3 @@ inline bool Assembler::is_sigtrap_zero_check(address pc) { return (is_equal(pc, CGIT_ZOPC, RIE_MASK) || is_equal(pc, CIT_ZOPC, RIE_MASK)); } - -#endif // CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP diff --git a/src/hotspot/cpu/s390/bytes_s390.hpp b/src/hotspot/cpu/s390/bytes_s390.hpp --- a/src/hotspot/cpu/s390/bytes_s390.hpp +++ b/src/hotspot/cpu/s390/bytes_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_BYTES_S390_HPP -#define CPU_S390_VM_BYTES_S390_HPP +#pragma once #include "memory/allocation.hpp" @@ -62,5 +61,3 @@ static inline void put_Java_u4(address p, u4 x) { put_native_u4(p, x); } static inline void put_Java_u8(address p, u8 x) { put_native_u8(p, x); } }; - -#endif // CPU_S390_VM_BYTES_S390_HPP diff --git a/src/hotspot/cpu/s390/c1_Defs_s390.hpp b/src/hotspot/cpu/s390/c1_Defs_s390.hpp --- a/src/hotspot/cpu/s390/c1_Defs_s390.hpp +++ b/src/hotspot/cpu/s390/c1_Defs_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_C1_DEFS_S390_HPP -#define CPU_S390_VM_C1_DEFS_S390_HPP +#pragma once // Native word offsets from memory address (big endian). enum { @@ -67,5 +66,3 @@ enum { pd_float_saved_as_double = false }; - -#endif // CPU_S390_VM_C1_DEFS_S390_HPP diff --git a/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp b/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp --- a/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp +++ b/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp @@ -23,10 +23,7 @@ * */ -#ifndef CPU_S390_VM_C1_FPUSTACKSIM_S390_HPP -#define CPU_S390_VM_C1_FPUSTACKSIM_S390_HPP +#pragma once // No FPU stack on ZARCH_64 class FpuStackSim; - -#endif // CPU_S390_VM_C1_FPUSTACKSIM_S390_HPP diff --git a/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp b/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp --- a/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp +++ b/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_C1_FRAMEMAP_S390_HPP -#define CPU_S390_VM_C1_FRAMEMAP_S390_HPP +#pragma once public: @@ -137,5 +136,3 @@ static int nof_caller_save_cpu_regs() { return pd_nof_caller_save_cpu_regs_frame_map; } static int last_cpu_reg() { return pd_last_cpu_reg; } - -#endif // CPU_S390_VM_C1_FRAMEMAP_S390_HPP diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp --- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp +++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP -#define CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP +#pragma once private: @@ -51,5 +50,3 @@ _exception_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(128), _deopt_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(64) }; - -#endif // CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP diff --git a/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp b/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp --- a/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp +++ b/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_C1_LINEARSCAN_S390_HPP -#define CPU_S390_VM_C1_LINEARSCAN_S390_HPP +#pragma once inline bool LinearScan::is_processed_reg_num(int reg_num) { // unallocated: Z_thread, Z_fp, Z_SP, Z_R0_scratch, Z_R1_scratch, Z_R14 @@ -60,5 +59,3 @@ inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur) { return false; // No special case behaviours. } - -#endif // CPU_S390_VM_C1_LINEARSCAN_S390_HPP diff --git a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp --- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp +++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP -#define CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP +#pragma once void pd_init() { /* nothing to do */ } @@ -97,5 +96,3 @@ // This platform only uses signal-based null checks. The Label is not needed. void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); } - -#endif // CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP diff --git a/src/hotspot/cpu/s390/c1_globals_s390.hpp b/src/hotspot/cpu/s390/c1_globals_s390.hpp --- a/src/hotspot/cpu/s390/c1_globals_s390.hpp +++ b/src/hotspot/cpu/s390/c1_globals_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_C1_GLOBALS_S390_HPP -#define CPU_S390_VM_C1_GLOBALS_S390_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -69,5 +68,3 @@ define_pd_global(bool, OptimizeSinglePrecision, false); define_pd_global(bool, CSEArrayLength, true); define_pd_global(bool, TwoOperandLIRForm, true); - -#endif // CPU_S390_VM_C1_GLOBALS_S390_HPP diff --git a/src/hotspot/cpu/s390/c2_globals_s390.hpp b/src/hotspot/cpu/s390/c2_globals_s390.hpp --- a/src/hotspot/cpu/s390/c2_globals_s390.hpp +++ b/src/hotspot/cpu/s390/c2_globals_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_C2_GLOBALS_S390_HPP -#define CPU_S390_VM_C2_GLOBALS_S390_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -90,5 +89,3 @@ // Ergonomics related flags define_pd_global(bool, NeverActAsServerClassMachine, false); - -#endif // CPU_S390_VM_C2_GLOBALS_S390_HPP diff --git a/src/hotspot/cpu/s390/codeBuffer_s390.hpp b/src/hotspot/cpu/s390/codeBuffer_s390.hpp --- a/src/hotspot/cpu/s390/codeBuffer_s390.hpp +++ b/src/hotspot/cpu/s390/codeBuffer_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_CODEBUFFER_S390_HPP -#define CPU_S390_VM_CODEBUFFER_S390_HPP +#pragma once private: void pd_initialize() {} @@ -33,7 +32,3 @@ void flush_bundle(bool start_new_bundle) {} void getCpuData(const CodeBuffer * const cb) {} - -#endif // CPU_S390_VM_CODEBUFFER_S390_HPP - - diff --git a/src/hotspot/cpu/s390/copy_s390.hpp b/src/hotspot/cpu/s390/copy_s390.hpp --- a/src/hotspot/cpu/s390/copy_s390.hpp +++ b/src/hotspot/cpu/s390/copy_s390.hpp @@ -25,8 +25,7 @@ // Major contributions by LS -#ifndef CPU_S390_VM_COPY_S390_HPP -#define CPU_S390_VM_COPY_S390_HPP +#pragma once // Inline functions for memory copy and fill. @@ -1130,5 +1129,3 @@ (void)memset(to, 0, count); #endif } - -#endif // CPU_S390_VM_COPY_S390_HPP diff --git a/src/hotspot/cpu/s390/depChecker_s390.hpp b/src/hotspot/cpu/s390/depChecker_s390.hpp --- a/src/hotspot/cpu/s390/depChecker_s390.hpp +++ b/src/hotspot/cpu/s390/depChecker_s390.hpp @@ -23,9 +23,6 @@ * */ -#ifndef CPU_S390_VM_DEPCHECKER_S390_HPP -#define CPU_S390_VM_DEPCHECKER_S390_HPP +#pragma once // Nothing to do on z/Architecture - -#endif // CPU_S390_VM_DEPCHECKER_S390_HPP diff --git a/src/hotspot/cpu/s390/disassembler_s390.hpp b/src/hotspot/cpu/s390/disassembler_s390.hpp --- a/src/hotspot/cpu/s390/disassembler_s390.hpp +++ b/src/hotspot/cpu/s390/disassembler_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_DISASSEMBLER_S390_HPP -#define CPU_S390_VM_DISASSEMBLER_S390_HPP +#pragma once static int pd_instruction_alignment() { return 1; @@ -33,5 +32,3 @@ static const char* pd_cpu_opts() { return "zarch"; } - -#endif // CPU_S390_VM_DISASSEMBLER_S390_HPP diff --git a/src/hotspot/cpu/s390/frame_s390.hpp b/src/hotspot/cpu/s390/frame_s390.hpp --- a/src/hotspot/cpu/s390/frame_s390.hpp +++ b/src/hotspot/cpu/s390/frame_s390.hpp @@ -25,8 +25,7 @@ // Major contributions by ML, AHa. -#ifndef CPU_S390_VM_FRAME_S390_HPP -#define CPU_S390_VM_FRAME_S390_HPP +#pragma once #include "runtime/synchronizer.hpp" @@ -553,5 +552,3 @@ }; static jint interpreter_frame_expression_stack_direction() { return -1; } - -#endif // CPU_S390_VM_FRAME_S390_HPP diff --git a/src/hotspot/cpu/s390/frame_s390.inline.hpp b/src/hotspot/cpu/s390/frame_s390.inline.hpp --- a/src/hotspot/cpu/s390/frame_s390.inline.hpp +++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_FRAME_S390_INLINE_HPP -#define CPU_S390_VM_FRAME_S390_INLINE_HPP +#pragma once #include "code/codeCache.hpp" #include "code/vmreg.inline.hpp" @@ -295,5 +294,3 @@ inline intptr_t* frame::real_fp() const { return fp(); } - -#endif // CPU_S390_VM_FRAME_S390_INLINE_HPP diff --git a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.hpp b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.hpp --- a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.hpp +++ b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_GC_G1_G1BARRIERSETASSEMBLER_S390_HPP -#define CPU_S390_GC_G1_G1BARRIERSETASSEMBLER_S390_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/modRefBarrierSetAssembler.hpp" @@ -69,5 +68,3 @@ virtual void resolve_jobject(MacroAssembler* masm, Register value, Register tmp1, Register tmp2); }; - -#endif // CPU_S390_GC_G1_G1BARRIERSETASSEMBLER_S390_HPP diff --git a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp --- a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp +++ b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_GC_SHARED_BARRIERSETASSEMBLER_S390_HPP -#define CPU_S390_GC_SHARED_BARRIERSETASSEMBLER_S390_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "memory/allocation.hpp" @@ -48,5 +47,3 @@ virtual void barrier_stubs_init() {} }; - -#endif // CPU_S390_GC_SHARED_BARRIERSETASSEMBLER_S390_HPP diff --git a/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.hpp b/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.hpp --- a/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.hpp +++ b/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_S390_HPP -#define CPU_S390_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_S390_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/modRefBarrierSetAssembler.hpp" @@ -39,5 +38,3 @@ virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, const Address& dst, Register val, Register tmp1, Register tmp2, Register tmp3); }; - -#endif // CPU_S390_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_S390_HPP diff --git a/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.hpp b/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.hpp --- a/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.hpp +++ b/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_GC_SHARED_MODREFBARRIERSETASSEMBLER_S390_HPP -#define CPU_S390_GC_SHARED_MODREFBARRIERSETASSEMBLER_S390_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/barrierSetAssembler.hpp" @@ -49,5 +48,3 @@ virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, const Address& dst, Register val, Register tmp1, Register tmp2, Register tmp3); }; - -#endif // CPU_S390_GC_SHARED_MODREFBARRIERSETASSEMBLER_S390_HPP diff --git a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp --- a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp +++ b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP -#define CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP +#pragma once #ifdef CC_INTERP #error "CC_INTERP is not supported on z/Architecture." @@ -55,5 +54,3 @@ #define SUPPORT_RESERVED_STACK_AREA #define THREAD_LOCAL_POLL - -#endif // CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP diff --git a/src/hotspot/cpu/s390/globals_s390.hpp b/src/hotspot/cpu/s390/globals_s390.hpp --- a/src/hotspot/cpu/s390/globals_s390.hpp +++ b/src/hotspot/cpu/s390/globals_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_GLOBALS_S390_HPP -#define CPU_S390_VM_GLOBALS_S390_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -127,5 +126,3 @@ \ product(bool, TraceTraps, false, "Trace all traps the signal handler" \ "handles.") - -#endif // CPU_S390_VM_GLOBALS_S390_HPP diff --git a/src/hotspot/cpu/s390/icache_s390.hpp b/src/hotspot/cpu/s390/icache_s390.hpp --- a/src/hotspot/cpu/s390/icache_s390.hpp +++ b/src/hotspot/cpu/s390/icache_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_ICACHE_S390_HPP -#define CPU_S390_VM_ICACHE_S390_HPP +#pragma once // Interface for updating the instruction cache. Whenever the VM modifies // code, part of the processor instruction cache potentially has to be flushed. @@ -40,5 +39,3 @@ // Use default implementation. }; - -#endif // CPU_S390_VM_ICACHE_S390_HPP diff --git a/src/hotspot/cpu/s390/interp_masm_s390.hpp b/src/hotspot/cpu/s390/interp_masm_s390.hpp --- a/src/hotspot/cpu/s390/interp_masm_s390.hpp +++ b/src/hotspot/cpu/s390/interp_masm_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_INTERP_MASM_ZARCH_64_64_HPP -#define CPU_S390_VM_INTERP_MASM_ZARCH_64_64_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "interpreter/invocationCounter.hpp" @@ -329,5 +328,3 @@ // The return pc is loaded into the Register return_pc. void pop_interpreter_frame(Register return_pc, Register tmp1, Register tmp2); }; - -#endif // CPU_S390_VM_INTERP_MASM_ZARCH_64_64_HPP diff --git a/src/hotspot/cpu/s390/interpreterRT_s390.hpp b/src/hotspot/cpu/s390/interpreterRT_s390.hpp --- a/src/hotspot/cpu/s390/interpreterRT_s390.hpp +++ b/src/hotspot/cpu/s390/interpreterRT_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_INTERPRETERRT_S390_HPP -#define CPU_S390_VM_INTERPRETERRT_S390_HPP +#pragma once // This is included in the middle of class Interpreter. // Do not include files here. @@ -61,5 +60,3 @@ static address get_result_handler(JavaThread* thread, Method* method); static address get_signature(JavaThread* thread, Method* method); - -#endif // CPU_S390_VM_INTERPRETERRT_S390_HPP diff --git a/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp b/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp --- a/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp +++ b/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_JAVAFRAMEANCHOR_S390_HPP -#define CPU_S390_VM_JAVAFRAMEANCHOR_S390_HPP +#pragma once public: @@ -83,5 +82,3 @@ void set_last_Java_sp(intptr_t* sp) { OrderAccess::release(); _last_Java_sp = sp; } address last_Java_pc(void) { return _last_Java_pc; } - -#endif // CPU_S390_VM_JAVAFRAMEANCHOR_S390_HPP diff --git a/src/hotspot/cpu/s390/jniTypes_s390.hpp b/src/hotspot/cpu/s390/jniTypes_s390.hpp --- a/src/hotspot/cpu/s390/jniTypes_s390.hpp +++ b/src/hotspot/cpu/s390/jniTypes_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_JNITYPES_S390_HPP -#define CPU_S390_VM_JNITYPES_S390_HPP +#pragma once // This file holds platform-dependent routines used to write primitive // jni types to the array of arguments passed into JavaCalls::call. @@ -137,5 +136,3 @@ return *(jdouble*) (from + 1); } }; - -#endif // CPU_S390_VM_JNITYPES_S390_HPP diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.hpp b/src/hotspot/cpu/s390/macroAssembler_s390.hpp --- a/src/hotspot/cpu/s390/macroAssembler_s390.hpp +++ b/src/hotspot/cpu/s390/macroAssembler_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_MACROASSEMBLER_S390_HPP -#define CPU_S390_VM_MACROASSEMBLER_S390_HPP +#pragma once #include "asm/assembler.hpp" #include "oops/accessDecorators.hpp" @@ -1106,5 +1105,3 @@ // Return false (e.g. important for our impl. of virtual calls). inline bool AbstractAssembler::pd_check_instruction_mark() { return false; } #endif - -#endif // CPU_S390_VM_MACROASSEMBLER_S390_HPP diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp b/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp --- a/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp +++ b/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_MACROASSEMBLER_S390_INLINE_HPP -#define CPU_S390_VM_MACROASSEMBLER_S390_INLINE_HPP +#pragma once #include "asm/assembler.inline.hpp" #include "asm/macroAssembler.hpp" @@ -310,5 +309,3 @@ inline void MacroAssembler::set_top_ijava_frame_at_SP_as_last_Java_frame_static(Register sp, Register tmp1) { set_top_ijava_frame_at_SP_as_last_Java_frame(sp, tmp1, true); } - -#endif // CPU_S390_VM_MACROASSEMBLER_S390_INLINE_HPP diff --git a/src/hotspot/cpu/s390/nativeInst_s390.hpp b/src/hotspot/cpu/s390/nativeInst_s390.hpp --- a/src/hotspot/cpu/s390/nativeInst_s390.hpp +++ b/src/hotspot/cpu/s390/nativeInst_s390.hpp @@ -25,8 +25,7 @@ // Major contributions by AHa, JL, LS -#ifndef CPU_S390_VM_NATIVEINST_S390_HPP -#define CPU_S390_VM_NATIVEINST_S390_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "runtime/icache.hpp" @@ -662,5 +661,3 @@ void verify() PRODUCT_RETURN; }; - -#endif // CPU_S390_VM_NATIVEINST_S390_HPP diff --git a/src/hotspot/cpu/s390/registerMap_s390.hpp b/src/hotspot/cpu/s390/registerMap_s390.hpp --- a/src/hotspot/cpu/s390/registerMap_s390.hpp +++ b/src/hotspot/cpu/s390/registerMap_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_REGISTERMAP_S390_HPP -#define CPU_S390_VM_REGISTERMAP_S390_HPP +#pragma once // Machine-dependent implementation for register maps. @@ -40,5 +39,3 @@ void pd_clear() {} void pd_initialize() {} void pd_initialize_from(const RegisterMap* map) {} - -#endif // CPU_S390_VM_REGISTERMAP_S390_HPP diff --git a/src/hotspot/cpu/s390/registerSaver_s390.hpp b/src/hotspot/cpu/s390/registerSaver_s390.hpp --- a/src/hotspot/cpu/s390/registerSaver_s390.hpp +++ b/src/hotspot/cpu/s390/registerSaver_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_REGISTERSAVER_S390_HPP -#define CPU_S390_VM_REGISTERSAVER_S390_HPP +#pragma once class RegisterSaver { // Used for saving volatile registers. @@ -78,5 +77,3 @@ } LiveRegType; }; - -#endif // CPU_S390_VM_REGISTERSAVER_S390_HPP diff --git a/src/hotspot/cpu/s390/register_s390.hpp b/src/hotspot/cpu/s390/register_s390.hpp --- a/src/hotspot/cpu/s390/register_s390.hpp +++ b/src/hotspot/cpu/s390/register_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_REGISTER_S390_HPP -#define CPU_S390_VM_REGISTER_S390_HPP +#pragma once #include "asm/register.hpp" #include "vm_version_s390.hpp" @@ -577,6 +576,3 @@ #define Z_R1_scratch AS_REGISTER(Register, Z_R1) #define Z_fscratch_1 AS_REGISTER(FloatRegister, Z_F1) #endif - - -#endif // CPU_S390_VM_REGISTER_S390_HPP diff --git a/src/hotspot/cpu/s390/relocInfo_s390.hpp b/src/hotspot/cpu/s390/relocInfo_s390.hpp --- a/src/hotspot/cpu/s390/relocInfo_s390.hpp +++ b/src/hotspot/cpu/s390/relocInfo_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_RELOCINFO_S390_HPP -#define CPU_S390_VM_RELOCINFO_S390_HPP +#pragma once //---------------------------- // relocInfo layout @@ -117,5 +116,3 @@ // Store the new target address into an oop_Relocation cell, if any. // Return indication if update happened. static bool update_oop_pool(address begin, address end, address newTarget, CodeBlob* cb); - -#endif // CPU_S390_VM_RELOCINFO_S390_HPP diff --git a/src/hotspot/cpu/s390/stubRoutines_s390.hpp b/src/hotspot/cpu/s390/stubRoutines_s390.hpp --- a/src/hotspot/cpu/s390/stubRoutines_s390.hpp +++ b/src/hotspot/cpu/s390/stubRoutines_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_STUBROUTINES_ZARCH_64_64_HPP -#define CPU_S390_VM_STUBROUTINES_ZARCH_64_64_HPP +#pragma once // This file holds the platform specific parts of the StubRoutines // definition. See stubRoutines.hpp for a description on how to extend it. @@ -99,5 +98,3 @@ // Comapct string intrinsics: Translate table for string inflate intrinsic. Used by trot instruction. static void generate_load_trot_table_addr(MacroAssembler* masm, Register table); }; - -#endif // CPU_S390_VM_STUBROUTINES_ZARCH_64_64_HPP diff --git a/src/hotspot/cpu/s390/templateTable_s390.hpp b/src/hotspot/cpu/s390/templateTable_s390.hpp --- a/src/hotspot/cpu/s390/templateTable_s390.hpp +++ b/src/hotspot/cpu/s390/templateTable_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_TEMPLATETABLE_S390_HPP -#define CPU_S390_VM_TEMPLATETABLE_S390_HPP +#pragma once static void prepare_invoke(int byte_no, Register method, // linked method (or i-klass) @@ -37,5 +36,3 @@ // Helpers static void index_check(Register array, Register index, unsigned int shift); static void index_check_without_pop(Register array, Register index); - -#endif // CPU_S390_VM_TEMPLATETABLE_S390_HPP diff --git a/src/hotspot/cpu/s390/vmStructs_s390.hpp b/src/hotspot/cpu/s390/vmStructs_s390.hpp --- a/src/hotspot/cpu/s390/vmStructs_s390.hpp +++ b/src/hotspot/cpu/s390/vmStructs_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_VMSTRUCTS_S390_HPP -#define CPU_S390_VM_VMSTRUCTS_S390_HPP +#pragma once // These are the CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -37,5 +36,3 @@ #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // CPU_S390_VM_VMSTRUCTS_S390_HPP diff --git a/src/hotspot/cpu/s390/vm_version_ext_s390.hpp b/src/hotspot/cpu/s390/vm_version_ext_s390.hpp --- a/src/hotspot/cpu/s390/vm_version_ext_s390.hpp +++ b/src/hotspot/cpu/s390/vm_version_ext_s390.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_S390_VM_VM_VERSION_EXT_S390_HPP -#define CPU_S390_VM_VM_VERSION_EXT_S390_HPP +#pragma once #include "utilities/macros.hpp" #include "vm_version_s390.hpp" @@ -58,5 +57,3 @@ static const char* cpu_name(void); static const char* cpu_description(void); }; - -#endif // CPU_S390_VM_VM_VERSION_EXT_S390_HPP diff --git a/src/hotspot/cpu/s390/vm_version_s390.hpp b/src/hotspot/cpu/s390/vm_version_s390.hpp --- a/src/hotspot/cpu/s390/vm_version_s390.hpp +++ b/src/hotspot/cpu/s390/vm_version_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_VM_VERSION_S390_HPP -#define CPU_S390_VM_VM_VERSION_S390_HPP +#pragma once #include "runtime/globals_extension.hpp" @@ -486,5 +485,3 @@ static unsigned long z_SIGILL(); static unsigned long z_SIGSEGV(); }; - -#endif // CPU_S390_VM_VM_VERSION_S390_HPP diff --git a/src/hotspot/cpu/s390/vmreg_s390.hpp b/src/hotspot/cpu/s390/vmreg_s390.hpp --- a/src/hotspot/cpu/s390/vmreg_s390.hpp +++ b/src/hotspot/cpu/s390/vmreg_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_VMREG_S390_HPP -#define CPU_S390_VM_VMREG_S390_HPP +#pragma once inline bool is_Register() { return (unsigned int)value() < (unsigned int)ConcreteRegisterImpl::max_gpr; @@ -49,5 +48,3 @@ assert(is_reg(), "must be"); return is_even(value()); } - -#endif // CPU_S390_VM_VMREG_S390_HPP diff --git a/src/hotspot/cpu/s390/vmreg_s390.inline.hpp b/src/hotspot/cpu/s390/vmreg_s390.inline.hpp --- a/src/hotspot/cpu/s390/vmreg_s390.inline.hpp +++ b/src/hotspot/cpu/s390/vmreg_s390.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_S390_VM_VMREG_S390_INLINE_HPP -#define CPU_S390_VM_VMREG_S390_INLINE_HPP +#pragma once inline VMReg RegisterImpl::as_VMReg() { if (this == noreg) { @@ -40,5 +39,3 @@ inline VMReg ConditionRegisterImpl::as_VMReg() { return VMRegImpl::as_VMReg((encoding() << 1) + ConcreteRegisterImpl::max_fpr); } - -#endif // CPU_S390_VM_VMREG_S390_INLINE_HPP diff --git a/src/hotspot/cpu/sparc/assembler_sparc.hpp b/src/hotspot/cpu/sparc/assembler_sparc.hpp --- a/src/hotspot/cpu/sparc/assembler_sparc.hpp +++ b/src/hotspot/cpu/sparc/assembler_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_ASSEMBLER_SPARC_HPP -#define CPU_SPARC_VM_ASSEMBLER_SPARC_HPP +#pragma once #include "asm/register.hpp" @@ -1327,5 +1326,3 @@ #endif } }; - -#endif // CPU_SPARC_VM_ASSEMBLER_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/assembler_sparc.inline.hpp b/src/hotspot/cpu/sparc/assembler_sparc.inline.hpp --- a/src/hotspot/cpu/sparc/assembler_sparc.inline.hpp +++ b/src/hotspot/cpu/sparc/assembler_sparc.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP -#define CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP +#pragma once #include "asm/assembler.hpp" @@ -1126,5 +1125,3 @@ mpmul_only(); emit_int32(op(arith_op) | rd(0) | op3(mpmul_op3) | rs1(0) | opf(mpmul_opf) | uimm(uimm5, 5)); } - -#endif // CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP diff --git a/src/hotspot/cpu/sparc/bytes_sparc.hpp b/src/hotspot/cpu/sparc/bytes_sparc.hpp --- a/src/hotspot/cpu/sparc/bytes_sparc.hpp +++ b/src/hotspot/cpu/sparc/bytes_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_BYTES_SPARC_HPP -#define CPU_SPARC_VM_BYTES_SPARC_HPP +#pragma once #include "memory/allocation.hpp" @@ -156,5 +155,3 @@ // 1.15 98/10/05 16:30:21 bytes_i486.hpp // 1.17 99/06/22 16:37:35 bytes_i486.hpp //End - -#endif // CPU_SPARC_VM_BYTES_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/c1_Defs_sparc.hpp b/src/hotspot/cpu/sparc/c1_Defs_sparc.hpp --- a/src/hotspot/cpu/sparc/c1_Defs_sparc.hpp +++ b/src/hotspot/cpu/sparc/c1_Defs_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_C1_DEFS_SPARC_HPP -#define CPU_SPARC_VM_C1_DEFS_SPARC_HPP +#pragma once // native word offsets from memory address (big endian) enum { @@ -68,5 +67,3 @@ enum { pd_float_saved_as_double = false }; - -#endif // CPU_SPARC_VM_C1_DEFS_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp b/src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp --- a/src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp +++ b/src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp @@ -22,10 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_C1_FPUSTACKSIM_SPARC_HPP -#define CPU_SPARC_VM_C1_FPUSTACKSIM_SPARC_HPP +#pragma once // No FPU stack on SPARC class FpuStackSim; - -#endif // CPU_SPARC_VM_C1_FPUSTACKSIM_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp b/src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp --- a/src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp +++ b/src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_C1_FRAMEMAP_SPARC_HPP -#define CPU_SPARC_VM_C1_FRAMEMAP_SPARC_HPP +#pragma once public: @@ -181,5 +180,3 @@ static int nof_caller_save_cpu_regs() { return pd_nof_caller_save_cpu_regs_frame_map; } static int last_cpu_reg() { return pd_last_cpu_reg; } - -#endif // CPU_SPARC_VM_C1_FRAMEMAP_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp b/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp --- a/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp +++ b/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_C1_LIRASSEMBLER_SPARC_HPP -#define CPU_SPARC_VM_C1_LIRASSEMBLER_SPARC_HPP +#pragma once private: @@ -70,5 +69,3 @@ public: void pack64(LIR_Opr src, LIR_Opr dst); void unpack64(LIR_Opr src, LIR_Opr dst); - -#endif // CPU_SPARC_VM_C1_LIRASSEMBLER_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp b/src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp --- a/src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp +++ b/src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_C1_LINEARSCAN_SPARC_HPP -#define CPU_SPARC_VM_C1_LINEARSCAN_SPARC_HPP +#pragma once inline bool LinearScan::is_processed_reg_num(int reg_num) { return reg_num < 26 || reg_num > 31; @@ -66,5 +65,3 @@ } return false; } - -#endif // CPU_SPARC_VM_C1_LINEARSCAN_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp b/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp --- a/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp +++ b/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_C1_MACROASSEMBLER_SPARC_HPP -#define CPU_SPARC_VM_C1_MACROASSEMBLER_SPARC_HPP +#pragma once void pd_init() { /* nothing to do */ } @@ -94,5 +93,3 @@ void save_live_registers_no_oop_map(bool save_fpu_registers); void restore_live_registers(bool restore_fpu_registers); - -#endif // CPU_SPARC_VM_C1_MACROASSEMBLER_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/c1_globals_sparc.hpp b/src/hotspot/cpu/sparc/c1_globals_sparc.hpp --- a/src/hotspot/cpu/sparc/c1_globals_sparc.hpp +++ b/src/hotspot/cpu/sparc/c1_globals_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP -#define CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -67,5 +66,3 @@ define_pd_global(bool, OptimizeSinglePrecision, false); define_pd_global(bool, CSEArrayLength, true ); define_pd_global(bool, TwoOperandLIRForm, false); - -#endif // CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/c2_globals_sparc.hpp b/src/hotspot/cpu/sparc/c2_globals_sparc.hpp --- a/src/hotspot/cpu/sparc/c2_globals_sparc.hpp +++ b/src/hotspot/cpu/sparc/c2_globals_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_C2_GLOBALS_SPARC_HPP -#define CPU_SPARC_VM_C2_GLOBALS_SPARC_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -90,5 +89,3 @@ // Ergonomics related flags define_pd_global(bool, NeverActAsServerClassMachine, false); - -#endif // CPU_SPARC_VM_C2_GLOBALS_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/codeBuffer_sparc.hpp b/src/hotspot/cpu/sparc/codeBuffer_sparc.hpp --- a/src/hotspot/cpu/sparc/codeBuffer_sparc.hpp +++ b/src/hotspot/cpu/sparc/codeBuffer_sparc.hpp @@ -22,13 +22,10 @@ * */ -#ifndef CPU_SPARC_VM_CODEBUFFER_SPARC_HPP -#define CPU_SPARC_VM_CODEBUFFER_SPARC_HPP +#pragma once private: void pd_initialize() {} public: void flush_bundle(bool start_new_bundle) {} - -#endif // CPU_SPARC_VM_CODEBUFFER_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/copy_sparc.hpp b/src/hotspot/cpu/sparc/copy_sparc.hpp --- a/src/hotspot/cpu/sparc/copy_sparc.hpp +++ b/src/hotspot/cpu/sparc/copy_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_COPY_SPARC_HPP -#define CPU_SPARC_VM_COPY_SPARC_HPP +#pragma once // Inline functions for memory copy and fill. @@ -209,5 +208,3 @@ static void pd_zero_to_bytes(void* to, size_t count) { (void)memset(to, 0, count); } - -#endif // CPU_SPARC_VM_COPY_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/depChecker_sparc.hpp b/src/hotspot/cpu/sparc/depChecker_sparc.hpp --- a/src/hotspot/cpu/sparc/depChecker_sparc.hpp +++ b/src/hotspot/cpu/sparc/depChecker_sparc.hpp @@ -22,9 +22,6 @@ * */ -#ifndef CPU_SPARC_VM_DEPCHECKER_SPARC_HPP -#define CPU_SPARC_VM_DEPCHECKER_SPARC_HPP +#pragma once // Nothing to do on Sparc - -#endif // CPU_SPARC_VM_DEPCHECKER_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/disassembler_sparc.hpp b/src/hotspot/cpu/sparc/disassembler_sparc.hpp --- a/src/hotspot/cpu/sparc/disassembler_sparc.hpp +++ b/src/hotspot/cpu/sparc/disassembler_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP -#define CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP +#pragma once static int pd_instruction_alignment() { return sizeof(int); @@ -32,5 +31,3 @@ static const char* pd_cpu_opts() { return "v9only"; } - -#endif // CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/frame_sparc.hpp b/src/hotspot/cpu/sparc/frame_sparc.hpp --- a/src/hotspot/cpu/sparc/frame_sparc.hpp +++ b/src/hotspot/cpu/sparc/frame_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_FRAME_SPARC_HPP -#define CPU_SPARC_VM_FRAME_SPARC_HPP +#pragma once #include "runtime/synchronizer.hpp" @@ -241,5 +240,3 @@ public: static jint interpreter_frame_expression_stack_direction() { return -1; } - -#endif // CPU_SPARC_VM_FRAME_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/frame_sparc.inline.hpp b/src/hotspot/cpu/sparc/frame_sparc.inline.hpp --- a/src/hotspot/cpu/sparc/frame_sparc.inline.hpp +++ b/src/hotspot/cpu/sparc/frame_sparc.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_FRAME_SPARC_INLINE_HPP -#define CPU_SPARC_VM_FRAME_SPARC_INLINE_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "code/vmreg.inline.hpp" @@ -190,5 +189,3 @@ inline void frame::set_saved_oop_result(RegisterMap* map, oop obj) { *((oop*) map->location(O0->as_VMReg())) = obj; } - -#endif // CPU_SPARC_VM_FRAME_SPARC_INLINE_HPP diff --git a/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.hpp b/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.hpp --- a/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.hpp +++ b/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_GC_G1_G1BARRIERSETASSEMBLER_SPARC_HPP -#define CPU_SPARC_GC_G1_G1BARRIERSETASSEMBLER_SPARC_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/modRefBarrierSetAssembler.hpp" @@ -58,5 +57,3 @@ Address src, Register dst, Register tmp); virtual void barrier_stubs_init(); }; - -#endif // CPU_SPARC_GC_G1_G1BARRIERSETASSEMBLER_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.hpp b/src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.hpp --- a/src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.hpp +++ b/src/hotspot/cpu/sparc/gc/shared/barrierSetAssembler_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_GC_SHARED_BARRIERSETASSEMBLER_SPARC_HPP -#define CPU_SPARC_GC_SHARED_BARRIERSETASSEMBLER_SPARC_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "memory/allocation.hpp" @@ -50,5 +49,3 @@ virtual void barrier_stubs_init() {} }; - -#endif // CPU_SPARC_GC_SHARED_BARRIERSETASSEMBLER_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/gc/shared/cardTableBarrierSetAssembler_sparc.hpp b/src/hotspot/cpu/sparc/gc/shared/cardTableBarrierSetAssembler_sparc.hpp --- a/src/hotspot/cpu/sparc/gc/shared/cardTableBarrierSetAssembler_sparc.hpp +++ b/src/hotspot/cpu/sparc/gc/shared/cardTableBarrierSetAssembler_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_SPARC_HPP -#define CPU_SPARC_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_SPARC_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/modRefBarrierSetAssembler.hpp" @@ -40,5 +39,3 @@ virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Register val, Address dst, Register tmp); }; - -#endif // CPU_SPARC_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/gc/shared/modRefBarrierSetAssembler_sparc.hpp b/src/hotspot/cpu/sparc/gc/shared/modRefBarrierSetAssembler_sparc.hpp --- a/src/hotspot/cpu/sparc/gc/shared/modRefBarrierSetAssembler_sparc.hpp +++ b/src/hotspot/cpu/sparc/gc/shared/modRefBarrierSetAssembler_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_GC_SHARED_MODREFBARRIERSETASSEMBLER_SPARC_HPP -#define CPU_SPARC_GC_SHARED_MODREFBARRIERSETASSEMBLER_SPARC_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/barrierSetAssembler.hpp" @@ -50,5 +49,3 @@ virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Register val, Address dst, Register tmp); }; - -#endif // CPU_SPARC_GC_SHARED_MODREFBARRIERSETASSEMBLER_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp b/src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp --- a/src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp +++ b/src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_GLOBALDEFINITIONS_SPARC_HPP -#define CPU_SPARC_VM_GLOBALDEFINITIONS_SPARC_HPP +#pragma once // Size of Sparc Instructions const int BytesPerInstWord = 4; @@ -54,5 +53,3 @@ // SPARC have implemented the local polling #define THREAD_LOCAL_POLL - -#endif // CPU_SPARC_VM_GLOBALDEFINITIONS_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/globals_sparc.hpp b/src/hotspot/cpu/sparc/globals_sparc.hpp --- a/src/hotspot/cpu/sparc/globals_sparc.hpp +++ b/src/hotspot/cpu/sparc/globals_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_GLOBALS_SPARC_HPP -#define CPU_SPARC_VM_GLOBALS_SPARC_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -132,6 +131,4 @@ \ product(uintx, ArraycopyDstPrefetchDistance, 0, \ "Distance to prefetch destination array in arraycopy") \ - constraint(ArraycopyDstPrefetchDistanceConstraintFunc, AfterErgo) \ - -#endif // CPU_SPARC_VM_GLOBALS_SPARC_HPP + constraint(ArraycopyDstPrefetchDistanceConstraintFunc, AfterErgo) diff --git a/src/hotspot/cpu/sparc/icache_sparc.hpp b/src/hotspot/cpu/sparc/icache_sparc.hpp --- a/src/hotspot/cpu/sparc/icache_sparc.hpp +++ b/src/hotspot/cpu/sparc/icache_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_ICACHE_SPARC_HPP -#define CPU_SPARC_VM_ICACHE_SPARC_HPP +#pragma once // Interface for updating the instruction cache. Whenever the VM modifies // code, part of the processor instruction cache potentially has to be flushed. @@ -39,5 +38,3 @@ // Use default implementation }; - -#endif // CPU_SPARC_VM_ICACHE_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/interp_masm_sparc.hpp b/src/hotspot/cpu/sparc/interp_masm_sparc.hpp --- a/src/hotspot/cpu/sparc/interp_masm_sparc.hpp +++ b/src/hotspot/cpu/sparc/interp_masm_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_INTERP_MASM_SPARC_HPP -#define CPU_SPARC_VM_INTERP_MASM_SPARC_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "interpreter/invocationCounter.hpp" @@ -333,5 +332,3 @@ void restore_return_value(TosState state, bool is_native_call); }; - -#endif // CPU_SPARC_VM_INTERP_MASM_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/interpreterRT_sparc.hpp b/src/hotspot/cpu/sparc/interpreterRT_sparc.hpp --- a/src/hotspot/cpu/sparc/interpreterRT_sparc.hpp +++ b/src/hotspot/cpu/sparc/interpreterRT_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP -#define CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP +#pragma once // This is included in the middle of class Interpreter. // Do not include files here. @@ -59,5 +58,3 @@ // Code generation void generate( uint64_t fingerprint ); }; - -#endif // CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp b/src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp --- a/src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp +++ b/src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_JAVAFRAMEANCHOR_SPARC_HPP -#define CPU_SPARC_VM_JAVAFRAMEANCHOR_SPARC_HPP +#pragma once private: volatile int _flags; @@ -98,5 +97,3 @@ _flags |= flushed; OrderAccess::fence(); } - -#endif // CPU_SPARC_VM_JAVAFRAMEANCHOR_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/jniTypes_sparc.hpp b/src/hotspot/cpu/sparc/jniTypes_sparc.hpp --- a/src/hotspot/cpu/sparc/jniTypes_sparc.hpp +++ b/src/hotspot/cpu/sparc/jniTypes_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_JNITYPES_SPARC_HPP -#define CPU_SPARC_VM_JNITYPES_SPARC_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -87,5 +86,3 @@ static inline jdouble get_double(intptr_t *from) { return *(jdouble *)from; } }; - -#endif // CPU_SPARC_VM_JNITYPES_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp b/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp --- a/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp +++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP -#define CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP +#pragma once #include "asm/assembler.hpp" #include "utilities/macros.hpp" @@ -1396,5 +1395,3 @@ const bool* flag_addr, Assembler::Condition condition); ~SkipIfEqual(); }; - -#endif // CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp b/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp --- a/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp +++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_MACROASSEMBLER_SPARC_INLINE_HPP -#define CPU_SPARC_VM_MACROASSEMBLER_SPARC_INLINE_HPP +#pragma once #include "asm/assembler.inline.hpp" #include "asm/macroAssembler.hpp" @@ -719,4 +718,3 @@ if (a.has_index()) { assert(offset == 0, ""); swap(a.base(), a.index(), d ); } else { swap(a.base(), a.disp() + offset, d); } } -#endif // CPU_SPARC_VM_MACROASSEMBLER_SPARC_INLINE_HPP diff --git a/src/hotspot/cpu/sparc/nativeInst_sparc.hpp b/src/hotspot/cpu/sparc/nativeInst_sparc.hpp --- a/src/hotspot/cpu/sparc/nativeInst_sparc.hpp +++ b/src/hotspot/cpu/sparc/nativeInst_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_NATIVEINST_SPARC_HPP -#define CPU_SPARC_VM_NATIVEINST_SPARC_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "runtime/icache.hpp" @@ -808,5 +807,3 @@ // Insert illegal opcode as specific address static void insert(address code_pos); }; - -#endif // CPU_SPARC_VM_NATIVEINST_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/registerMap_sparc.hpp b/src/hotspot/cpu/sparc/registerMap_sparc.hpp --- a/src/hotspot/cpu/sparc/registerMap_sparc.hpp +++ b/src/hotspot/cpu/sparc/registerMap_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_REGISTERMAP_SPARC_HPP -#define CPU_SPARC_VM_REGISTERMAP_SPARC_HPP +#pragma once // machine-dependent implemention for register maps friend class frame; @@ -55,5 +54,3 @@ void shift_individual_registers(); // When popping out of compiled frames, we make all IRegs disappear. void make_integer_regs_unsaved() { _location_valid[0] = 0; } - -#endif // CPU_SPARC_VM_REGISTERMAP_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/register_sparc.hpp b/src/hotspot/cpu/sparc/register_sparc.hpp --- a/src/hotspot/cpu/sparc/register_sparc.hpp +++ b/src/hotspot/cpu/sparc/register_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_REGISTER_SPARC_HPP -#define CPU_SPARC_VM_REGISTER_SPARC_HPP +#pragma once #include "asm/register.hpp" @@ -336,5 +335,3 @@ return as_FloatRegister( ((encoding & 1) << 5) | (encoding & 0x1c) ); } }; - -#endif // CPU_SPARC_VM_REGISTER_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/relocInfo_sparc.hpp b/src/hotspot/cpu/sparc/relocInfo_sparc.hpp --- a/src/hotspot/cpu/sparc/relocInfo_sparc.hpp +++ b/src/hotspot/cpu/sparc/relocInfo_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_RELOCINFO_SPARC_HPP -#define CPU_SPARC_VM_RELOCINFO_SPARC_HPP +#pragma once // machine-dependent parts of class relocInfo private: @@ -53,5 +52,3 @@ // 1.8 99/06/22 16:37:50 relocInfo_i486.hpp // 1.9 99/07/16 11:12:11 relocInfo_i486.hpp //End - -#endif // CPU_SPARC_VM_RELOCINFO_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/stubRoutines_sparc.hpp b/src/hotspot/cpu/sparc/stubRoutines_sparc.hpp --- a/src/hotspot/cpu/sparc/stubRoutines_sparc.hpp +++ b/src/hotspot/cpu/sparc/stubRoutines_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_STUBROUTINES_SPARC_HPP -#define CPU_SPARC_VM_STUBROUTINES_SPARC_HPP +#pragma once // This file holds the platform specific parts of the StubRoutines // definition. See stubRoutines.hpp for a description on how to @@ -72,5 +71,3 @@ static address crc_by128_masks_addr() { return (address)_crc_by128_masks; } }; - -#endif // CPU_SPARC_VM_STUBROUTINES_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/templateTable_sparc.hpp b/src/hotspot/cpu/sparc/templateTable_sparc.hpp --- a/src/hotspot/cpu/sparc/templateTable_sparc.hpp +++ b/src/hotspot/cpu/sparc/templateTable_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_TEMPLATETABLE_SPARC_HPP -#define CPU_SPARC_VM_TEMPLATETABLE_SPARC_HPP +#pragma once static void prepare_invoke(int byte_no, Register method, // linked method (or i-klass) @@ -39,5 +38,3 @@ Register Rflags); static void generate_vtable_call(Register Rrecv, Register Rindex, Register Rret); static void volatile_barrier(Assembler::Membar_mask_bits order_constraint); - -#endif // CPU_SPARC_VM_TEMPLATETABLE_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/vmStructs_sparc.hpp b/src/hotspot/cpu/sparc/vmStructs_sparc.hpp --- a/src/hotspot/cpu/sparc/vmStructs_sparc.hpp +++ b/src/hotspot/cpu/sparc/vmStructs_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP -#define CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP +#pragma once // These are the CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -118,5 +117,3 @@ declare_constant(VM_Version::CPU_BLK_ZEROING) #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/vm_version_ext_sparc.hpp b/src/hotspot/cpu/sparc/vm_version_ext_sparc.hpp --- a/src/hotspot/cpu/sparc/vm_version_ext_sparc.hpp +++ b/src/hotspot/cpu/sparc/vm_version_ext_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_VM_VERSION_EXT_SPARC_HPP -#define CPU_SPARC_VM_VM_VERSION_EXT_SPARC_HPP +#pragma once #include "utilities/macros.hpp" #include "vm_version_sparc.hpp" @@ -65,5 +64,3 @@ static const char* cpu_name(void); static const char* cpu_description(void); }; - -#endif // CPU_SPARC_VM_VM_VERSION_EXT_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/vm_version_sparc.hpp b/src/hotspot/cpu/sparc/vm_version_sparc.hpp --- a/src/hotspot/cpu/sparc/vm_version_sparc.hpp +++ b/src/hotspot/cpu/sparc/vm_version_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_VM_VERSION_SPARC_HPP -#define CPU_SPARC_VM_VM_VERSION_SPARC_HPP +#pragma once #include "runtime/globals_extension.hpp" #include "runtime/vm_version.hpp" @@ -372,5 +371,3 @@ return is_post_niagara() ? 16 : 8; } }; - -#endif // CPU_SPARC_VM_VM_VERSION_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/vmreg_sparc.hpp b/src/hotspot/cpu/sparc/vmreg_sparc.hpp --- a/src/hotspot/cpu/sparc/vmreg_sparc.hpp +++ b/src/hotspot/cpu/sparc/vmreg_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_VMREG_SPARC_HPP -#define CPU_SPARC_VM_VMREG_SPARC_HPP +#pragma once inline bool is_Register() { return value() >= 0 && value() < ConcreteRegisterImpl::max_gpr; } inline bool is_FloatRegister() { return value() >= ConcreteRegisterImpl::max_gpr && @@ -54,5 +53,3 @@ assert(false, "what register?"); return false; } - -#endif // CPU_SPARC_VM_VMREG_SPARC_HPP diff --git a/src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp b/src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp --- a/src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp +++ b/src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_SPARC_VM_VMREG_SPARC_INLINE_HPP -#define CPU_SPARC_VM_VMREG_SPARC_INLINE_HPP +#pragma once inline VMReg RegisterImpl::as_VMReg() { if( this==noreg ) return VMRegImpl::Bad(); @@ -31,7 +30,3 @@ } inline VMReg FloatRegisterImpl::as_VMReg() { return VMRegImpl::as_VMReg( ConcreteRegisterImpl::max_gpr + encoding() ); } - - - -#endif // CPU_SPARC_VM_VMREG_SPARC_INLINE_HPP diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp --- a/src/hotspot/cpu/x86/assembler_x86.hpp +++ b/src/hotspot/cpu/x86/assembler_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_ASSEMBLER_X86_HPP -#define CPU_X86_VM_ASSEMBLER_X86_HPP +#pragma once #include "asm/register.hpp" #include "vm_version_x86.hpp" @@ -2309,5 +2308,3 @@ } }; - -#endif // CPU_X86_VM_ASSEMBLER_X86_HPP diff --git a/src/hotspot/cpu/x86/assembler_x86.inline.hpp b/src/hotspot/cpu/x86/assembler_x86.inline.hpp --- a/src/hotspot/cpu/x86/assembler_x86.inline.hpp +++ b/src/hotspot/cpu/x86/assembler_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_ASSEMBLER_X86_INLINE_HPP -#define CPU_X86_VM_ASSEMBLER_X86_INLINE_HPP +#pragma once #include "asm/assembler.inline.hpp" #include "asm/codeBuffer.hpp" @@ -48,5 +47,3 @@ inline void Assembler::prefix(Address adr, XMMRegister reg) {} inline void Assembler::prefixq(Address adr, XMMRegister reg) {} #endif // _LP64 - -#endif // CPU_X86_VM_ASSEMBLER_X86_INLINE_HPP diff --git a/src/hotspot/cpu/x86/bytes_x86.hpp b/src/hotspot/cpu/x86/bytes_x86.hpp --- a/src/hotspot/cpu/x86/bytes_x86.hpp +++ b/src/hotspot/cpu/x86/bytes_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_BYTES_X86_HPP -#define CPU_X86_VM_BYTES_X86_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/align.hpp" @@ -123,5 +122,3 @@ // The following header contains the implementations of swap_u2, swap_u4, and swap_u8[_base] #include OS_CPU_HEADER_INLINE(bytes) - -#endif // CPU_X86_VM_BYTES_X86_HPP diff --git a/src/hotspot/cpu/x86/c1_Defs_x86.hpp b/src/hotspot/cpu/x86/c1_Defs_x86.hpp --- a/src/hotspot/cpu/x86/c1_Defs_x86.hpp +++ b/src/hotspot/cpu/x86/c1_Defs_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_C1_DEFS_X86_HPP -#define CPU_X86_VM_C1_DEFS_X86_HPP +#pragma once // native word offsets from memory address (little endian) enum { @@ -74,5 +73,3 @@ enum { pd_float_saved_as_double = true }; - -#endif // CPU_X86_VM_C1_DEFS_X86_HPP diff --git a/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp b/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp --- a/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp +++ b/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_C1_FPUSTACKSIM_X86_HPP -#define CPU_X86_VM_C1_FPUSTACKSIM_X86_HPP +#pragma once // Simulates the FPU stack and maintains mapping [fpu-register -> stack offset] // FPU registers are described as numbers from 0..nof_fpu_regs-1 @@ -68,5 +67,3 @@ void print() PRODUCT_RETURN; }; - -#endif // CPU_X86_VM_C1_FPUSTACKSIM_X86_HPP diff --git a/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp b/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp --- a/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp +++ b/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_C1_FRAMEMAP_X86_HPP -#define CPU_X86_VM_C1_FRAMEMAP_X86_HPP +#pragma once // On i486 the frame looks as follows: // @@ -165,6 +164,3 @@ static int nof_caller_save_cpu_regs() { return adjust_reg_range(pd_nof_caller_save_cpu_regs_frame_map); } static int last_cpu_reg() { return adjust_reg_range(pd_last_cpu_reg); } static int last_byte_reg() { return adjust_reg_range(pd_last_byte_reg); } - -#endif // CPU_X86_VM_C1_FRAMEMAP_X86_HPP - diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp --- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP -#define CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP +#pragma once private: @@ -61,5 +60,3 @@ void store_parameter(jint c, int offset_from_esp_in_words); void store_parameter(jobject c, int offset_from_esp_in_words); void store_parameter(Metadata* c, int offset_from_esp_in_words); - -#endif // CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP diff --git a/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp b/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp --- a/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp +++ b/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_C1_LINEARSCAN_X86_HPP -#define CPU_X86_VM_C1_LINEARSCAN_X86_HPP +#pragma once inline bool LinearScan::is_processed_reg_num(int reg_num) { #ifndef _LP64 @@ -194,5 +193,3 @@ FpuStackAllocator(Compilation* compilation, LinearScan* allocator); void allocate(); }; - -#endif // CPU_X86_VM_C1_LINEARSCAN_X86_HPP diff --git a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp --- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP -#define CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP +#pragma once // C1_MacroAssembler contains high-level macros for C1 @@ -126,5 +125,3 @@ void save_live_registers_no_oop_map(bool save_fpu_registers); void restore_live_registers_except_rax(bool restore_fpu_registers); void restore_live_registers(bool restore_fpu_registers); - -#endif // CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP diff --git a/src/hotspot/cpu/x86/c1_globals_x86.hpp b/src/hotspot/cpu/x86/c1_globals_x86.hpp --- a/src/hotspot/cpu/x86/c1_globals_x86.hpp +++ b/src/hotspot/cpu/x86/c1_globals_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_C1_GLOBALS_X86_HPP -#define CPU_X86_VM_C1_GLOBALS_X86_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -66,5 +65,3 @@ define_pd_global(bool, OptimizeSinglePrecision, true ); define_pd_global(bool, CSEArrayLength, false); define_pd_global(bool, TwoOperandLIRForm, true ); - -#endif // CPU_X86_VM_C1_GLOBALS_X86_HPP diff --git a/src/hotspot/cpu/x86/c2_globals_x86.hpp b/src/hotspot/cpu/x86/c2_globals_x86.hpp --- a/src/hotspot/cpu/x86/c2_globals_x86.hpp +++ b/src/hotspot/cpu/x86/c2_globals_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_C2_GLOBALS_X86_HPP -#define CPU_X86_VM_C2_GLOBALS_X86_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -98,5 +97,3 @@ // Ergonomics related flags define_pd_global(bool, NeverActAsServerClassMachine, false); - -#endif // CPU_X86_VM_C2_GLOBALS_X86_HPP diff --git a/src/hotspot/cpu/x86/codeBuffer_x86.hpp b/src/hotspot/cpu/x86/codeBuffer_x86.hpp --- a/src/hotspot/cpu/x86/codeBuffer_x86.hpp +++ b/src/hotspot/cpu/x86/codeBuffer_x86.hpp @@ -22,13 +22,10 @@ * */ -#ifndef CPU_X86_VM_CODEBUFFER_X86_HPP -#define CPU_X86_VM_CODEBUFFER_X86_HPP +#pragma once private: void pd_initialize() {} public: void flush_bundle(bool start_new_bundle) {} - -#endif // CPU_X86_VM_CODEBUFFER_X86_HPP diff --git a/src/hotspot/cpu/x86/copy_x86.hpp b/src/hotspot/cpu/x86/copy_x86.hpp --- a/src/hotspot/cpu/x86/copy_x86.hpp +++ b/src/hotspot/cpu/x86/copy_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_COPY_X86_HPP -#define CPU_X86_VM_COPY_X86_HPP +#pragma once // Inline functions for memory copy and fill. @@ -61,5 +60,3 @@ static void pd_zero_to_bytes(void* to, size_t count) { (void)memset(to, 0, count); } - -#endif // CPU_X86_VM_COPY_X86_HPP diff --git a/src/hotspot/cpu/x86/depChecker_x86.hpp b/src/hotspot/cpu/x86/depChecker_x86.hpp --- a/src/hotspot/cpu/x86/depChecker_x86.hpp +++ b/src/hotspot/cpu/x86/depChecker_x86.hpp @@ -22,9 +22,6 @@ * */ -#ifndef CPU_X86_VM_DEPCHECKER_X86_HPP -#define CPU_X86_VM_DEPCHECKER_X86_HPP +#pragma once // Nothing to do on i486 - -#endif // CPU_X86_VM_DEPCHECKER_X86_HPP diff --git a/src/hotspot/cpu/x86/disassembler_x86.hpp b/src/hotspot/cpu/x86/disassembler_x86.hpp --- a/src/hotspot/cpu/x86/disassembler_x86.hpp +++ b/src/hotspot/cpu/x86/disassembler_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_DISASSEMBLER_X86_HPP -#define CPU_X86_VM_DISASSEMBLER_X86_HPP +#pragma once static int pd_instruction_alignment() { return 1; @@ -32,5 +31,3 @@ static const char* pd_cpu_opts() { return ""; } - -#endif // CPU_X86_VM_DISASSEMBLER_X86_HPP diff --git a/src/hotspot/cpu/x86/frame_x86.hpp b/src/hotspot/cpu/x86/frame_x86.hpp --- a/src/hotspot/cpu/x86/frame_x86.hpp +++ b/src/hotspot/cpu/x86/frame_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_FRAME_X86_HPP -#define CPU_X86_VM_FRAME_X86_HPP +#pragma once #include "runtime/synchronizer.hpp" @@ -155,5 +154,3 @@ void interpreter_frame_set_last_sp(intptr_t* sp); static jint interpreter_frame_expression_stack_direction() { return -1; } - -#endif // CPU_X86_VM_FRAME_X86_HPP diff --git a/src/hotspot/cpu/x86/frame_x86.inline.hpp b/src/hotspot/cpu/x86/frame_x86.inline.hpp --- a/src/hotspot/cpu/x86/frame_x86.inline.hpp +++ b/src/hotspot/cpu/x86/frame_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_FRAME_X86_INLINE_HPP -#define CPU_X86_VM_FRAME_X86_INLINE_HPP +#pragma once #include "code/codeCache.hpp" #include "code/vmreg.inline.hpp" @@ -244,5 +243,3 @@ *result_adr = obj; } - -#endif // CPU_X86_VM_FRAME_X86_INLINE_HPP diff --git a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp --- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_GC_G1_G1BARRIERSETASSEMBLER_X86_HPP -#define CPU_X86_GC_G1_G1BARRIERSETASSEMBLER_X86_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/modRefBarrierSetAssembler.hpp" @@ -66,5 +65,3 @@ virtual void load_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Register dst, Address src, Register tmp1, Register tmp_thread); }; - -#endif // CPU_X86_GC_G1_G1BARRIERSETASSEMBLER_X86_HPP diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp --- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_GC_SHARED_BARRIERSETASSEMBLER_X86_HPP -#define CPU_X86_GC_SHARED_BARRIERSETASSEMBLER_X86_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "memory/allocation.hpp" @@ -86,5 +85,3 @@ virtual void nmethod_entry_barrier(MacroAssembler* masm); }; - -#endif // CPU_X86_GC_SHARED_BARRIERSETASSEMBLER_X86_HPP diff --git a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp --- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_X86_HPP -#define CPU_X86_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_X86_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/modRefBarrierSetAssembler.hpp" @@ -37,5 +36,3 @@ virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Address dst, Register val, Register tmp1, Register tmp2); }; - -#endif // CPU_X86_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_X86_HPP diff --git a/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp --- a/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/gc/shared/modRefBarrierSetAssembler_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_GC_SHARED_MODREFBARRIERSETASSEMBLER_X86_HPP -#define CPU_X86_GC_SHARED_MODREFBARRIERSETASSEMBLER_X86_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/barrierSetAssembler.hpp" @@ -49,5 +48,3 @@ virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Address dst, Register val, Register tmp1, Register tmp2); }; - -#endif // CPU_X86_GC_SHARED_MODREFBARRIERSETASSEMBLER_X86_HPP diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp --- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp @@ -21,8 +21,7 @@ * */ -#ifndef CPU_X86_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_X86_HPP -#define CPU_X86_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_X86_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/barrierSetAssembler.hpp" @@ -115,5 +114,3 @@ virtual void barrier_stubs_init(); }; - -#endif // CPU_X86_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_X86_HPP diff --git a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp --- a/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef CPU_X86_GC_Z_ZBARRIERSETASSEMBLER_X86_HPP -#define CPU_X86_GC_Z_ZBARRIERSETASSEMBLER_X86_HPP +#pragma once #ifdef COMPILER1 class LIR_Assembler; @@ -88,5 +87,3 @@ virtual void barrier_stubs_init(); }; - -#endif // CPU_X86_GC_Z_ZBARRIERSETASSEMBLER_X86_HPP diff --git a/src/hotspot/cpu/x86/globalDefinitions_x86.hpp b/src/hotspot/cpu/x86/globalDefinitions_x86.hpp --- a/src/hotspot/cpu/x86/globalDefinitions_x86.hpp +++ b/src/hotspot/cpu/x86/globalDefinitions_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP -#define CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP +#pragma once const int StackAlignmentInBytes = 16; @@ -66,5 +65,3 @@ #endif #define THREAD_LOCAL_POLL - -#endif // CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP diff --git a/src/hotspot/cpu/x86/globals_x86.hpp b/src/hotspot/cpu/x86/globals_x86.hpp --- a/src/hotspot/cpu/x86/globals_x86.hpp +++ b/src/hotspot/cpu/x86/globals_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_GLOBALS_X86_HPP -#define CPU_X86_VM_GLOBALS_X86_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -215,4 +214,3 @@ \ diagnostic(bool, UseLibmIntrinsic, true, \ "Use Libm Intrinsics") -#endif // CPU_X86_VM_GLOBALS_X86_HPP diff --git a/src/hotspot/cpu/x86/icache_x86.hpp b/src/hotspot/cpu/x86/icache_x86.hpp --- a/src/hotspot/cpu/x86/icache_x86.hpp +++ b/src/hotspot/cpu/x86/icache_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_ICACHE_X86_HPP -#define CPU_X86_VM_ICACHE_X86_HPP +#pragma once // Interface for updating the instruction cache. Whenever the VM modifies // code, part of the processor instruction cache potentially has to be flushed. @@ -56,5 +55,3 @@ }; #endif // AMD64 }; - -#endif // CPU_X86_VM_ICACHE_X86_HPP diff --git a/src/hotspot/cpu/x86/interp_masm_x86.hpp b/src/hotspot/cpu/x86/interp_masm_x86.hpp --- a/src/hotspot/cpu/x86/interp_masm_x86.hpp +++ b/src/hotspot/cpu/x86/interp_masm_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_INTERP_MASM_X86_HPP -#define CPU_X86_VM_INTERP_MASM_X86_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "interpreter/invocationCounter.hpp" @@ -297,5 +296,3 @@ void profile_parameters_type(Register mdp, Register tmp1, Register tmp2); }; - -#endif // CPU_X86_VM_INTERP_MASM_X86_HPP diff --git a/src/hotspot/cpu/x86/interpreterRT_x86.hpp b/src/hotspot/cpu/x86/interpreterRT_x86.hpp --- a/src/hotspot/cpu/x86/interpreterRT_x86.hpp +++ b/src/hotspot/cpu/x86/interpreterRT_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_INTERPRETERRT_X86_HPP -#define CPU_X86_VM_INTERPRETERRT_X86_HPP +#pragma once // This is included in the middle of class Interpreter. // Do not include files here. @@ -66,5 +65,3 @@ static Register to(); static Register temp(); }; - -#endif // CPU_X86_VM_INTERPRETERRT_X86_HPP diff --git a/src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp b/src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp --- a/src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp +++ b/src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_JAVAFRAMEANCHOR_X86_HPP -#define CPU_X86_VM_JAVAFRAMEANCHOR_X86_HPP +#pragma once private: @@ -81,5 +80,3 @@ intptr_t* last_Java_fp(void) { return _last_Java_fp; } // Assert (last_Java_sp == NULL || fp == NULL) void set_last_Java_fp(intptr_t* fp) { _last_Java_fp = fp; } - -#endif // CPU_X86_VM_JAVAFRAMEANCHOR_X86_HPP diff --git a/src/hotspot/cpu/x86/jniTypes_x86.hpp b/src/hotspot/cpu/x86/jniTypes_x86.hpp --- a/src/hotspot/cpu/x86/jniTypes_x86.hpp +++ b/src/hotspot/cpu/x86/jniTypes_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_JNITYPES_X86_HPP -#define CPU_X86_VM_JNITYPES_X86_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -129,5 +128,3 @@ static inline jdouble get_double(intptr_t *from) { return *(jdouble *)(from + _JNI_SLOT_OFFSET); } #undef _JNI_SLOT_OFFSET }; - -#endif // CPU_X86_VM_JNITYPES_X86_HPP diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp --- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_MACROASSEMBLER_X86_HPP -#define CPU_X86_VM_MACROASSEMBLER_X86_HPP +#pragma once #include "asm/assembler.hpp" #include "utilities/macros.hpp" @@ -1778,5 +1777,3 @@ SkipIfEqual(MacroAssembler*, const bool* flag_addr, bool value); ~SkipIfEqual(); }; - -#endif // CPU_X86_VM_MACROASSEMBLER_X86_HPP diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp --- a/src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp +++ b/src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp @@ -22,9 +22,6 @@ * */ -#ifndef CPU_X86_VM_MACROASSEMBLER_X86_INLINE_HPP -#define CPU_X86_VM_MACROASSEMBLER_X86_INLINE_HPP +#pragma once // Still empty. - -#endif // CPU_X86_VM_MACROASSEMBLER_X86_INLINE_HPP diff --git a/src/hotspot/cpu/x86/nativeInst_x86.hpp b/src/hotspot/cpu/x86/nativeInst_x86.hpp --- a/src/hotspot/cpu/x86/nativeInst_x86.hpp +++ b/src/hotspot/cpu/x86/nativeInst_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_NATIVEINST_X86_HPP -#define CPU_X86_VM_NATIVEINST_X86_HPP +#pragma once #include "asm/assembler.hpp" #include "runtime/icache.hpp" @@ -752,5 +751,3 @@ return false; #endif // AMD64 } - -#endif // CPU_X86_VM_NATIVEINST_X86_HPP diff --git a/src/hotspot/cpu/x86/rdtsc_x86.hpp b/src/hotspot/cpu/x86/rdtsc_x86.hpp --- a/src/hotspot/cpu/x86/rdtsc_x86.hpp +++ b/src/hotspot/cpu/x86/rdtsc_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_RDTSC_X86_HPP -#define CPU_X86_VM_RDTSC_X86_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/macros.hpp" @@ -46,5 +45,3 @@ static jlong epoch(); static bool initialize(); }; - -#endif // CPU_X86_VM_RDTSC_X86_HPP diff --git a/src/hotspot/cpu/x86/registerMap_x86.hpp b/src/hotspot/cpu/x86/registerMap_x86.hpp --- a/src/hotspot/cpu/x86/registerMap_x86.hpp +++ b/src/hotspot/cpu/x86/registerMap_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_REGISTERMAP_X86_HPP -#define CPU_X86_VM_REGISTERMAP_X86_HPP +#pragma once // machine-dependent implemention for register maps friend class frame; @@ -36,5 +35,3 @@ void pd_clear() {} void pd_initialize() {} void pd_initialize_from(const RegisterMap* map) {} - -#endif // CPU_X86_VM_REGISTERMAP_X86_HPP diff --git a/src/hotspot/cpu/x86/register_x86.hpp b/src/hotspot/cpu/x86/register_x86.hpp --- a/src/hotspot/cpu/x86/register_x86.hpp +++ b/src/hotspot/cpu/x86/register_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_REGISTER_X86_HPP -#define CPU_X86_VM_REGISTER_X86_HPP +#pragma once #include "asm/register.hpp" @@ -290,5 +289,3 @@ static const int max_kpr; }; - -#endif // CPU_X86_VM_REGISTER_X86_HPP diff --git a/src/hotspot/cpu/x86/relocInfo_x86.hpp b/src/hotspot/cpu/x86/relocInfo_x86.hpp --- a/src/hotspot/cpu/x86/relocInfo_x86.hpp +++ b/src/hotspot/cpu/x86/relocInfo_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_RELOCINFO_X86_HPP -#define CPU_X86_VM_RELOCINFO_X86_HPP +#pragma once // machine-dependent parts of class relocInfo private: @@ -45,5 +44,3 @@ // Instruct loadConP of x86_64.ad places oops in code that are not also // listed in the oop section. static bool mustIterateImmediateOopsInCode() { return true; } - -#endif // CPU_X86_VM_RELOCINFO_X86_HPP diff --git a/src/hotspot/cpu/x86/stubRoutines_x86.hpp b/src/hotspot/cpu/x86/stubRoutines_x86.hpp --- a/src/hotspot/cpu/x86/stubRoutines_x86.hpp +++ b/src/hotspot/cpu/x86/stubRoutines_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_STUBROUTINES_X86_HPP -#define CPU_X86_VM_STUBROUTINES_X86_HPP +#pragma once // This file holds the platform specific parts of the StubRoutines // definition. See stubRoutines.hpp for a description on how to @@ -247,5 +246,3 @@ static address _ones_addr() { return _ones_adr; } }; - -#endif // CPU_X86_VM_STUBROUTINES_X86_HPP diff --git a/src/hotspot/cpu/x86/templateTable_x86.hpp b/src/hotspot/cpu/x86/templateTable_x86.hpp --- a/src/hotspot/cpu/x86/templateTable_x86.hpp +++ b/src/hotspot/cpu/x86/templateTable_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_TEMPLATETABLE_X86_HPP -#define CPU_X86_VM_TEMPLATETABLE_X86_HPP +#pragma once static void prepare_invoke(int byte_no, Register method, // linked method (or i-klass) @@ -42,5 +41,3 @@ static void putfield_or_static_helper(int byte_no, bool is_static, RewriteControl rc, Register obj, Register off, Register flags); static void fast_storefield_helper(Address field, Register rax); - -#endif // CPU_X86_VM_TEMPLATETABLE_X86_HPP diff --git a/src/hotspot/cpu/x86/vmStructs_x86.hpp b/src/hotspot/cpu/x86/vmStructs_x86.hpp --- a/src/hotspot/cpu/x86/vmStructs_x86.hpp +++ b/src/hotspot/cpu/x86/vmStructs_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_VMSTRUCTS_X86_HPP -#define CPU_X86_VM_VMSTRUCTS_X86_HPP +#pragma once // These are the CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -76,5 +75,3 @@ declare_preprocessor_constant("VM_Version::CPU_SHA", CPU_SHA) \ declare_preprocessor_constant("VM_Version::CPU_FMA", CPU_FMA) \ declare_preprocessor_constant("VM_Version::CPU_VZEROUPPER", CPU_VZEROUPPER) - -#endif // CPU_X86_VM_VMSTRUCTS_X86_HPP diff --git a/src/hotspot/cpu/x86/vm_version_ext_x86.hpp b/src/hotspot/cpu/x86/vm_version_ext_x86.hpp --- a/src/hotspot/cpu/x86/vm_version_ext_x86.hpp +++ b/src/hotspot/cpu/x86/vm_version_ext_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_VM_VERSION_EXT_X86_HPP -#define CPU_X86_VM_VM_VERSION_EXT_X86_HPP +#pragma once #include "utilities/macros.hpp" #include "vm_version_x86.hpp" @@ -96,5 +95,3 @@ static void initialize(); }; - -#endif // CPU_X86_VM_VM_VERSION_EXT_X86_HPP diff --git a/src/hotspot/cpu/x86/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp --- a/src/hotspot/cpu/x86/vm_version_x86.hpp +++ b/src/hotspot/cpu/x86/vm_version_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_VM_VERSION_X86_HPP -#define CPU_X86_VM_VM_VERSION_X86_HPP +#pragma once #include "runtime/globals_extension.hpp" #include "runtime/vm_version.hpp" @@ -931,5 +930,3 @@ // the intrinsic for java.lang.Thread.onSpinWait() static bool supports_on_spin_wait() { return supports_sse2(); } }; - -#endif // CPU_X86_VM_VM_VERSION_X86_HPP diff --git a/src/hotspot/cpu/x86/vmreg_x86.hpp b/src/hotspot/cpu/x86/vmreg_x86.hpp --- a/src/hotspot/cpu/x86/vmreg_x86.hpp +++ b/src/hotspot/cpu/x86/vmreg_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_VMREG_X86_HPP -#define CPU_X86_VM_VMREG_X86_HPP +#pragma once @@ -92,5 +91,3 @@ #endif // AMD64 return is_even(value()); } - -#endif // CPU_X86_VM_VMREG_X86_HPP diff --git a/src/hotspot/cpu/x86/vmreg_x86.inline.hpp b/src/hotspot/cpu/x86/vmreg_x86.inline.hpp --- a/src/hotspot/cpu/x86/vmreg_x86.inline.hpp +++ b/src/hotspot/cpu/x86/vmreg_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_X86_VM_VMREG_X86_INLINE_HPP -#define CPU_X86_VM_VMREG_X86_INLINE_HPP +#pragma once inline VMReg RegisterImpl::as_VMReg() { if( this==noreg ) return VMRegImpl::Bad(); @@ -45,5 +44,3 @@ inline VMReg KRegisterImpl::as_VMReg() { return VMRegImpl::as_VMReg(encoding() + ConcreteRegisterImpl::max_xmm); } - -#endif // CPU_X86_VM_VMREG_X86_INLINE_HPP diff --git a/src/hotspot/cpu/zero/assembler_zero.hpp b/src/hotspot/cpu/zero/assembler_zero.hpp --- a/src/hotspot/cpu/zero/assembler_zero.hpp +++ b/src/hotspot/cpu/zero/assembler_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_ASSEMBLER_ZERO_HPP -#define CPU_ZERO_VM_ASSEMBLER_ZERO_HPP +#pragma once // In normal, CPU-specific ports of HotSpot these two classes are used // for generating assembly language. We don't do any of this in zero, @@ -58,5 +57,3 @@ address ShouldNotCallThisStub(); address ShouldNotCallThisEntry(); - -#endif // CPU_ZERO_VM_ASSEMBLER_ZERO_HPP diff --git a/src/hotspot/cpu/zero/assembler_zero.inline.hpp b/src/hotspot/cpu/zero/assembler_zero.inline.hpp --- a/src/hotspot/cpu/zero/assembler_zero.inline.hpp +++ b/src/hotspot/cpu/zero/assembler_zero.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP -#define CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP +#pragma once #include "asm/assembler.inline.hpp" #include "asm/codeBuffer.hpp" @@ -32,5 +31,3 @@ #include "runtime/handles.inline.hpp" // This file is intentionally empty - -#endif // CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP diff --git a/src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp --- a/src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp +++ b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP -#define CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP +#pragma once // Platform specific for C++ based Interpreter @@ -170,5 +169,3 @@ #define SET_VMSLOTS_OBJECT(value, offset) (*((oop *)&vmslots[(offset)]) = (value)) #define SET_VMSLOTS_DOUBLE(value, offset) (((VMJavaVal64*)&vmslots[(offset) - 1])->d = (value)) #define SET_VMSLOTS_LONG(value, offset) (((VMJavaVal64*)&vmslots[(offset) - 1])->l = (value)) - -#endif // CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP diff --git a/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp --- a/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp +++ b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP -#define CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP +#pragma once // Inline interpreter functions for zero @@ -302,5 +301,3 @@ inline jbyte BytecodeInterpreter::VMint2Byte(jint val) { return (jbyte) val; } - -#endif // CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP diff --git a/src/hotspot/cpu/zero/bytes_zero.hpp b/src/hotspot/cpu/zero/bytes_zero.hpp --- a/src/hotspot/cpu/zero/bytes_zero.hpp +++ b/src/hotspot/cpu/zero/bytes_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_BYTES_ZERO_HPP -#define CPU_ZERO_VM_BYTES_ZERO_HPP +#pragma once #include "memory/allocation.hpp" @@ -159,5 +158,3 @@ #include OS_CPU_HEADER_INLINE(bytes) #endif // VM_LITTLE_ENDIAN - -#endif // CPU_ZERO_VM_BYTES_ZERO_HPP diff --git a/src/hotspot/cpu/zero/codeBuffer_zero.hpp b/src/hotspot/cpu/zero/codeBuffer_zero.hpp --- a/src/hotspot/cpu/zero/codeBuffer_zero.hpp +++ b/src/hotspot/cpu/zero/codeBuffer_zero.hpp @@ -23,10 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_CODEBUFFER_ZERO_HPP -#define CPU_ZERO_VM_CODEBUFFER_ZERO_HPP +#pragma once private: void pd_initialize() {} - -#endif // CPU_ZERO_VM_CODEBUFFER_ZERO_HPP diff --git a/src/hotspot/cpu/zero/copy_zero.hpp b/src/hotspot/cpu/zero/copy_zero.hpp --- a/src/hotspot/cpu/zero/copy_zero.hpp +++ b/src/hotspot/cpu/zero/copy_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_COPY_ZERO_HPP -#define CPU_ZERO_VM_COPY_ZERO_HPP +#pragma once // Inline functions for memory copy and fill. @@ -179,5 +178,3 @@ static void pd_zero_to_bytes(void* to, size_t count) { memset(to, 0, count); } - -#endif // CPU_ZERO_VM_COPY_ZERO_HPP diff --git a/src/hotspot/cpu/zero/cppInterpreter_zero.hpp b/src/hotspot/cpu/zero/cppInterpreter_zero.hpp --- a/src/hotspot/cpu/zero/cppInterpreter_zero.hpp +++ b/src/hotspot/cpu/zero/cppInterpreter_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP -#define CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP +#pragma once protected: // Size of interpreter code @@ -48,5 +47,3 @@ static BasicType result_type_of_handle(oop method_handle); static intptr_t* calculate_unwind_sp(ZeroStack* stack, oop method_handle); static void throw_exception(JavaThread* thread, Symbol* name,char *msg=NULL); - -#endif // CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP diff --git a/src/hotspot/cpu/zero/depChecker_zero.hpp b/src/hotspot/cpu/zero/depChecker_zero.hpp --- a/src/hotspot/cpu/zero/depChecker_zero.hpp +++ b/src/hotspot/cpu/zero/depChecker_zero.hpp @@ -23,9 +23,6 @@ * */ -#ifndef CPU_ZERO_VM_DEPCHECKER_ZERO_HPP -#define CPU_ZERO_VM_DEPCHECKER_ZERO_HPP +#pragma once // This file is intentionally empty - -#endif // CPU_ZERO_VM_DEPCHECKER_ZERO_HPP diff --git a/src/hotspot/cpu/zero/disassembler_zero.hpp b/src/hotspot/cpu/zero/disassembler_zero.hpp --- a/src/hotspot/cpu/zero/disassembler_zero.hpp +++ b/src/hotspot/cpu/zero/disassembler_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP -#define CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP +#pragma once static int pd_instruction_alignment() { return 1; @@ -33,5 +32,3 @@ static const char* pd_cpu_opts() { return ""; } - -#endif // CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP diff --git a/src/hotspot/cpu/zero/entryFrame_zero.hpp b/src/hotspot/cpu/zero/entryFrame_zero.hpp --- a/src/hotspot/cpu/zero/entryFrame_zero.hpp +++ b/src/hotspot/cpu/zero/entryFrame_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP -#define CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP +#pragma once #include "runtime/javaCalls.hpp" #include "stack_zero.hpp" @@ -69,5 +68,3 @@ char* valuebuf, int buflen) const; }; - -#endif // CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP diff --git a/src/hotspot/cpu/zero/entry_zero.hpp b/src/hotspot/cpu/zero/entry_zero.hpp --- a/src/hotspot/cpu/zero/entry_zero.hpp +++ b/src/hotspot/cpu/zero/entry_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP -#define CPU_ZERO_VM_ENTRY_ZERO_HPP +#pragma once #include "interpreter/cppInterpreter.hpp" @@ -77,5 +76,3 @@ return byte_offset_of(ZeroEntry, _entry_point); } }; - -#endif // CPU_ZERO_VM_ENTRY_ZERO_HPP diff --git a/src/hotspot/cpu/zero/fakeStubFrame_zero.hpp b/src/hotspot/cpu/zero/fakeStubFrame_zero.hpp --- a/src/hotspot/cpu/zero/fakeStubFrame_zero.hpp +++ b/src/hotspot/cpu/zero/fakeStubFrame_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP -#define CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP +#pragma once #include "stack_zero.hpp" @@ -56,5 +55,3 @@ char* valuebuf, int buflen) const {} }; - -#endif // CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP diff --git a/src/hotspot/cpu/zero/frame_zero.hpp b/src/hotspot/cpu/zero/frame_zero.hpp --- a/src/hotspot/cpu/zero/frame_zero.hpp +++ b/src/hotspot/cpu/zero/frame_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_FRAME_ZERO_HPP -#define CPU_ZERO_VM_FRAME_ZERO_HPP +#pragma once #include "runtime/synchronizer.hpp" @@ -76,5 +75,3 @@ int buflen) const; static jint interpreter_frame_expression_stack_direction() { return -1; } - -#endif // CPU_ZERO_VM_FRAME_ZERO_HPP diff --git a/src/hotspot/cpu/zero/frame_zero.inline.hpp b/src/hotspot/cpu/zero/frame_zero.inline.hpp --- a/src/hotspot/cpu/zero/frame_zero.inline.hpp +++ b/src/hotspot/cpu/zero/frame_zero.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP -#define CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP +#pragma once #include "code/codeCache.hpp" @@ -163,5 +162,3 @@ inline intptr_t* frame::unextended_sp() const { return (intptr_t *) -1; } - -#endif // CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP diff --git a/src/hotspot/cpu/zero/gc/g1/g1BarrierSetAssembler_zero.hpp b/src/hotspot/cpu/zero/gc/g1/g1BarrierSetAssembler_zero.hpp --- a/src/hotspot/cpu/zero/gc/g1/g1BarrierSetAssembler_zero.hpp +++ b/src/hotspot/cpu/zero/gc/g1/g1BarrierSetAssembler_zero.hpp @@ -22,9 +22,6 @@ * */ -#ifndef CPU_ZERO_GC_G1_G1BARRIERSETASSEMBLER_ZERO_HPP -#define CPU_ZERO_GC_G1_G1BARRIERSETASSEMBLER_ZERO_HPP +#pragma once class G1BarrierSetAssembler; - -#endif // CPU_ZERO_GC_G1_G1BARRIERSETASSEMBLER_ZERO_HPP diff --git a/src/hotspot/cpu/zero/gc/shared/barrierSetAssembler_zero.hpp b/src/hotspot/cpu/zero/gc/shared/barrierSetAssembler_zero.hpp --- a/src/hotspot/cpu/zero/gc/shared/barrierSetAssembler_zero.hpp +++ b/src/hotspot/cpu/zero/gc/shared/barrierSetAssembler_zero.hpp @@ -22,9 +22,6 @@ * */ -#ifndef CPU_ZERO_GC_SHARED_BARRIERSETASSEMBLER_ZERO_HPP -#define CPU_ZERO_GC_SHARED_BARRIERSETASSEMBLER_ZERO_HPP +#pragma once class BarrierSetAssembler; - -#endif // CPU_ZERO_GC_SHARED_BARRIERSETASSEMBLER_ZERO_HPP diff --git a/src/hotspot/cpu/zero/gc/shared/cardTableBarrierSetAssembler_zero.hpp b/src/hotspot/cpu/zero/gc/shared/cardTableBarrierSetAssembler_zero.hpp --- a/src/hotspot/cpu/zero/gc/shared/cardTableBarrierSetAssembler_zero.hpp +++ b/src/hotspot/cpu/zero/gc/shared/cardTableBarrierSetAssembler_zero.hpp @@ -22,9 +22,6 @@ * */ -#ifndef CPU_ZERO_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ZERO_HPP -#define CPU_ZERO_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ZERO_HPP +#pragma once class CardTableBarrierSetAssembler; - -#endif // CPU_ZERO_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ZERO_HPP diff --git a/src/hotspot/cpu/zero/gc/shared/modRefBarrierSetAssembler_zero.hpp b/src/hotspot/cpu/zero/gc/shared/modRefBarrierSetAssembler_zero.hpp --- a/src/hotspot/cpu/zero/gc/shared/modRefBarrierSetAssembler_zero.hpp +++ b/src/hotspot/cpu/zero/gc/shared/modRefBarrierSetAssembler_zero.hpp @@ -22,9 +22,6 @@ * */ -#ifndef CPU_ZERO_GC_SHARED_MODREFBARRIERSETASSEMBLER_ZERO_HPP -#define CPU_ZERO_GC_SHARED_MODREFBARRIERSETASSEMBLER_ZERO_HPP +#pragma once class ModRefBarrierSetAssembler; - -#endif // CPU_ZERO_GC_SHARED_MODREFBARRIERSETASSEMBLER_ZERO_HPP diff --git a/src/hotspot/cpu/zero/globalDefinitions_zero.hpp b/src/hotspot/cpu/zero/globalDefinitions_zero.hpp --- a/src/hotspot/cpu/zero/globalDefinitions_zero.hpp +++ b/src/hotspot/cpu/zero/globalDefinitions_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP -#define CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP +#pragma once #ifdef _LP64 #define SUPPORTS_NATIVE_CX8 @@ -35,5 +34,3 @@ // Indicates whether the C calling conventions require that // 32-bit integer argument values are extended to 64 bits. const bool CCallingConventionRequiresIntsAsLongs = false; - -#endif // CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP diff --git a/src/hotspot/cpu/zero/globals_zero.hpp b/src/hotspot/cpu/zero/globals_zero.hpp --- a/src/hotspot/cpu/zero/globals_zero.hpp +++ b/src/hotspot/cpu/zero/globals_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_GLOBALS_ZERO_HPP -#define CPU_ZERO_VM_GLOBALS_ZERO_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -94,7 +93,5 @@ "Use fast method entry code for empty methods") \ \ product(bool, UseFastAccessorMethods, true, \ - "Use fast method entry code for accessor methods") \ - \ + "Use fast method entry code for accessor methods") -#endif // CPU_ZERO_VM_GLOBALS_ZERO_HPP diff --git a/src/hotspot/cpu/zero/icache_zero.hpp b/src/hotspot/cpu/zero/icache_zero.hpp --- a/src/hotspot/cpu/zero/icache_zero.hpp +++ b/src/hotspot/cpu/zero/icache_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_ICACHE_ZERO_HPP -#define CPU_ZERO_VM_ICACHE_ZERO_HPP +#pragma once // Interface for updating the instruction cache. Whenever the VM // modifies code, part of the processor instruction cache potentially @@ -37,5 +36,3 @@ static void invalidate_word(address addr) {} static void invalidate_range(address start, int nbytes) {} }; - -#endif // CPU_ZERO_VM_ICACHE_ZERO_HPP diff --git a/src/hotspot/cpu/zero/interp_masm_zero.hpp b/src/hotspot/cpu/zero/interp_masm_zero.hpp --- a/src/hotspot/cpu/zero/interp_masm_zero.hpp +++ b/src/hotspot/cpu/zero/interp_masm_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_INTERP_MASM_ZERO_HPP -#define CPU_ZERO_VM_INTERP_MASM_ZERO_HPP +#pragma once #include "asm/codeBuffer.hpp" #include "asm/macroAssembler.hpp" @@ -44,5 +43,3 @@ return RegisterOrConstant(); } }; - -#endif // CPU_ZERO_VM_INTERP_MASM_ZERO_HPP diff --git a/src/hotspot/cpu/zero/interpreterFrame_zero.hpp b/src/hotspot/cpu/zero/interpreterFrame_zero.hpp --- a/src/hotspot/cpu/zero/interpreterFrame_zero.hpp +++ b/src/hotspot/cpu/zero/interpreterFrame_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP -#define CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP +#pragma once #include "interpreter/bytecodeInterpreter.hpp" #include "oops/method.hpp" @@ -80,5 +79,3 @@ int buflen) const; }; #endif // CC_INTERP - -#endif // CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP diff --git a/src/hotspot/cpu/zero/interpreterRT_zero.hpp b/src/hotspot/cpu/zero/interpreterRT_zero.hpp --- a/src/hotspot/cpu/zero/interpreterRT_zero.hpp +++ b/src/hotspot/cpu/zero/interpreterRT_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP -#define CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP +#pragma once // This is included in the middle of class Interpreter. // Do not include files here. @@ -132,5 +131,3 @@ return (SignatureHandler *) cif(); } }; - -#endif // CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP diff --git a/src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp b/src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp --- a/src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp +++ b/src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP -#define CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP +#pragma once private: ZeroFrame* volatile _last_Java_fp; @@ -92,5 +91,3 @@ static ByteSize last_Java_fp_offset() { return byte_offset_of(JavaFrameAnchor, _last_Java_fp); } - -#endif // CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP diff --git a/src/hotspot/cpu/zero/jniTypes_zero.hpp b/src/hotspot/cpu/zero/jniTypes_zero.hpp --- a/src/hotspot/cpu/zero/jniTypes_zero.hpp +++ b/src/hotspot/cpu/zero/jniTypes_zero.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ZERO_VM_JNITYPES_ZERO_HPP -#define CPU_ZERO_VM_JNITYPES_ZERO_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -113,5 +112,3 @@ #endif }; - -#endif // CPU_ZERO_VM_JNITYPES_ZERO_HPP diff --git a/src/hotspot/cpu/zero/macroAssembler_zero.hpp b/src/hotspot/cpu/zero/macroAssembler_zero.hpp --- a/src/hotspot/cpu/zero/macroAssembler_zero.hpp +++ b/src/hotspot/cpu/zero/macroAssembler_zero.hpp @@ -22,9 +22,6 @@ * */ -#ifndef CPU_ZERO_VM_MACROASSEMBLER_ZERO_HPP -#define CPU_ZERO_VM_MACROASSEMBLER_ZERO_HPP +#pragma once // Needed for includes in shared files. - -#endif // CPU_ZERO_VM_MACROASSEMBLER_ZERO_HPP diff --git a/src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp b/src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp --- a/src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp +++ b/src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp @@ -22,9 +22,6 @@ * */ -#ifndef CPU_ZERO_VM_MACROASSEMBLER_ZERO_INLINE_HPP -#define CPU_ZERO_VM_MACROASSEMBLER_ZERO_INLINE_HPP +#pragma once // Needed for includes in shared files. - -#endif // CPU_ZERO_VM_MACROASSEMBLER_ZERO_INLINE_HPP diff --git a/src/hotspot/cpu/zero/nativeInst_zero.hpp b/src/hotspot/cpu/zero/nativeInst_zero.hpp --- a/src/hotspot/cpu/zero/nativeInst_zero.hpp +++ b/src/hotspot/cpu/zero/nativeInst_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_NATIVEINST_ZERO_HPP -#define CPU_ZERO_VM_NATIVEINST_ZERO_HPP +#pragma once #include "asm/assembler.hpp" #include "runtime/icache.hpp" @@ -209,5 +208,3 @@ ShouldNotCallThis(); return NULL; } - -#endif // CPU_ZERO_VM_NATIVEINST_ZERO_HPP diff --git a/src/hotspot/cpu/zero/registerMap_zero.hpp b/src/hotspot/cpu/zero/registerMap_zero.hpp --- a/src/hotspot/cpu/zero/registerMap_zero.hpp +++ b/src/hotspot/cpu/zero/registerMap_zero.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ZERO_VM_REGISTERMAP_ZERO_HPP -#define CPU_ZERO_VM_REGISTERMAP_ZERO_HPP +#pragma once // machine-dependent implemention for register maps friend class frame; @@ -40,5 +39,3 @@ void pd_clear() {} void pd_initialize() {} void pd_initialize_from(const RegisterMap* map) {} - -#endif // CPU_ZERO_VM_REGISTERMAP_ZERO_HPP diff --git a/src/hotspot/cpu/zero/register_zero.hpp b/src/hotspot/cpu/zero/register_zero.hpp --- a/src/hotspot/cpu/zero/register_zero.hpp +++ b/src/hotspot/cpu/zero/register_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_REGISTER_ZERO_HPP -#define CPU_ZERO_VM_REGISTER_ZERO_HPP +#pragma once #include "asm/register.hpp" #include "vm_version_zero.hpp" @@ -117,5 +116,3 @@ #ifndef DONT_USE_REGISTER_DEFINES #define noreg ((Register)(noreg_RegisterEnumValue)) #endif - -#endif // CPU_ZERO_VM_REGISTER_ZERO_HPP diff --git a/src/hotspot/cpu/zero/relocInfo_zero.hpp b/src/hotspot/cpu/zero/relocInfo_zero.hpp --- a/src/hotspot/cpu/zero/relocInfo_zero.hpp +++ b/src/hotspot/cpu/zero/relocInfo_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_RELOCINFO_ZERO_HPP -#define CPU_ZERO_VM_RELOCINFO_ZERO_HPP +#pragma once // machine-dependent parts of class relocInfo private: @@ -37,5 +36,3 @@ public: static bool mustIterateImmediateOopsInCode() { return true; } - -#endif // CPU_ZERO_VM_RELOCINFO_ZERO_HPP diff --git a/src/hotspot/cpu/zero/stack_zero.hpp b/src/hotspot/cpu/zero/stack_zero.hpp --- a/src/hotspot/cpu/zero/stack_zero.hpp +++ b/src/hotspot/cpu/zero/stack_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_STACK_ZERO_HPP -#define CPU_ZERO_VM_STACK_ZERO_HPP +#pragma once #include "utilities/align.hpp" #include "utilities/sizes.hpp" @@ -211,5 +210,3 @@ char* fieldbuf, int buflen) const; }; - -#endif // CPU_ZERO_VM_STACK_ZERO_HPP diff --git a/src/hotspot/cpu/zero/stack_zero.inline.hpp b/src/hotspot/cpu/zero/stack_zero.inline.hpp --- a/src/hotspot/cpu/zero/stack_zero.inline.hpp +++ b/src/hotspot/cpu/zero/stack_zero.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_STACK_ZERO_INLINE_HPP -#define CPU_ZERO_VM_STACK_ZERO_INLINE_HPP +#pragma once #include "runtime/thread.hpp" #include "stack_zero.hpp" @@ -53,5 +52,3 @@ int stack_free = thread->stack_size() - stack_used; return stack_free; } - -#endif // CPU_ZERO_VM_STACK_ZERO_INLINE_HPP diff --git a/src/hotspot/cpu/zero/stubRoutines_zero.hpp b/src/hotspot/cpu/zero/stubRoutines_zero.hpp --- a/src/hotspot/cpu/zero/stubRoutines_zero.hpp +++ b/src/hotspot/cpu/zero/stubRoutines_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_STUBROUTINES_ZERO_HPP -#define CPU_ZERO_VM_STUBROUTINES_ZERO_HPP +#pragma once // This file holds the platform specific parts of the StubRoutines // definition. See stubRoutines.hpp for a description on how to @@ -47,5 +46,3 @@ enum method_handles_platform_dependent_constants { method_handles_adapters_code_size = 0 }; - -#endif // CPU_ZERO_VM_STUBROUTINES_ZERO_HPP diff --git a/src/hotspot/cpu/zero/vmStructs_zero.hpp b/src/hotspot/cpu/zero/vmStructs_zero.hpp --- a/src/hotspot/cpu/zero/vmStructs_zero.hpp +++ b/src/hotspot/cpu/zero/vmStructs_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP -#define CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP +#pragma once // These are the CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -37,5 +36,3 @@ #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP diff --git a/src/hotspot/cpu/zero/vm_version_ext_zero.hpp b/src/hotspot/cpu/zero/vm_version_ext_zero.hpp --- a/src/hotspot/cpu/zero/vm_version_ext_zero.hpp +++ b/src/hotspot/cpu/zero/vm_version_ext_zero.hpp @@ -22,8 +22,7 @@ * */ -#ifndef CPU_ZERO_VM_VM_VERSION_EXT_ZERO_HPP -#define CPU_ZERO_VM_VM_VERSION_EXT_ZERO_HPP +#pragma once #include "utilities/macros.hpp" #include "vm_version_zero.hpp" @@ -50,5 +49,3 @@ static void initialize_cpu_information(void); }; - -#endif // CPU_ZERO_VM_VM_VERSION_EXT_ZERO_HPP diff --git a/src/hotspot/cpu/zero/vm_version_zero.hpp b/src/hotspot/cpu/zero/vm_version_zero.hpp --- a/src/hotspot/cpu/zero/vm_version_zero.hpp +++ b/src/hotspot/cpu/zero/vm_version_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_VM_VERSION_ZERO_HPP -#define CPU_ZERO_VM_VM_VERSION_ZERO_HPP +#pragma once #include "runtime/globals_extension.hpp" #include "runtime/vm_version.hpp" @@ -33,5 +32,3 @@ public: static void initialize(); }; - -#endif // CPU_ZERO_VM_VM_VERSION_ZERO_HPP diff --git a/src/hotspot/cpu/zero/vmreg_zero.hpp b/src/hotspot/cpu/zero/vmreg_zero.hpp --- a/src/hotspot/cpu/zero/vmreg_zero.hpp +++ b/src/hotspot/cpu/zero/vmreg_zero.hpp @@ -22,13 +22,10 @@ * */ -#ifndef CPU_ZERO_VM_VMREG_ZERO_HPP -#define CPU_ZERO_VM_VMREG_ZERO_HPP +#pragma once bool is_Register(); Register as_Register(); bool is_FloatRegister(); FloatRegister as_FloatRegister(); - -#endif // CPU_ZERO_VM_VMREG_ZERO_HPP diff --git a/src/hotspot/cpu/zero/vmreg_zero.inline.hpp b/src/hotspot/cpu/zero/vmreg_zero.inline.hpp --- a/src/hotspot/cpu/zero/vmreg_zero.inline.hpp +++ b/src/hotspot/cpu/zero/vmreg_zero.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP -#define CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP +#pragma once inline VMReg RegisterImpl::as_VMReg() { return VMRegImpl::as_VMReg(encoding()); @@ -33,5 +32,3 @@ inline VMReg FloatRegisterImpl::as_VMReg() { return VMRegImpl::as_VMReg(encoding() + ConcreteRegisterImpl::max_gpr); } - -#endif // CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP diff --git a/src/hotspot/os/aix/c1_globals_aix.hpp b/src/hotspot/os/aix/c1_globals_aix.hpp --- a/src/hotspot/os/aix/c1_globals_aix.hpp +++ b/src/hotspot/os/aix/c1_globals_aix.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_AIX_VM_C1_GLOBALS_AIX_HPP -#define OS_AIX_VM_C1_GLOBALS_AIX_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -33,5 +32,3 @@ // Sets the default values for operating system dependent flags used by the // client compiler. (see c1_globals.hpp) // - -#endif // OS_AIX_VM_C1_GLOBALS_AIX_HPP diff --git a/src/hotspot/os/aix/c2_globals_aix.hpp b/src/hotspot/os/aix/c2_globals_aix.hpp --- a/src/hotspot/os/aix/c2_globals_aix.hpp +++ b/src/hotspot/os/aix/c2_globals_aix.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_AIX_VM_C2_GLOBALS_AIX_HPP -#define OS_AIX_VM_C2_GLOBALS_AIX_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -33,5 +32,3 @@ // Sets the default values for operating system dependent flags used by the // server compiler. (see c2_globals.hpp) // - -#endif // OS_AIX_VM_C2_GLOBALS_AIX_HPP diff --git a/src/hotspot/os/aix/globals_aix.hpp b/src/hotspot/os/aix/globals_aix.hpp --- a/src/hotspot/os/aix/globals_aix.hpp +++ b/src/hotspot/os/aix/globals_aix.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_AIX_VM_GLOBALS_AIX_HPP -#define OS_AIX_VM_GLOBALS_AIX_HPP +#pragma once // // Defines Aix specific flags. They are not available on other platforms. @@ -93,5 +92,3 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, false); define_pd_global(bool, UseOSErrorReporting, false); define_pd_global(bool, UseThreadPriorities, true) ; - -#endif // OS_AIX_VM_GLOBALS_AIX_HPP diff --git a/src/hotspot/os/aix/libo4.hpp b/src/hotspot/os/aix/libo4.hpp --- a/src/hotspot/os/aix/libo4.hpp +++ b/src/hotspot/os/aix/libo4.hpp @@ -29,8 +29,7 @@ // functionality (aka ILE layer) to close some functional gaps that exist in // the PASE layer. -#ifndef OS_AIX_VM_LIBO4_HPP -#define OS_AIX_VM_LIBO4_HPP +#pragma once class libo4 { public: @@ -86,5 +85,3 @@ // See libo4.h for details on this API. static bool removeEscapeMessageFromJoblogByContext(const void* context); }; - -#endif // OS_AIX_VM_LIBO4_HPP diff --git a/src/hotspot/os/aix/libodm_aix.hpp b/src/hotspot/os/aix/libodm_aix.hpp --- a/src/hotspot/os/aix/libodm_aix.hpp +++ b/src/hotspot/os/aix/libodm_aix.hpp @@ -25,8 +25,7 @@ // Encapsulates the libodm library and provides more convenient interfaces. -#ifndef OS_AIX_VM_LIBODM_AIX_HPP -#define OS_AIX_VM_LIBODM_AIX_HPP +#pragma once #include @@ -102,5 +101,3 @@ // The high order 2 bytes must be initialized already. They can be determined by uname. static void determine_os_kernel_version(uint32_t* p_ver); }; - -#endif // OS_AIX_VM_LIBODM_AIX_HPP diff --git a/src/hotspot/os/aix/libperfstat_aix.hpp b/src/hotspot/os/aix/libperfstat_aix.hpp --- a/src/hotspot/os/aix/libperfstat_aix.hpp +++ b/src/hotspot/os/aix/libperfstat_aix.hpp @@ -29,8 +29,7 @@ // AIX-specific library which only exists on AIX, not on PASE. If I want to // share binaries between AIX and PASE, I cannot directly link against libperfstat.so. -#ifndef OS_AIX_VM_LIBPERFSTAT_AIX_HPP -#define OS_AIX_VM_LIBPERFSTAT_AIX_HPP +#pragma once #include #include @@ -965,5 +964,3 @@ static bool get_cpuinfo(cpuinfo_t* pci); static bool get_wparinfo(wparinfo_t* pwi); }; - -#endif // OS_AIX_VM_LIBPERFSTAT_AIX_HPP diff --git a/src/hotspot/os/aix/loadlib_aix.hpp b/src/hotspot/os/aix/loadlib_aix.hpp --- a/src/hotspot/os/aix/loadlib_aix.hpp +++ b/src/hotspot/os/aix/loadlib_aix.hpp @@ -29,8 +29,7 @@ // It is needed, among other things, to provide dladdr(3), which is // missing on AIX. -#ifndef OS_AIX_VM_LOADLIB_AIX_HPP -#define OS_AIX_VM_LOADLIB_AIX_HPP +#pragma once #include @@ -100,5 +99,3 @@ static void print(outputStream* os); }; - -#endif // OS_AIX_VM_LOADLIB_AIX_HPP diff --git a/src/hotspot/os/aix/misc_aix.hpp b/src/hotspot/os/aix/misc_aix.hpp --- a/src/hotspot/os/aix/misc_aix.hpp +++ b/src/hotspot/os/aix/misc_aix.hpp @@ -23,8 +23,7 @@ */ -#ifndef OS_AIX_VM_MISC_AIX_HPP -#define OS_AIX_VM_MISC_AIX_HPP +#pragma once // misc_aix.hpp, misc_aix.cpp: convenience functions needed for the OpenJDK AIX // port. @@ -89,6 +88,3 @@ } }; } - -#endif // OS_AIX_VM_MISC_AIX_HPP - diff --git a/src/hotspot/os/aix/osThread_aix.hpp b/src/hotspot/os/aix/osThread_aix.hpp --- a/src/hotspot/os/aix/osThread_aix.hpp +++ b/src/hotspot/os/aix/osThread_aix.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_AIX_VM_OSTHREAD_AIX_HPP -#define OS_AIX_VM_OSTHREAD_AIX_HPP +#pragma once public: typedef pthread_t thread_id_t; @@ -149,5 +148,3 @@ jlong sys; jlong user; } _last_cpu_times; - -#endif // OS_AIX_VM_OSTHREAD_AIX_HPP diff --git a/src/hotspot/os/aix/os_aix.hpp b/src/hotspot/os/aix/os_aix.hpp --- a/src/hotspot/os/aix/os_aix.hpp +++ b/src/hotspot/os/aix/os_aix.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_AIX_VM_OS_AIX_HPP -#define OS_AIX_VM_OS_AIX_HPP +#pragma once // Information about the protection of the page at address '0' on this os. static bool zero_page_read_protected() { return false; } @@ -211,5 +210,3 @@ static bool get_meminfo(meminfo_t* pmi); }; - -#endif // OS_AIX_VM_OS_AIX_HPP diff --git a/src/hotspot/os/aix/os_aix.inline.hpp b/src/hotspot/os/aix/os_aix.inline.hpp --- a/src/hotspot/os/aix/os_aix.inline.hpp +++ b/src/hotspot/os/aix/os_aix.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_AIX_VM_OS_AIX_INLINE_HPP -#define OS_AIX_VM_OS_AIX_INLINE_HPP +#pragma once #include "runtime/os.hpp" @@ -150,5 +149,3 @@ inline void os::exit(int num) { ::exit(num); } - -#endif // OS_AIX_VM_OS_AIX_INLINE_HPP diff --git a/src/hotspot/os/aix/os_share_aix.hpp b/src/hotspot/os/aix/os_share_aix.hpp --- a/src/hotspot/os/aix/os_share_aix.hpp +++ b/src/hotspot/os/aix/os_share_aix.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_AIX_VM_OS_SHARE_AIX_HPP -#define OS_AIX_VM_OS_SHARE_AIX_HPP +#pragma once // misc void handle_unexpected_exception(Thread* thread, int sig, siginfo_t* info, address pc, address adjusted_pc); @@ -32,5 +31,3 @@ #endif #define PROCFILE_LENGTH 128 - -#endif // OS_AIX_VM_OS_SHARE_AIX_HPP diff --git a/src/hotspot/os/aix/porting_aix.hpp b/src/hotspot/os/aix/porting_aix.hpp --- a/src/hotspot/os/aix/porting_aix.hpp +++ b/src/hotspot/os/aix/porting_aix.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_AIX_VM_PORTING_AIX_HPP -#define OS_AIX_VM_PORTING_AIX_HPP +#pragma once #include @@ -106,6 +105,3 @@ static bool query_stack_bounds_for_current_thread(stackbounds_t* out); }; - -#endif // OS_AIX_VM_PORTING_AIX_HPP - diff --git a/src/hotspot/os/aix/vmStructs_aix.hpp b/src/hotspot/os/aix/vmStructs_aix.hpp --- a/src/hotspot/os/aix/vmStructs_aix.hpp +++ b/src/hotspot/os/aix/vmStructs_aix.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_AIX_VM_VMSTRUCTS_AIX_HPP -#define OS_AIX_VM_VMSTRUCTS_AIX_HPP +#pragma once // These are the OS-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -38,5 +37,3 @@ #define VM_LONG_CONSTANTS_OS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) - -#endif // OS_AIX_VM_VMSTRUCTS_AIX_HPP diff --git a/src/hotspot/os/bsd/c1_globals_bsd.hpp b/src/hotspot/os/bsd/c1_globals_bsd.hpp --- a/src/hotspot/os/bsd/c1_globals_bsd.hpp +++ b/src/hotspot/os/bsd/c1_globals_bsd.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_BSD_VM_C1_GLOBALS_BSD_HPP -#define OS_BSD_VM_C1_GLOBALS_BSD_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -32,5 +31,3 @@ // Sets the default values for operating system dependent flags used by the // client compiler. (see c1_globals.hpp) // - -#endif // OS_BSD_VM_C1_GLOBALS_BSD_HPP diff --git a/src/hotspot/os/bsd/c2_globals_bsd.hpp b/src/hotspot/os/bsd/c2_globals_bsd.hpp --- a/src/hotspot/os/bsd/c2_globals_bsd.hpp +++ b/src/hotspot/os/bsd/c2_globals_bsd.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_BSD_VM_C2_GLOBALS_BSD_HPP -#define OS_BSD_VM_C2_GLOBALS_BSD_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -32,5 +31,3 @@ // Sets the default values for operating system dependent flags used by the // server compiler. (see c2_globals.hpp) // - -#endif // OS_BSD_VM_C2_GLOBALS_BSD_HPP diff --git a/src/hotspot/os/bsd/decoder_machO.hpp b/src/hotspot/os/bsd/decoder_machO.hpp --- a/src/hotspot/os/bsd/decoder_machO.hpp +++ b/src/hotspot/os/bsd/decoder_machO.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_BSD_VM_DECODER_MACHO_HPP -#define OS_BSD_VM_DECODER_MACHO_HPP +#pragma once #ifdef __APPLE__ @@ -50,5 +49,3 @@ }; #endif - -#endif // OS_BSD_VM_DECODER_MACHO_HPP diff --git a/src/hotspot/os/bsd/globals_bsd.hpp b/src/hotspot/os/bsd/globals_bsd.hpp --- a/src/hotspot/os/bsd/globals_bsd.hpp +++ b/src/hotspot/os/bsd/globals_bsd.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_BSD_VM_GLOBALS_BSD_HPP -#define OS_BSD_VM_GLOBALS_BSD_HPP +#pragma once // // Defines Bsd specific flags. They are not available on other platforms. @@ -55,5 +54,3 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, false); define_pd_global(bool, UseOSErrorReporting, false); define_pd_global(bool, UseThreadPriorities, true) ; - -#endif // OS_BSD_VM_GLOBALS_BSD_HPP diff --git a/src/hotspot/os/bsd/osThread_bsd.hpp b/src/hotspot/os/bsd/osThread_bsd.hpp --- a/src/hotspot/os/bsd/osThread_bsd.hpp +++ b/src/hotspot/os/bsd/osThread_bsd.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_BSD_VM_OSTHREAD_BSD_HPP -#define OS_BSD_VM_OSTHREAD_BSD_HPP +#pragma once private: int _thread_type; @@ -148,5 +147,3 @@ // Reconciliation History // osThread_solaris.hpp 1.24 99/08/27 13:11:54 // End - -#endif // OS_BSD_VM_OSTHREAD_BSD_HPP diff --git a/src/hotspot/os/bsd/os_bsd.hpp b/src/hotspot/os/bsd/os_bsd.hpp --- a/src/hotspot/os/bsd/os_bsd.hpp +++ b/src/hotspot/os/bsd/os_bsd.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_BSD_VM_OS_BSD_HPP -#define OS_BSD_VM_OS_BSD_HPP +#pragma once // Bsd_OS defines the interface to Bsd operating systems @@ -158,5 +157,3 @@ } static int get_node_by_cpu(int cpu_id); }; - -#endif // OS_BSD_VM_OS_BSD_HPP diff --git a/src/hotspot/os/bsd/os_bsd.inline.hpp b/src/hotspot/os/bsd/os_bsd.inline.hpp --- a/src/hotspot/os/bsd/os_bsd.inline.hpp +++ b/src/hotspot/os/bsd/os_bsd.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_BSD_VM_OS_BSD_INLINE_HPP -#define OS_BSD_VM_OS_BSD_INLINE_HPP +#pragma once #include "runtime/os.hpp" @@ -155,5 +154,3 @@ inline void os::exit(int num) { ::exit(num); } - -#endif // OS_BSD_VM_OS_BSD_INLINE_HPP diff --git a/src/hotspot/os/bsd/os_share_bsd.hpp b/src/hotspot/os/bsd/os_share_bsd.hpp --- a/src/hotspot/os/bsd/os_share_bsd.hpp +++ b/src/hotspot/os/bsd/os_share_bsd.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_BSD_VM_OS_SHARE_BSD_HPP -#define OS_BSD_VM_OS_SHARE_BSD_HPP +#pragma once // misc void handle_unexpected_exception(Thread* thread, int sig, siginfo_t* info, address pc, address adjusted_pc); @@ -32,5 +31,3 @@ #endif #define PROCFILE_LENGTH 128 - -#endif // OS_BSD_VM_OS_SHARE_BSD_HPP diff --git a/src/hotspot/os/bsd/semaphore_bsd.hpp b/src/hotspot/os/bsd/semaphore_bsd.hpp --- a/src/hotspot/os/bsd/semaphore_bsd.hpp +++ b/src/hotspot/os/bsd/semaphore_bsd.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_BSD_VM_SEMAPHORE_BSD_HPP -#define OS_BSD_VM_SEMAPHORE_BSD_HPP +#pragma once #ifndef __APPLE__ // Use POSIX semaphores. @@ -59,5 +58,3 @@ typedef OSXSemaphore SemaphoreImpl; #endif // __APPLE__ - -#endif // OS_BSD_VM_SEMAPHORE_BSD_HPP diff --git a/src/hotspot/os/bsd/vmStructs_bsd.hpp b/src/hotspot/os/bsd/vmStructs_bsd.hpp --- a/src/hotspot/os/bsd/vmStructs_bsd.hpp +++ b/src/hotspot/os/bsd/vmStructs_bsd.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_BSD_VM_VMSTRUCTS_BSD_HPP -#define OS_BSD_VM_VMSTRUCTS_BSD_HPP +#pragma once #include @@ -41,5 +40,3 @@ #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \ declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT) - -#endif // OS_BSD_VM_VMSTRUCTS_BSD_HPP diff --git a/src/hotspot/os/linux/c1_globals_linux.hpp b/src/hotspot/os/linux/c1_globals_linux.hpp --- a/src/hotspot/os/linux/c1_globals_linux.hpp +++ b/src/hotspot/os/linux/c1_globals_linux.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_LINUX_VM_C1_GLOBALS_LINUX_HPP -#define OS_LINUX_VM_C1_GLOBALS_LINUX_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -32,5 +31,3 @@ // Sets the default values for operating system dependent flags used by the // client compiler. (see c1_globals.hpp) // - -#endif // OS_LINUX_VM_C1_GLOBALS_LINUX_HPP diff --git a/src/hotspot/os/linux/c2_globals_linux.hpp b/src/hotspot/os/linux/c2_globals_linux.hpp --- a/src/hotspot/os/linux/c2_globals_linux.hpp +++ b/src/hotspot/os/linux/c2_globals_linux.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_LINUX_VM_C2_GLOBALS_LINUX_HPP -#define OS_LINUX_VM_C2_GLOBALS_LINUX_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -32,5 +31,3 @@ // Sets the default values for operating system dependent flags used by the // server compiler. (see c2_globals.hpp) // - -#endif // OS_LINUX_VM_C2_GLOBALS_LINUX_HPP diff --git a/src/hotspot/os/linux/globals_linux.hpp b/src/hotspot/os/linux/globals_linux.hpp --- a/src/hotspot/os/linux/globals_linux.hpp +++ b/src/hotspot/os/linux/globals_linux.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_LINUX_VM_GLOBALS_LINUX_HPP -#define OS_LINUX_VM_GLOBALS_LINUX_HPP +#pragma once // // Defines Linux specific flags. They are not available on other platforms. @@ -83,5 +82,3 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, false); define_pd_global(bool, UseOSErrorReporting, false); define_pd_global(bool, UseThreadPriorities, true) ; - -#endif // OS_LINUX_VM_GLOBALS_LINUX_HPP diff --git a/src/hotspot/os/linux/osContainer_linux.hpp b/src/hotspot/os/linux/osContainer_linux.hpp --- a/src/hotspot/os/linux/osContainer_linux.hpp +++ b/src/hotspot/os/linux/osContainer_linux.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_LINUX_VM_OSCONTAINER_LINUX_HPP -#define OS_LINUX_VM_OSCONTAINER_LINUX_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -64,5 +63,3 @@ assert(_is_initialized, "OSContainer not initialized"); return _is_containerized; } - -#endif // OS_LINUX_VM_OSCONTAINER_LINUX_HPP diff --git a/src/hotspot/os/linux/osThread_linux.hpp b/src/hotspot/os/linux/osThread_linux.hpp --- a/src/hotspot/os/linux/osThread_linux.hpp +++ b/src/hotspot/os/linux/osThread_linux.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_LINUX_VM_OSTHREAD_LINUX_HPP -#define OS_LINUX_VM_OSTHREAD_LINUX_HPP +#pragma once public: typedef pid_t thread_id_t; @@ -131,5 +130,3 @@ // Reconciliation History // osThread_solaris.hpp 1.24 99/08/27 13:11:54 // End - -#endif // OS_LINUX_VM_OSTHREAD_LINUX_HPP diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp --- a/src/hotspot/os/linux/os_linux.hpp +++ b/src/hotspot/os/linux/os_linux.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_LINUX_VM_OS_LINUX_HPP -#define OS_LINUX_VM_OS_LINUX_HPP +#pragma once // Linux_OS defines the interface to Linux operating systems @@ -352,5 +351,3 @@ } } }; - -#endif // OS_LINUX_VM_OS_LINUX_HPP diff --git a/src/hotspot/os/linux/os_linux.inline.hpp b/src/hotspot/os/linux/os_linux.inline.hpp --- a/src/hotspot/os/linux/os_linux.inline.hpp +++ b/src/hotspot/os/linux/os_linux.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_LINUX_VM_OS_LINUX_INLINE_HPP -#define OS_LINUX_VM_OS_LINUX_INLINE_HPP +#pragma once #include "runtime/os.hpp" @@ -143,5 +142,3 @@ inline void os::exit(int num) { ::exit(num); } - -#endif // OS_LINUX_VM_OS_LINUX_INLINE_HPP diff --git a/src/hotspot/os/linux/os_share_linux.hpp b/src/hotspot/os/linux/os_share_linux.hpp --- a/src/hotspot/os/linux/os_share_linux.hpp +++ b/src/hotspot/os/linux/os_share_linux.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_LINUX_VM_OS_SHARE_LINUX_HPP -#define OS_LINUX_VM_OS_SHARE_LINUX_HPP +#pragma once // misc void handle_unexpected_exception(Thread* thread, int sig, siginfo_t* info, address pc, address adjusted_pc); @@ -32,5 +31,3 @@ #endif #define PROCFILE_LENGTH 128 - -#endif // OS_LINUX_VM_OS_SHARE_LINUX_HPP diff --git a/src/hotspot/os/linux/vmStructs_linux.hpp b/src/hotspot/os/linux/vmStructs_linux.hpp --- a/src/hotspot/os/linux/vmStructs_linux.hpp +++ b/src/hotspot/os/linux/vmStructs_linux.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_LINUX_VM_VMSTRUCTS_LINUX_HPP -#define OS_LINUX_VM_VMSTRUCTS_LINUX_HPP +#pragma once #include @@ -41,5 +40,3 @@ #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \ declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT) - -#endif // OS_LINUX_VM_VMSTRUCTS_LINUX_HPP diff --git a/src/hotspot/os/posix/os_posix.hpp b/src/hotspot/os/posix/os_posix.hpp --- a/src/hotspot/os/posix/os_posix.hpp +++ b/src/hotspot/os/posix/os_posix.hpp @@ -24,8 +24,7 @@ #include "runtime/os.hpp" -#ifndef OS_POSIX_VM_OS_POSIX_HPP -#define OS_POSIX_VM_OS_POSIX_HPP +#pragma once // File conventions static const char* file_separator() { return "/"; } @@ -223,5 +222,3 @@ }; #endif // !SOLARIS - -#endif // OS_POSIX_VM_OS_POSIX_HPP diff --git a/src/hotspot/os/posix/semaphore_posix.hpp b/src/hotspot/os/posix/semaphore_posix.hpp --- a/src/hotspot/os/posix/semaphore_posix.hpp +++ b/src/hotspot/os/posix/semaphore_posix.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_POSIX_VM_SEMAPHORE_POSIX_HPP -#define OS_POSIX_VM_SEMAPHORE_POSIX_HPP +#pragma once #include "memory/allocation.hpp" @@ -49,5 +48,3 @@ }; typedef PosixSemaphore SemaphoreImpl; - -#endif // OS_POSIX_VM_SEMAPHORE_POSIX_HPP diff --git a/src/hotspot/os/solaris/c1_globals_solaris.hpp b/src/hotspot/os/solaris/c1_globals_solaris.hpp --- a/src/hotspot/os/solaris/c1_globals_solaris.hpp +++ b/src/hotspot/os/solaris/c1_globals_solaris.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_SOLARIS_VM_C1_GLOBALS_SOLARIS_HPP -#define OS_SOLARIS_VM_C1_GLOBALS_SOLARIS_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -32,5 +31,3 @@ // Sets the default values for operating system dependent flags used by the // client compiler. (see c1_globals.hpp) // - -#endif // OS_SOLARIS_VM_C1_GLOBALS_SOLARIS_HPP diff --git a/src/hotspot/os/solaris/c2_globals_solaris.hpp b/src/hotspot/os/solaris/c2_globals_solaris.hpp --- a/src/hotspot/os/solaris/c2_globals_solaris.hpp +++ b/src/hotspot/os/solaris/c2_globals_solaris.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_SOLARIS_VM_C2_GLOBALS_SOLARIS_HPP -#define OS_SOLARIS_VM_C2_GLOBALS_SOLARIS_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -32,5 +31,3 @@ // Sets the default values for operating system dependent flags used by the // server compiler. (see c2_globals.hpp) // - -#endif // OS_SOLARIS_VM_C2_GLOBALS_SOLARIS_HPP diff --git a/src/hotspot/os/solaris/globals_solaris.hpp b/src/hotspot/os/solaris/globals_solaris.hpp --- a/src/hotspot/os/solaris/globals_solaris.hpp +++ b/src/hotspot/os/solaris/globals_solaris.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_SOLARIS_VM_GLOBALS_SOLARIS_HPP -#define OS_SOLARIS_VM_GLOBALS_SOLARIS_HPP +#pragma once // // Defines Solaris specific flags. They are not available on other platforms. @@ -50,5 +49,3 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, false); define_pd_global(bool, UseOSErrorReporting, false); define_pd_global(bool, UseThreadPriorities, false); - -#endif // OS_SOLARIS_VM_GLOBALS_SOLARIS_HPP diff --git a/src/hotspot/os/solaris/osThread_solaris.hpp b/src/hotspot/os/solaris/osThread_solaris.hpp --- a/src/hotspot/os/solaris/osThread_solaris.hpp +++ b/src/hotspot/os/solaris/osThread_solaris.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_SOLARIS_VM_OSTHREAD_SOLARIS_HPP -#define OS_SOLARIS_VM_OSTHREAD_SOLARIS_HPP +#pragma once // This is embedded via include into the class OSThread public: @@ -84,5 +83,3 @@ void pd_initialize(); void pd_destroy(); - -#endif // OS_SOLARIS_VM_OSTHREAD_SOLARIS_HPP diff --git a/src/hotspot/os/solaris/os_share_solaris.hpp b/src/hotspot/os/solaris/os_share_solaris.hpp --- a/src/hotspot/os/solaris/os_share_solaris.hpp +++ b/src/hotspot/os/solaris/os_share_solaris.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_SOLARIS_VM_OS_SHARE_SOLARIS_HPP -#define OS_SOLARIS_VM_OS_SHARE_SOLARIS_HPP +#pragma once // Defines the interfaces to Solaris operating systems that vary across platforms @@ -38,5 +37,3 @@ #endif #define PROCFILE_LENGTH 128 - -#endif // OS_SOLARIS_VM_OS_SHARE_SOLARIS_HPP diff --git a/src/hotspot/os/solaris/os_solaris.hpp b/src/hotspot/os/solaris/os_solaris.hpp --- a/src/hotspot/os/solaris/os_solaris.hpp +++ b/src/hotspot/os/solaris/os_solaris.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_SOLARIS_VM_OS_SOLARIS_HPP -#define OS_SOLARIS_VM_OS_SOLARIS_HPP +#pragma once // Solaris_OS defines the interface to Solaris operating systems @@ -334,5 +333,3 @@ assert_status(status == 0, status, "mutex_init"); } }; - -#endif // OS_SOLARIS_VM_OS_SOLARIS_HPP diff --git a/src/hotspot/os/solaris/os_solaris.inline.hpp b/src/hotspot/os/solaris/os_solaris.inline.hpp --- a/src/hotspot/os/solaris/os_solaris.inline.hpp +++ b/src/hotspot/os/solaris/os_solaris.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP -#define OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP +#pragma once #include "runtime/os.hpp" @@ -104,5 +103,3 @@ inline void os::exit(int num) { ::exit(num); } - -#endif // OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP diff --git a/src/hotspot/os/solaris/vmStructs_solaris.hpp b/src/hotspot/os/solaris/vmStructs_solaris.hpp --- a/src/hotspot/os/solaris/vmStructs_solaris.hpp +++ b/src/hotspot/os/solaris/vmStructs_solaris.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_SOLARIS_VM_VMSTRUCTS_SOLARIS_HPP -#define OS_SOLARIS_VM_VMSTRUCTS_SOLARIS_HPP +#pragma once // These are the OS-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -40,5 +39,3 @@ #define VM_LONG_CONSTANTS_OS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) - -#endif // OS_SOLARIS_VM_VMSTRUCTS_SOLARIS_HPP diff --git a/src/hotspot/os/windows/c1_globals_windows.hpp b/src/hotspot/os/windows/c1_globals_windows.hpp --- a/src/hotspot/os/windows/c1_globals_windows.hpp +++ b/src/hotspot/os/windows/c1_globals_windows.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_WINDOWS_VM_C1_GLOBALS_WINDOWS_HPP -#define OS_WINDOWS_VM_C1_GLOBALS_WINDOWS_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -32,5 +31,3 @@ // Sets the default values for operating system dependent flags used by the // client compiler. (see c1_globals.hpp) // - -#endif // OS_WINDOWS_VM_C1_GLOBALS_WINDOWS_HPP diff --git a/src/hotspot/os/windows/c2_globals_windows.hpp b/src/hotspot/os/windows/c2_globals_windows.hpp --- a/src/hotspot/os/windows/c2_globals_windows.hpp +++ b/src/hotspot/os/windows/c2_globals_windows.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_WINDOWS_VM_C2_GLOBALS_WINDOWS_HPP -#define OS_WINDOWS_VM_C2_GLOBALS_WINDOWS_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -32,5 +31,3 @@ // Sets the default values for operating system dependent flags used by the // server compiler. (see c2_globals.hpp) // - -#endif // OS_WINDOWS_VM_C2_GLOBALS_WINDOWS_HPP diff --git a/src/hotspot/os/windows/globals_windows.hpp b/src/hotspot/os/windows/globals_windows.hpp --- a/src/hotspot/os/windows/globals_windows.hpp +++ b/src/hotspot/os/windows/globals_windows.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_WINDOWS_VM_GLOBALS_WINDOWS_HPP -#define OS_WINDOWS_VM_GLOBALS_WINDOWS_HPP +#pragma once // // Defines Windows specific flags. They are not available on other platforms. @@ -48,5 +47,3 @@ define_pd_global(bool, UseLargePagesIndividualAllocation, true); define_pd_global(bool, UseOSErrorReporting, false); // for now. define_pd_global(bool, UseThreadPriorities, true) ; - -#endif // OS_WINDOWS_VM_GLOBALS_WINDOWS_HPP diff --git a/src/hotspot/os/windows/iphlp_interface.hpp b/src/hotspot/os/windows/iphlp_interface.hpp --- a/src/hotspot/os/windows/iphlp_interface.hpp +++ b/src/hotspot/os/windows/iphlp_interface.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_WINDOWS_VM_IPHLP_INTERFACE_HPP -#define OS_WINDOWS_VM_IPHLP_INTERFACE_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/macros.hpp" @@ -47,5 +46,3 @@ static bool IphlpAttach(void); static bool IphlpDetach(void); }; - -#endif // OS_WINDOWS_VM_IPHLP_INTERFACE_HPP diff --git a/src/hotspot/os/windows/osThread_windows.hpp b/src/hotspot/os/windows/osThread_windows.hpp --- a/src/hotspot/os/windows/osThread_windows.hpp +++ b/src/hotspot/os/windows/osThread_windows.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_WINDOWS_VM_OSTHREAD_WINDOWS_HPP -#define OS_WINDOWS_VM_OSTHREAD_WINDOWS_HPP +#pragma once typedef void* HANDLE; public: @@ -65,5 +64,3 @@ private: void pd_initialize(); void pd_destroy(); - -#endif // OS_WINDOWS_VM_OSTHREAD_WINDOWS_HPP diff --git a/src/hotspot/os/windows/os_share_windows.hpp b/src/hotspot/os/windows/os_share_windows.hpp --- a/src/hotspot/os/windows/os_share_windows.hpp +++ b/src/hotspot/os/windows/os_share_windows.hpp @@ -22,9 +22,6 @@ * */ -#ifndef OS_WINDOWS_VM_OS_SHARE_WINDOWS_HPP -#define OS_WINDOWS_VM_OS_SHARE_WINDOWS_HPP +#pragma once // Defines the interfaces to Windows operating system that vary across platforms - -#endif // OS_WINDOWS_VM_OS_SHARE_WINDOWS_HPP diff --git a/src/hotspot/os/windows/os_windows.hpp b/src/hotspot/os/windows/os_windows.hpp --- a/src/hotspot/os/windows/os_windows.hpp +++ b/src/hotspot/os/windows/os_windows.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_WINDOWS_VM_OS_WINDOWS_HPP -#define OS_WINDOWS_VM_OS_WINDOWS_HPP +#pragma once // Win32_OS defines the interface to windows operating systems // strtok_s is the Windows thread-safe equivalent of POSIX strtok_r @@ -183,5 +182,3 @@ } } ; - -#endif // OS_WINDOWS_VM_OS_WINDOWS_HPP diff --git a/src/hotspot/os/windows/os_windows.inline.hpp b/src/hotspot/os/windows/os_windows.inline.hpp --- a/src/hotspot/os/windows/os_windows.inline.hpp +++ b/src/hotspot/os/windows/os_windows.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP -#define OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP +#pragma once #include "runtime/os.hpp" #include "runtime/thread.hpp" @@ -93,5 +92,3 @@ inline void os::exit(int num) { win32::exit_process_or_thread(win32::EPT_PROCESS, num); } - -#endif // OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP diff --git a/src/hotspot/os/windows/pdh_interface.hpp b/src/hotspot/os/windows/pdh_interface.hpp --- a/src/hotspot/os/windows/pdh_interface.hpp +++ b/src/hotspot/os/windows/pdh_interface.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_WINDOWS_VM_PDH_INTERFACE_HPP -#define OS_WINDOWS_VM_PDH_INTERFACE_HPP +#pragma once #include "memory/allocation.hpp" #include @@ -60,5 +59,3 @@ static bool PdhAttach(); static bool PdhDetach(); }; - -#endif // OS_WINDOWS_VM_PDH_INTERFACE_HPP diff --git a/src/hotspot/os/windows/semaphore_windows.hpp b/src/hotspot/os/windows/semaphore_windows.hpp --- a/src/hotspot/os/windows/semaphore_windows.hpp +++ b/src/hotspot/os/windows/semaphore_windows.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_WINDOWS_VM_SEMAPHORE_WINDOWS_HPP -#define OS_WINDOWS_VM_SEMAPHORE_WINDOWS_HPP +#pragma once #include "memory/allocation.hpp" @@ -48,5 +47,3 @@ }; typedef WindowsSemaphore SemaphoreImpl; - -#endif // OS_WINDOWS_VM_SEMAPHORE_WINDOWS_HPP diff --git a/src/hotspot/os/windows/symbolengine.hpp b/src/hotspot/os/windows/symbolengine.hpp --- a/src/hotspot/os/windows/symbolengine.hpp +++ b/src/hotspot/os/windows/symbolengine.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_WINDOWS_VM_SYMBOLENGINE_HPP -#define OS_WINDOWS_VM_SYMBOLENGINE_HPP +#pragma once class outputStream; @@ -57,7 +56,3 @@ void pre_initialize(); }; - -#endif // #ifndef OS_WINDOWS_VM_SYMBOLENGINE_HPP - - diff --git a/src/hotspot/os/windows/vmStructs_windows.hpp b/src/hotspot/os/windows/vmStructs_windows.hpp --- a/src/hotspot/os/windows/vmStructs_windows.hpp +++ b/src/hotspot/os/windows/vmStructs_windows.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_WINDOWS_VM_VMSTRUCTS_WINDOWS_HPP -#define OS_WINDOWS_VM_VMSTRUCTS_WINDOWS_HPP +#pragma once // These are the OS-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -38,5 +37,3 @@ #define VM_LONG_CONSTANTS_OS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) - -#endif // OS_WINDOWS_VM_VMSTRUCTS_WINDOWS_HPP diff --git a/src/hotspot/os/windows/windbghelp.hpp b/src/hotspot/os/windows/windbghelp.hpp --- a/src/hotspot/os/windows/windbghelp.hpp +++ b/src/hotspot/os/windows/windbghelp.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_WINDOWS_WINDBGHELP_HPP -#define OS_WINDOWS_WINDBGHELP_HPP +#pragma once #include #include @@ -70,6 +69,3 @@ void pre_initialize(); }; - -#endif // OS_WINDOWS_WINDBGHELP_HPP - diff --git a/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp --- a/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp +++ b/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_HPP -#define OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_HPP +#pragma once #ifndef PPC64 #error "Atomic currently only implemented for PPC64" @@ -416,5 +415,3 @@ #undef strasm_fence #undef strasm_nobarrier #undef strasm_nobarrier_clobber_memory - -#endif // OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_HPP diff --git a/src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp b/src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp --- a/src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp +++ b/src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp @@ -22,11 +22,8 @@ * */ -#ifndef OS_CPU_AIX_PPC_VM_BYTES_AIX_PPC_INLINE_HPP -#define OS_CPU_AIX_PPC_VM_BYTES_AIX_PPC_INLINE_HPP +#pragma once #if defined(VM_LITTLE_ENDIAN) // Aix is not little endian. #endif // VM_LITTLE_ENDIAN - -#endif // OS_CPU_AIX_PPC_VM_BYTES_AIX_PPC_INLINE_HPP diff --git a/src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp --- a/src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp +++ b/src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_AIX_OJDKPPC_VM_GLOBALS_AIX_PPC_HPP -#define OS_CPU_AIX_OJDKPPC_VM_GLOBALS_AIX_PPC_HPP +#pragma once // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) @@ -40,5 +39,3 @@ // Only used on 64 bit platforms define_pd_global(size_t, HeapBaseMinAddress, 2*G); - -#endif // OS_CPU_AIX_OJDKPPC_VM_GLOBALS_AIX_PPC_HPP diff --git a/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp --- a/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp +++ b/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_HPP -#define OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -89,5 +88,3 @@ #undef inlasm_lwsync #undef inlasm_eieio #undef inlasm_isync - -#endif // OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_HPP diff --git a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp --- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp +++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_AIX_PPC_VM_OS_AIX_PPC_HPP -#define OS_CPU_AIX_PPC_VM_OS_AIX_PPC_HPP +#pragma once static void setup_fpu() {} @@ -35,5 +34,3 @@ #define PLATFORM_PRINT_NATIVE_STACK 1 static bool platform_print_native_stack(outputStream* st, void* context, char *buf, int buf_size); - -#endif // OS_CPU_AIX_PPC_VM_OS_AIX_PPC_HPP diff --git a/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp b/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp --- a/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp +++ b/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_AIX_PPC_VM_PREFETCH_AIX_PPC_INLINE_HPP -#define OS_CPU_AIX_PPC_VM_PREFETCH_AIX_PPC_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" @@ -54,5 +53,3 @@ __dcbtst( ((address)loc) +((long)interval) ); #endif } - -#endif // OS_CPU_AIX_PPC_VM_PREFETCH_AIX_PPC_INLINE_HPP diff --git a/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp --- a/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp +++ b/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_AIX_PPC_VM_THREAD_AIX_PPC_HPP -#define OS_CPU_AIX_PPC_VM_THREAD_AIX_PPC_HPP +#pragma once private: void pd_initialize() { @@ -50,5 +49,3 @@ bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava); - -#endif // OS_CPU_AIX_PPC_VM_THREAD_AIX_PPC_HPP diff --git a/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp --- a/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp +++ b/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_AIX_OJDKPPC_VM_VMSTRUCTS_AIX_PPC_HPP -#define OS_CPU_AIX_OJDKPPC_VM_VMSTRUCTS_AIX_PPC_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -49,5 +48,3 @@ #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_AIX_OJDKPPC_VM_VMSTRUCTS_AIX_PPC_HPP diff --git a/src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp --- a/src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp +++ b/src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_HPP -#define OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_HPP +#pragma once // Implementation of class atomic @@ -168,5 +167,3 @@ } #endif // AMD64 - -#endif // OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_HPP diff --git a/src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp --- a/src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp +++ b/src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP -#define OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP +#pragma once #ifdef __APPLE__ #include @@ -108,5 +107,3 @@ return swap_u8_base(*(u4*)&x, *(((u4*)&x)+1)); } #endif // !AMD64 - -#endif // OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp --- a/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp +++ b/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP -#define OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP +#pragma once static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { #ifdef AMD64 @@ -305,5 +304,3 @@ pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count); #endif // AMD64 } - -#endif // OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp --- a/src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp +++ b/src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP -#define OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP +#pragma once // // Sets the default values for platform dependent flags used by the runtime system. @@ -48,5 +47,3 @@ // Used on 64 bit platforms for UseCompressedOops base address define_pd_global(size_t, HeapBaseMinAddress, 2*G); - -#endif // OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP diff --git a/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp --- a/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp +++ b/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_HPP -#define OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -108,5 +107,3 @@ } }; #endif // AMD64 - -#endif // OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_HPP diff --git a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp --- a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp +++ b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP -#define OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP +#pragma once static void setup_fpu(); static bool supports_sse(); @@ -35,5 +34,3 @@ // Used to register dynamic code cache area with the OS // Note: Currently only used in 64 bit Windows implementations static bool register_code_area(char *low, char *high) { return true; } - -#endif // OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP diff --git a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp --- a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp +++ b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_BSD_X86_VM_OS_BSD_X86_INLINE_HPP -#define OS_CPU_BSD_X86_VM_OS_BSD_X86_INLINE_HPP +#pragma once #include "runtime/os.hpp" @@ -42,5 +41,3 @@ return (jlong)res; #endif // AMD64 } - -#endif // OS_CPU_BSD_X86_VM_OS_BSD_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp b/src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp --- a/src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp +++ b/src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP -#define OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" @@ -43,5 +42,3 @@ #endif // AMD64 } - -#endif // OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp --- a/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp +++ b/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP -#define OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP +#pragma once private: void pd_initialize() { @@ -65,5 +64,3 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} - -#endif // OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP diff --git a/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp --- a/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp +++ b/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP -#define OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -49,5 +48,3 @@ #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP diff --git a/src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp --- a/src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp +++ b/src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_HPP -#define OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_HPP +#pragma once #include "runtime/os.hpp" @@ -281,5 +280,3 @@ STATIC_ASSERT(8 == sizeof(T)); os::atomic_copy64(reinterpret_cast(&store_value), reinterpret_cast(dest)); } - -#endif // OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_HPP diff --git a/src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp b/src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp --- a/src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp +++ b/src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP -#define OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP +#pragma once // Efficient swapping of data bytes from Java byte // ordering to native byte ordering and vice versa. @@ -63,5 +62,3 @@ inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); } - -#endif // OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP diff --git a/src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp --- a/src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp +++ b/src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP -#define OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP +#pragma once // // Set the default values for platform dependent flags used by the @@ -43,5 +42,3 @@ // Used on 64 bit platforms for UseCompressedOops base address define_pd_global(size_t, HeapBaseMinAddress, 2*G); - -#endif // OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP diff --git a/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp --- a/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp +++ b/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_HPP -#define OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -73,5 +72,3 @@ inline void OrderAccess::acquire() { LIGHT_MEM_BARRIER; } inline void OrderAccess::release() { LIGHT_MEM_BARRIER; } inline void OrderAccess::fence() { FULL_MEM_BARRIER; } - -#endif // OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_HPP diff --git a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp --- a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp +++ b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP -#define OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP +#pragma once static void setup_fpu() {} @@ -52,5 +51,3 @@ *(jlong *) dst = *(const jlong *) src; #endif } - -#endif // OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP diff --git a/src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp b/src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp --- a/src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp +++ b/src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP -#define OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" @@ -33,5 +32,3 @@ inline void Prefetch::write(void* loc, intx interval) { } - -#endif // OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP diff --git a/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp --- a/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp +++ b/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP -#define OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP +#pragma once private: ZeroStack _zero_stack; @@ -115,5 +114,3 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} - -#endif // OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP diff --git a/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp --- a/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp +++ b/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP -#define OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -38,5 +37,3 @@ #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp --- a/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP -#define OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP +#pragma once #include "vm_version_aarch64.hpp" @@ -71,5 +70,3 @@ return __sync_val_compare_and_swap(dest, compare_value, exchange_value); } } - -#endif // OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp --- a/src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_AARCH64_VM_BYTES_LINUX_AARCH64_INLINE_HPP -#define OS_CPU_LINUX_AARCH64_VM_BYTES_LINUX_AARCH64_INLINE_HPP +#pragma once #include @@ -41,5 +40,3 @@ inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); } - -#endif // OS_CPU_LINUX_AARCH64_VM_BYTES_LINUX_AARCH64_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp --- a/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_AARCH64_VM_COPY_LINUX_AARCH64_INLINE_HPP -#define OS_CPU_LINUX_AARCH64_VM_COPY_LINUX_AARCH64_INLINE_HPP +#pragma once #define COPY_SMALL(from, to, count) \ { \ @@ -184,5 +183,3 @@ assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); _Copy_arrayof_conjoint_jlongs(from, to, count); } - -#endif // OS_CPU_LINUX_AARCH64_VM_COPY_LINUX_AARCH64_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp --- a/src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_AARCH64_VM_GLOBALS_LINUX_AARCH64_HPP -#define OS_CPU_LINUX_AARCH64_VM_GLOBALS_LINUX_AARCH64_HPP +#pragma once // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) @@ -42,5 +41,3 @@ class Thread; extern __thread Thread *aarch64_currentThread; - -#endif // OS_CPU_LINUX_AARCH64_VM_GLOBALS_LINUX_AARCH64_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp --- a/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_HPP -#define OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -69,5 +68,3 @@ template void operator()(T v, volatile T* p) const { release_store(p, v); fence(); } }; - -#endif // OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp --- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_HPP -#define OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_HPP +#pragma once static void setup_fpu(); static bool supports_sse(); @@ -41,5 +40,3 @@ static void atomic_copy64(const volatile void *src, volatile void *dst) { *(jlong *) dst = *(const jlong *) src; } - -#endif // OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp --- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_INLINE_HPP -#define OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_INLINE_HPP +#pragma once #include "runtime/os.hpp" @@ -36,5 +35,3 @@ res = ((uint64_t)ts1 | (uint64_t)ts2 << 32); return (jlong)res; } - -#endif // OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp b/src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp --- a/src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_AARCH64_VM_PREFETCH_LINUX_AARCH64_INLINE_HPP -#define OS_CPU_LINUX_AARCH64_VM_PREFETCH_LINUX_AARCH64_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" @@ -42,5 +41,3 @@ asm("prfm PSTL1KEEP, [%0, %1]" : : "r"(loc), "r"(interval)); #endif } - -#endif // OS_CPU_LINUX_AARCH64_VM_PREFETCH_LINUX_AARCH64_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp --- a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_AARCH64_VM_THREAD_LINUX_AARCH64_HPP -#define OS_CPU_LINUX_AARCH64_VM_THREAD_LINUX_AARCH64_HPP +#pragma once private: #ifdef ASSERT @@ -76,5 +75,3 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} - -#endif // OS_CPU_LINUX_AARCH64_VM_THREAD_LINUX_AARCH64_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp --- a/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_AARCH64_VM_VMSTRUCTS_LINUX_AARCH64_HPP -#define OS_CPU_LINUX_AARCH64_VM_VMSTRUCTS_LINUX_AARCH64_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -51,5 +50,3 @@ #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_LINUX_AARCH64_VM_VMSTRUCTS_LINUX_AARCH64_HPP diff --git a/src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp --- a/src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp +++ b/src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_ARM_VM_ATOMIC_LINUX_ARM_HPP -#define OS_CPU_LINUX_ARM_VM_ATOMIC_LINUX_ARM_HPP +#pragma once #include "runtime/os.hpp" #include "vm_version_arm.hpp" @@ -136,5 +135,3 @@ STATIC_ASSERT(8 == sizeof(T)); return cmpxchg_using_helper(reorder_cmpxchg_long_func, exchange_value, dest, compare_value); } - -#endif // OS_CPU_LINUX_ARM_VM_ATOMIC_LINUX_ARM_HPP diff --git a/src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp b/src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp --- a/src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp +++ b/src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_ARM_VM_BYTES_LINUX_ARM_INLINE_HPP -#define OS_CPU_LINUX_ARM_VM_BYTES_LINUX_ARM_INLINE_HPP +#pragma once #include @@ -43,5 +42,3 @@ // TODO: ARM - optimize return bswap_64(x); } - -#endif // OS_CPU_LINUX_ARM_VM_BYTES_LINUX_ARM_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp b/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp --- a/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp +++ b/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_ARM_VM_COPY_LINUX_ARM_INLINE_HPP -#define OS_CPU_LINUX_ARM_VM_COPY_LINUX_ARM_INLINE_HPP +#pragma once static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { _Copy_conjoint_words(from, to, count * HeapWordSize); @@ -91,5 +90,3 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t count) { pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count); } - -#endif // OS_CPU_LINUX_ARM_VM_COPY_LINUX_ARM_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp --- a/src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp +++ b/src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_ARM_VM_GLOBALS_LINUX_ARM_HPP -#define OS_CPU_LINUX_ARM_VM_GLOBALS_LINUX_ARM_HPP +#pragma once // // Sets the default values for platform dependent flags used by the runtime system. @@ -39,5 +38,3 @@ // Used on 64 bit platforms for UseCompressedOops base address or CDS define_pd_global(size_t, HeapBaseMinAddress, 2*G); - -#endif // OS_CPU_LINUX_ARM_VM_GLOBALS_LINUX_ARM_HPP diff --git a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp --- a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp +++ b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_HPP -#define OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -101,5 +100,3 @@ inline void OrderAccess::storeload() { dmb_sy(); } inline void OrderAccess::release() { dmb_sy(); } inline void OrderAccess::fence() { dmb_sy(); } - -#endif // OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_HPP diff --git a/src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp --- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp +++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_ARM_VM_OS_LINUX_ARM_HPP -#define OS_CPU_LINUX_ARM_VM_OS_LINUX_ARM_HPP +#pragma once #ifndef __thumb__ enum { @@ -69,5 +68,3 @@ static int32_t atomic_cmpxchg_bootstrap(int32_t compare_value, int32_t exchange_value, volatile int32_t *dest); - -#endif // OS_CPU_LINUX_ARM_VM_OS_LINUX_ARM_HPP diff --git a/src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp b/src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp --- a/src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp +++ b/src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_ARM_VM_PREFETCH_LINUX_ARM_INLINE_HPP -#define OS_CPU_LINUX_ARM_VM_PREFETCH_LINUX_ARM_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" @@ -36,5 +35,3 @@ inline void Prefetch::write(void *loc, intx interval) { // Not available on 32-bit ARM (prior to ARMv7 with MP extensions) } - -#endif // OS_CPU_LINUX_ARM_VM_PREFETCH_LINUX_ARM_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp --- a/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp +++ b/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_ARM_VM_THREAD_LINUX_ARM_HPP -#define OS_CPU_LINUX_ARM_VM_THREAD_LINUX_ARM_HPP +#pragma once private: // The following thread-local variables replicate corresponding global variables. @@ -83,5 +82,3 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} - -#endif // OS_CPU_LINUX_ARM_VM_THREAD_LINUX_ARM_HPP diff --git a/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp --- a/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp +++ b/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_ARM_VM_VMSTRUCTS_LINUX_ARM_HPP -#define OS_CPU_LINUX_ARM_VM_VMSTRUCTS_LINUX_ARM_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -49,5 +48,3 @@ #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_LINUX_ARM_VM_VMSTRUCTS_LINUX_ARM_HPP diff --git a/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp --- a/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp +++ b/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_HPP -#define OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_HPP +#pragma once #ifndef PPC64 #error "Atomic currently only implemented for PPC64" @@ -414,5 +413,3 @@ #undef strasm_fence #undef strasm_nobarrier #undef strasm_nobarrier_clobber_memory - -#endif // OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_HPP diff --git a/src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp b/src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp --- a/src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp +++ b/src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_PPC_VM_BYTES_LINUX_PPC_INLINE_HPP -#define OS_CPU_LINUX_PPC_VM_BYTES_LINUX_PPC_INLINE_HPP +#pragma once #if defined(VM_LITTLE_ENDIAN) #include @@ -35,5 +34,3 @@ inline u4 Bytes::swap_u4(u4 x) { return bswap_32(x); } inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); } #endif // VM_LITTLE_ENDIAN - -#endif // OS_CPU_LINUX_PPC_VM_BYTES_LINUX_PPC_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp --- a/src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp +++ b/src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_PPC_VM_GLOBALS_LINUX_PPC_HPP -#define OS_CPU_LINUX_PPC_VM_GLOBALS_LINUX_PPC_HPP +#pragma once // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) @@ -40,5 +39,3 @@ // Only used on 64 bit platforms define_pd_global(size_t, HeapBaseMinAddress, 2*G); - -#endif // OS_CPU_LINUX_PPC_VM_GLOBALS_LINUX_PPC_HPP diff --git a/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp --- a/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp +++ b/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_HPP -#define OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -93,5 +92,3 @@ #undef inlasm_eieio #undef inlasm_isync #undef inlasm_acquire_reg - -#endif // OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_HPP diff --git a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp --- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp +++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp @@ -23,13 +23,10 @@ * */ -#ifndef OS_CPU_LINUX_PPC_VM_OS_LINUX_PPC_HPP -#define OS_CPU_LINUX_PPC_VM_OS_LINUX_PPC_HPP +#pragma once static void setup_fpu() {} // Used to register dynamic code cache area with the OS // Note: Currently only used in 64 bit Windows implementations static bool register_code_area(char *low, char *high) { return true; } - -#endif // OS_CPU_LINUX_PPC_VM_OS_LINUX_PPC_HPP diff --git a/src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp b/src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp --- a/src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp +++ b/src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_PPC_VM_PREFETCH_LINUX_PPC_INLINE_HPP -#define OS_CPU_LINUX_PPC_VM_PREFETCH_LINUX_PPC_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" @@ -46,5 +45,3 @@ //: ); } - -#endif // OS_CPU_LINUX_PPC_VM_PREFETCH_LINUX_PPC_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp --- a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp +++ b/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_PPC_VM_THREAD_LINUX_PPC_HPP -#define OS_CPU_LINUX_PPC_VM_THREAD_LINUX_PPC_HPP +#pragma once private: @@ -50,5 +49,3 @@ bool pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext, bool isInJava); bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava); - -#endif // OS_CPU_LINUX_PPC_VM_THREAD_LINUX_PPC_HPP diff --git a/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp --- a/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp +++ b/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_PPC_VM_VMSTRUCTS_LINUX_PPC_HPP -#define OS_CPU_LINUX_PPC_VM_VMSTRUCTS_LINUX_PPC_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -51,5 +50,3 @@ #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_LINUX_PPC_VM_VMSTRUCTS_LINUX_PPC_HPP diff --git a/src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp --- a/src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp +++ b/src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_S390_VM_ATOMIC_LINUX_S390_INLINE_HPP -#define OS_CPU_LINUX_S390_VM_ATOMIC_LINUX_S390_INLINE_HPP +#pragma once #include "runtime/atomic.hpp" #include "runtime/os.hpp" @@ -334,5 +333,3 @@ return old; } - -#endif // OS_CPU_LINUX_S390_VM_ATOMIC_LINUX_S390_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp b/src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp --- a/src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp +++ b/src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_S390_VM_BYTES_LINUX_S390_INLINE_HPP -#define OS_CPU_LINUX_S390_VM_BYTES_LINUX_S390_INLINE_HPP +#pragma once // Efficient swapping of data bytes from Java byte // ordering to native byte ordering and vice versa. @@ -42,5 +41,3 @@ inline u8 swap_u8(u8 x) { return bswap_64(x); } - -#endif // OS_CPU_LINUX_S390_VM_BYTES_LINUX_S390_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp --- a/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp +++ b/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp @@ -25,8 +25,7 @@ // Sorted according to linux_x86. -#ifndef OS_CPU_LINUX_S390_VM_GLOBALS_LINUX_S390_HPP -#define OS_CPU_LINUX_S390_VM_GLOBALS_LINUX_S390_HPP +#pragma once // Sets the default values for platform dependent flags used by the // runtime system (see globals.hpp). @@ -48,7 +47,3 @@ // Only used on 64 bit platforms. define_pd_global(size_t, HeapBaseMinAddress, 2*G); - -#endif // OS_CPU_LINUX_S390_VM_GLOBALS_LINUX_S390_HPP - - diff --git a/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp --- a/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp +++ b/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_HPP -#define OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -87,5 +86,3 @@ #undef inlasm_zarch_release #undef inlasm_zarch_acquire #undef inlasm_zarch_fence - -#endif // OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_HPP diff --git a/src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp --- a/src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp +++ b/src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp @@ -23,13 +23,9 @@ * */ -#ifndef OS_CPU_LINUX_S390_VM_OS_LINUX_S390_HPP -#define OS_CPU_LINUX_S390_VM_OS_LINUX_S390_HPP +#pragma once static void setup_fpu() {} // Used to register dynamic code cache area with the OS. static bool register_code_area(char *low, char *high) { return true; } - -#endif // OS_CPU_LINUX_S390_VM_OS_LINUX_S390_HPP - diff --git a/src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp b/src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp --- a/src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp +++ b/src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_S390_VM_PREFETCH_LINUX_S390_INLINE_HPP -#define OS_CPU_LINUX_S390_VM_PREFETCH_LINUX_S390_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" @@ -35,5 +34,3 @@ inline void Prefetch::write(void* loc, intx interval) { // No prefetch instructions on z/Architecture -> implement trivially. } - -#endif // OS_CPU_LINUX_S390_VM_PREFETCH_LINUX_S390_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp --- a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp +++ b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_S390_VM_THREAD_LINUX_S390_HPP -#define OS_CPU_LINUX_S390_VM_THREAD_LINUX_S390_HPP +#pragma once private: @@ -49,5 +48,3 @@ bool pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext, bool isInJava); bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava); - -#endif // OS_CPU_LINUX_S390_VM_THREAD_LINUX_S390_HPP diff --git a/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp --- a/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp +++ b/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_S390_VM_VMSTRUCTS_LINUX_S390_HPP -#define OS_CPU_LINUX_S390_VM_VMSTRUCTS_LINUX_S390_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -51,6 +50,3 @@ #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_LINUX_S390_VM_VMSTRUCTS_LINUX_S390_HPP - diff --git a/src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp --- a/src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp +++ b/src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP -#define OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP +#pragma once // Implementation of class atomic @@ -153,5 +152,3 @@ : "memory"); return rv; } - -#endif // OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp --- a/src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp +++ b/src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_SPARC_VM_GLOBALS_LINUX_SPARC_HPP -#define OS_CPU_LINUX_SPARC_VM_GLOBALS_LINUX_SPARC_HPP +#pragma once // // Sets the default values for platform dependent flags used by the @@ -34,5 +33,3 @@ // Used on 64 bit platforms for UseCompressedOops base address define_pd_global(size_t, HeapBaseMinAddress, CONST64(4)*G); - -#endif // OS_CPU_LINUX_SPARC_VM_GLOBALS_LINUX_SPARC_HPP diff --git a/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp --- a/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp +++ b/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_HPP -#define OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -47,5 +46,3 @@ inline void OrderAccess::fence() { __asm__ volatile ("membar #StoreLoad" : : : "memory"); } - -#endif // OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_HPP diff --git a/src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp --- a/src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp +++ b/src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_SPARC_VM_OS_LINUX_SPARC_HPP -#define OS_CPU_LINUX_SPARC_VM_OS_LINUX_SPARC_HPP +#pragma once // // NOTE: we are back in class os here, not Linux @@ -45,5 +44,3 @@ // Used to register dynamic code cache area with the OS // Note: Currently only used in 64 bit Windows implementations static bool register_code_area(char *low, char *high) { return true; } - -#endif // OS_CPU_LINUX_SPARC_VM_OS_LINUX_SPARC_HPP diff --git a/src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp b/src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp --- a/src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp +++ b/src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_SPARC_VM_PREFETCH_LINUX_SPARC_INLINE_HPP -#define OS_CPU_LINUX_SPARC_VM_PREFETCH_LINUX_SPARC_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" @@ -34,5 +33,3 @@ inline void Prefetch::write(void *loc, intx interval) { __asm__ volatile("prefetch [%0+%1], 2" : : "r" (loc), "r" (interval) : "memory" ); } - -#endif // OS_CPU_LINUX_SPARC_VM_PREFETCH_LINUX_SPARC_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp --- a/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp +++ b/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_SPARC_VM_THREAD_LINUX_SPARC_HPP -#define OS_CPU_LINUX_SPARC_VM_THREAD_LINUX_SPARC_HPP +#pragma once private: @@ -94,5 +93,3 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} - -#endif // OS_CPU_LINUX_SPARC_VM_THREAD_LINUX_SPARC_HPP diff --git a/src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp b/src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp --- a/src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp +++ b/src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP -#define OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -59,5 +58,3 @@ declare_constant(JavaFrameAnchor::flushed) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP diff --git a/src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp --- a/src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp +++ b/src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP -#define OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP +#pragma once // Implementation of class atomic @@ -168,5 +167,3 @@ } #endif // AMD64 - -#endif // OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP diff --git a/src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp --- a/src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp +++ b/src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_X86_VM_BYTES_LINUX_X86_INLINE_HPP -#define OS_CPU_LINUX_X86_VM_BYTES_LINUX_X86_INLINE_HPP +#pragma once #include @@ -86,5 +85,3 @@ return swap_u8_base(*(u4*)&x, *(((u4*)&x)+1)); } #endif // !AMD64 - -#endif // OS_CPU_LINUX_X86_VM_BYTES_LINUX_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp --- a/src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp +++ b/src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP -#define OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP +#pragma once static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { #ifdef AMD64 @@ -305,5 +304,3 @@ pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count); #endif // AMD64 } - -#endif // OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp --- a/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp +++ b/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp @@ -21,11 +21,8 @@ * questions. */ -#ifndef OS_CPU_LINUX_X86_ZADDRESS_LINUX_X86_INLINE_HPP -#define OS_CPU_LINUX_X86_ZADDRESS_LINUX_X86_INLINE_HPP +#pragma once inline uintptr_t ZAddress::address(uintptr_t value) { return value; } - -#endif // OS_CPU_LINUX_X86_ZADDRESS_LINUX_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp --- a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp +++ b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef OS_CPU_LINUX_X86_ZBACKINGFILE_LINUX_X86_HPP -#define OS_CPU_LINUX_X86_ZBACKINGFILE_LINUX_X86_HPP +#pragma once #include "memory/allocation.hpp" @@ -59,5 +58,3 @@ size_t try_expand(size_t offset, size_t length, size_t alignment) const; }; - -#endif // OS_CPU_LINUX_X86_ZBACKINGFILE_LINUX_X86_HPP diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp --- a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp +++ b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef OS_CPU_LINUX_X86_ZBACKINGPATH_LINUX_X86_HPP -#define OS_CPU_LINUX_X86_ZBACKINGPATH_LINUX_X86_HPP +#pragma once #include "gc/z/zArray.hpp" #include "memory/allocation.hpp" @@ -48,5 +47,3 @@ const char* get() const; }; - -#endif // OS_CPU_LINUX_X86_ZBACKINGPATH_LINUX_X86_HPP diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp --- a/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp +++ b/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef OS_CPU_LINUX_X86_ZGLOBALS_LINUX_X86_HPP -#define OS_CPU_LINUX_X86_ZGLOBALS_LINUX_X86_HPP +#pragma once // // Page Allocation Tiers @@ -86,5 +85,3 @@ const size_t ZPlatformNMethodDisarmedOffset = 4; const size_t ZPlatformCacheLineSize = 64; - -#endif // OS_CPU_LINUX_X86_ZGLOBALS_LINUX_X86_HPP diff --git a/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp --- a/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp +++ b/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef OS_CPU_LINUX_X86_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP -#define OS_CPU_LINUX_X86_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP +#pragma once #include "gc/z/zBackingFile_linux_x86.hpp" #include "gc/z/zMemory.hpp" @@ -61,5 +60,3 @@ void unmap(ZPhysicalMemory pmem, uintptr_t offset) const; void flip(ZPhysicalMemory pmem, uintptr_t offset) const; }; - -#endif // OS_CPU_LINUX_X86_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP diff --git a/src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp --- a/src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp +++ b/src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_X86_VM_GLOBALS_LINUX_X86_HPP -#define OS_CPU_LINUX_X86_VM_GLOBALS_LINUX_X86_HPP +#pragma once // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) @@ -46,5 +45,3 @@ // Used on 64 bit platforms for UseCompressedOops base address define_pd_global(size_t, HeapBaseMinAddress, 2*G); - -#endif // OS_CPU_LINUX_X86_VM_GLOBALS_LINUX_X86_HPP diff --git a/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp --- a/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp +++ b/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP -#define OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -104,5 +103,3 @@ } }; #endif // AMD64 - -#endif // OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp --- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp +++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP -#define OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP +#pragma once static void setup_fpu(); static bool supports_sse(); @@ -48,5 +47,3 @@ * @see JDK-8023956 */ static void workaround_expand_exec_shield_cs_limit(); - -#endif // OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp --- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp +++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_X86_VM_OS_LINUX_X86_INLINE_HPP -#define OS_CPU_LINUX_X86_VM_OS_LINUX_X86_INLINE_HPP +#pragma once #include "runtime/os.hpp" @@ -42,5 +41,3 @@ return (jlong)res; #endif // AMD64 } - -#endif // OS_CPU_LINUX_X86_VM_OS_LINUX_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp b/src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp --- a/src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp +++ b/src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_X86_VM_PREFETCH_LINUX_X86_INLINE_HPP -#define OS_CPU_LINUX_X86_VM_PREFETCH_LINUX_X86_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" @@ -43,5 +42,3 @@ #endif // AMD64 } - -#endif // OS_CPU_LINUX_X86_VM_PREFETCH_LINUX_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp --- a/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp +++ b/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_X86_VM_THREAD_LINUX_X86_HPP -#define OS_CPU_LINUX_X86_VM_THREAD_LINUX_X86_HPP +#pragma once private: void pd_initialize() { @@ -63,5 +62,3 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} - -#endif // OS_CPU_LINUX_X86_VM_THREAD_LINUX_X86_HPP diff --git a/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp --- a/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp +++ b/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP -#define OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -50,5 +49,3 @@ #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP diff --git a/src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp --- a/src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp +++ b/src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_HPP -#define OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_HPP +#pragma once #include "runtime/os.hpp" @@ -127,5 +126,3 @@ STATIC_ASSERT(8 == sizeof(T)); os::atomic_copy64(reinterpret_cast(&store_value), reinterpret_cast(dest)); } - -#endif // OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_HPP diff --git a/src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp b/src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp --- a/src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp +++ b/src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_LINUX_ZERO_VM_BYTES_LINUX_ZERO_INLINE_HPP -#define OS_CPU_LINUX_ZERO_VM_BYTES_LINUX_ZERO_INLINE_HPP +#pragma once // Efficient swapping of data bytes from Java byte // ordering to native byte ordering and vice versa. @@ -41,5 +40,3 @@ inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); } - -#endif // OS_CPU_LINUX_ZERO_VM_BYTES_LINUX_ZERO_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp --- a/src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp +++ b/src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_ZERO_VM_GLOBALS_LINUX_ZERO_HPP -#define OS_CPU_LINUX_ZERO_VM_GLOBALS_LINUX_ZERO_HPP +#pragma once // // Set the default values for platform dependent flags used by the @@ -43,5 +42,3 @@ // Used on 64 bit platforms for UseCompressedOops base address define_pd_global(size_t, HeapBaseMinAddress, 2*G); - -#endif // OS_CPU_LINUX_ZERO_VM_GLOBALS_LINUX_ZERO_HPP diff --git a/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp --- a/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp +++ b/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_HPP -#define OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -82,5 +81,3 @@ inline void OrderAccess::release() { LIGHT_MEM_BARRIER; } inline void OrderAccess::fence() { FULL_MEM_BARRIER; } - -#endif // OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_HPP diff --git a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp --- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp +++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP -#define OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP +#pragma once static void setup_fpu() {} @@ -68,5 +67,3 @@ *(jlong *) dst = *(const jlong *) src; #endif } - -#endif // OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP diff --git a/src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp b/src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp --- a/src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp +++ b/src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_ZERO_VM_PREFETCH_LINUX_ZERO_INLINE_HPP -#define OS_CPU_LINUX_ZERO_VM_PREFETCH_LINUX_ZERO_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" @@ -33,5 +32,3 @@ inline void Prefetch::write(void* loc, intx interval) { } - -#endif // OS_CPU_LINUX_ZERO_VM_PREFETCH_LINUX_ZERO_INLINE_HPP diff --git a/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp --- a/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp +++ b/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_ZERO_VM_THREAD_LINUX_ZERO_HPP -#define OS_CPU_LINUX_ZERO_VM_THREAD_LINUX_ZERO_HPP +#pragma once private: ZeroStack _zero_stack; @@ -123,5 +122,3 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} - -#endif // OS_CPU_LINUX_ZERO_VM_THREAD_LINUX_ZERO_HPP diff --git a/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp --- a/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp +++ b/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp @@ -23,8 +23,7 @@ * */ -#ifndef OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP -#define OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -37,5 +36,3 @@ #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP diff --git a/src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp --- a/src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp +++ b/src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP -#define OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP +#pragma once // Implementation of class atomic @@ -106,5 +105,3 @@ : "memory"); return rv; } - -#endif // OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP diff --git a/src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp --- a/src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp +++ b/src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_SPARC_VM_COUNTTRAILINGZEROS_HPP -#define OS_CPU_SOLARIS_SPARC_VM_COUNTTRAILINGZEROS_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -37,5 +36,3 @@ __asm__(" popc %1, %0\n\t" : "=r" (result) : "r" (rx)); return result; } - -#endif // include guard diff --git a/src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp --- a/src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp +++ b/src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_SPARC_VM_GLOBALS_SOLARIS_SPARC_HPP -#define OS_CPU_SOLARIS_SPARC_VM_GLOBALS_SOLARIS_SPARC_HPP +#pragma once // // Sets the default values for platform dependent flags used by the runtime system. @@ -36,7 +35,3 @@ // use 6G as default base address because by default the OS maps the application // to 4G on Solaris-Sparc. This leaves at least 2G for the native heap. define_pd_global(size_t, HeapBaseMinAddress, CONST64(6)*G); - - - -#endif // OS_CPU_SOLARIS_SPARC_VM_GLOBALS_SOLARIS_SPARC_HPP diff --git a/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp --- a/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp +++ b/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_HPP -#define OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -50,5 +49,3 @@ inline void OrderAccess::fence() { __asm__ volatile ("membar #StoreLoad" : : : "memory"); } - -#endif // OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_HPP diff --git a/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp --- a/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp +++ b/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_SPARC_VM_OS_SOLARIS_SPARC_HPP -#define OS_CPU_SOLARIS_SPARC_VM_OS_SOLARIS_SPARC_HPP +#pragma once // // NOTE: we are back in class os here, not Solaris @@ -45,5 +44,3 @@ // Used to register dynamic code cache area with the OS // Note: Currently only used in 64 bit Windows implementations static bool register_code_area(char *low, char *high) { return true; } - -#endif // OS_CPU_SOLARIS_SPARC_VM_OS_SOLARIS_SPARC_HPP diff --git a/src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp b/src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp --- a/src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp +++ b/src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_SPARC_VM_PREFETCH_SOLARIS_SPARC_INLINE_HPP -#define OS_CPU_SOLARIS_SPARC_VM_PREFETCH_SOLARIS_SPARC_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" @@ -39,5 +38,3 @@ inline void Prefetch::write(void *loc, intx interval) { _Prefetch_write(loc, interval); } - -#endif // OS_CPU_SOLARIS_SPARC_VM_PREFETCH_SOLARIS_SPARC_INLINE_HPP diff --git a/src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp --- a/src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp +++ b/src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_SPARC_VM_THREAD_SOLARIS_SPARC_HPP -#define OS_CPU_SOLARIS_SPARC_VM_THREAD_SOLARIS_SPARC_HPP +#pragma once private: void pd_initialize() { @@ -93,5 +92,3 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} - -#endif // OS_CPU_SOLARIS_SPARC_VM_THREAD_SOLARIS_SPARC_HPP diff --git a/src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp b/src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp --- a/src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp +++ b/src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP -#define OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -38,5 +37,3 @@ declare_constant(JavaFrameAnchor::flushed) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP diff --git a/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp --- a/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp +++ b/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_HPP -#define OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_HPP +#pragma once // For Sun Studio - implementation is in solaris_x86_64.il. @@ -140,5 +139,3 @@ reinterpret_cast(dest), PrimitiveConversions::cast(compare_value))); } - -#endif // OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_HPP diff --git a/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp --- a/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp +++ b/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_X86_VM_BYTES_SOLARIS_X86_INLINE_HPP -#define OS_CPU_SOLARIS_X86_VM_BYTES_SOLARIS_X86_INLINE_HPP +#pragma once // For Sun Studio - implementation is in solaris_i486.il. // For gcc - implementation is just below. @@ -60,5 +59,3 @@ return _raw_swap_u8(x, y); } #endif // !AMD64 - -#endif // OS_CPU_SOLARIS_X86_VM_BYTES_SOLARIS_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp --- a/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp +++ b/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_X86_VM_COPY_SOLARIS_X86_INLINE_HPP -#define OS_CPU_SOLARIS_X86_VM_COPY_SOLARIS_X86_INLINE_HPP +#pragma once static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { (void)memmove(to, from, count * HeapWordSize); @@ -139,5 +138,3 @@ _Copy_arrayof_conjoint_jints(from, to, count); #endif // AMD64 } - -#endif // OS_CPU_SOLARIS_X86_VM_COPY_SOLARIS_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp --- a/src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp +++ b/src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_X86_VM_COUNTTRAILINGZEROS_HPP -#define OS_CPU_SOLARIS_X86_VM_COUNTTRAILINGZEROS_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -33,5 +32,3 @@ __asm__(" rep bsfq %1, %0" : "=r" (result) : "rm" (x)); return result; } - -#endif // include guard diff --git a/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp --- a/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp +++ b/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP -#define OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP +#pragma once // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) @@ -46,5 +45,3 @@ // Used on 64 bit platforms for UseCompressedOops base address define_pd_global(size_t, HeapBaseMinAddress, 2*G); - -#endif // OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP diff --git a/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp --- a/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp +++ b/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_HPP -#define OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -53,5 +52,3 @@ #endif compiler_barrier(); } - -#endif // OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_HPP diff --git a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp --- a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp +++ b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP -#define OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP +#pragma once // // NOTE: we are back in class os here, not Solaris @@ -53,5 +52,3 @@ // Used to register dynamic code cache area with the OS // Note: Currently only used in 64 bit Windows implementations static bool register_code_area(char *low, char *high) { return true; } - -#endif // OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP diff --git a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp --- a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp +++ b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp @@ -22,13 +22,10 @@ * */ -#ifndef OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_INLINE_HPP -#define OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_INLINE_HPP +#pragma once #include "runtime/os.hpp" extern "C" jlong _raw_rdtsc(); // In .il file inline jlong os::rdtsc() { return _raw_rdtsc(); } - -#endif // OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp b/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp --- a/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp +++ b/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_X86_VM_PREFETCH_SOLARIS_X86_INLINE_HPP -#define OS_CPU_SOLARIS_X86_VM_PREFETCH_SOLARIS_X86_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" @@ -44,5 +43,3 @@ _Prefetch_write(loc, interval); #endif // AMD64 } - -#endif // OS_CPU_SOLARIS_X86_VM_PREFETCH_SOLARIS_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp --- a/src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp +++ b/src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_X86_VM_THREAD_SOLARIS_X86_HPP -#define OS_CPU_SOLARIS_X86_VM_THREAD_SOLARIS_X86_HPP +#pragma once private: void pd_initialize() { _anchor.clear(); } @@ -58,5 +57,3 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} - -#endif // OS_CPU_SOLARIS_X86_VM_THREAD_SOLARIS_X86_HPP diff --git a/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp b/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp --- a/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp +++ b/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP -#define OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -36,5 +35,3 @@ #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP diff --git a/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp --- a/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp +++ b/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_HPP -#define OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_HPP +#pragma once #include "runtime/os.hpp" @@ -217,5 +216,3 @@ #endif // AMD64 #pragma warning(default: 4035) // Enables warnings reporting missing return statement - -#endif // OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_HPP diff --git a/src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp --- a/src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp +++ b/src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP -#define OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP +#pragma once #pragma warning(disable: 4035) // Disable warning 4035: no return value @@ -83,5 +82,3 @@ #endif // AMD64 #pragma warning(default: 4035) // Enable warning 4035: no return value - -#endif // OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp --- a/src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp +++ b/src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP -#define OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP +#pragma once static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { (void)memmove(to, from, count * HeapWordSize); @@ -189,5 +188,3 @@ static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t count) { pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count); } - -#endif // OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp --- a/src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp +++ b/src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_WINDOWS_X86_VM_GLOBALS_WINDOWS_X86_HPP -#define OS_CPU_WINDOWS_X86_VM_GLOBALS_WINDOWS_X86_HPP +#pragma once // Sets the default values for platform dependent flags used by the runtime system. // (see globals.hpp) @@ -47,5 +46,3 @@ // Used on 64 bit platforms for UseCompressedOops base address define_pd_global(size_t, HeapBaseMinAddress, 2*G); - -#endif // OS_CPU_WINDOWS_X86_VM_GLOBALS_WINDOWS_X86_HPP diff --git a/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp --- a/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp +++ b/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP -#define OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP +#pragma once // Included in orderAccess.hpp header file. @@ -109,5 +108,3 @@ } }; #endif // AMD64 - -#endif // OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP diff --git a/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp --- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp +++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_HPP -#define OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_HPP +#pragma once // // NOTE: we are back in class os here, not win32 @@ -69,5 +68,3 @@ static bool platform_print_native_stack(outputStream* st, const void* context, char *buf, int buf_size); #endif - -#endif // OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_HPP diff --git a/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp --- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp +++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_INLINE_HPP -#define OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_INLINE_HPP +#pragma once #include "runtime/os.hpp" @@ -34,5 +33,3 @@ res = (uint64_t)__rdtsc(); return (jlong)res; } - -#endif // OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp b/src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp --- a/src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp +++ b/src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp @@ -22,12 +22,9 @@ * */ -#ifndef OS_CPU_WINDOWS_X86_VM_PREFETCH_WINDOWS_X86_INLINE_HPP -#define OS_CPU_WINDOWS_X86_VM_PREFETCH_WINDOWS_X86_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" inline void Prefetch::read (void *loc, intx interval) {} inline void Prefetch::write(void *loc, intx interval) {} - -#endif // OS_CPU_WINDOWS_X86_VM_PREFETCH_WINDOWS_X86_INLINE_HPP diff --git a/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp --- a/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp +++ b/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_WINDOWS_X86_VM_THREAD_WINDOWS_X86_HPP -#define OS_CPU_WINDOWS_X86_VM_THREAD_WINDOWS_X86_HPP +#pragma once private: // On windows, in the stubGenerator, there's nowhere to save callee saved regs @@ -70,5 +69,3 @@ static bool register_stack_overflow() { return false; } static void enable_register_stack_guard() {} static void disable_register_stack_guard() {} - -#endif // OS_CPU_WINDOWS_X86_VM_THREAD_WINDOWS_X86_HPP diff --git a/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp --- a/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp +++ b/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP -#define OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP +#pragma once #ifdef AMD64 @@ -94,5 +93,3 @@ #endif #endif // AMD64 - -#endif // OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP diff --git a/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp --- a/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp +++ b/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp @@ -22,8 +22,7 @@ * */ -#ifndef OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP -#define OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP +#pragma once // These are the OS and CPU-specific fields, types and integer // constants required by the Serviceability Agent. This file is @@ -45,5 +44,3 @@ #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) - -#endif // OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP diff --git a/src/hotspot/share/adlc/adlc.hpp b/src/hotspot/share/adlc/adlc.hpp --- a/src/hotspot/share/adlc/adlc.hpp +++ b/src/hotspot/share/adlc/adlc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ADLC_ADLC_HPP -#define SHARE_VM_ADLC_ADLC_HPP +#pragma once // // Standard include file for ADLC parser @@ -107,5 +106,3 @@ // could have a backpointer to the AD but it's too complicated to pass // it everywhere it needs to be available. extern ArchDesc* globalAD; - -#endif // SHARE_VM_ADLC_ADLC_HPP diff --git a/src/hotspot/share/adlc/adlparse.hpp b/src/hotspot/share/adlc/adlparse.hpp --- a/src/hotspot/share/adlc/adlparse.hpp +++ b/src/hotspot/share/adlc/adlparse.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ADLC_ADLPARSE_HPP -#define SHARE_VM_ADLC_ADLPARSE_HPP +#pragma once // ADLPARSE.HPP - Definitions for Architecture Description Language Parser // Authors: Chris Vick and Mike Paleczny @@ -288,5 +287,3 @@ static bool equivalent_expressions(const char* str1, const char* str2); static void trim(char* &token); // trim leading & trailing spaces }; - -#endif // SHARE_VM_ADLC_ADLPARSE_HPP diff --git a/src/hotspot/share/adlc/archDesc.hpp b/src/hotspot/share/adlc/archDesc.hpp --- a/src/hotspot/share/adlc/archDesc.hpp +++ b/src/hotspot/share/adlc/archDesc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ADLC_ARCHDESC_HPP -#define SHARE_VM_ADLC_ARCHDESC_HPP +#pragma once // Definitions for Error Flags #define WARN 0 @@ -409,5 +408,3 @@ // Allow derived class to output name and position specific info virtual void record_position(OutputMap::position place, int index) {} }; - -#endif // SHARE_VM_ADLC_ARCHDESC_HPP diff --git a/src/hotspot/share/adlc/arena.hpp b/src/hotspot/share/adlc/arena.hpp --- a/src/hotspot/share/adlc/arena.hpp +++ b/src/hotspot/share/adlc/arena.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ADLC_ARENA_HPP -#define SHARE_VM_ADLC_ARENA_HPP +#pragma once void* AllocateHeap(size_t size); @@ -150,5 +149,3 @@ size_t size_in_bytes() const { return _size_in_bytes; } void set_size_in_bytes(size_t size) { _size_in_bytes = size; } }; - -#endif // SHARE_VM_ADLC_ARENA_HPP diff --git a/src/hotspot/share/adlc/dict2.hpp b/src/hotspot/share/adlc/dict2.hpp --- a/src/hotspot/share/adlc/dict2.hpp +++ b/src/hotspot/share/adlc/dict2.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ADLC_DICT2_HPP -#define SHARE_VM_ADLC_DICT2_HPP +#pragma once // Dictionaries - An Abstract Data Type @@ -117,5 +116,3 @@ void operator ++(void); // Increment iterator int test(void) { return _i<_d->_size;} // Test for end of iteration }; - -#endif // SHARE_VM_ADLC_DICT2_HPP diff --git a/src/hotspot/share/adlc/filebuff.hpp b/src/hotspot/share/adlc/filebuff.hpp --- a/src/hotspot/share/adlc/filebuff.hpp +++ b/src/hotspot/share/adlc/filebuff.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ADLC_FILEBUFF_HPP -#define SHARE_VM_ADLC_FILEBUFF_HPP +#pragma once // FILEBUFF.HPP - Definitions for parser file buffering routines @@ -78,4 +77,3 @@ // when the pointer is valid (i.e. just obtained from getline()). long getoff(const char* s) { return _bufoff + (long)(s - _buf); } }; -#endif // SHARE_VM_ADLC_FILEBUFF_HPP diff --git a/src/hotspot/share/adlc/forms.hpp b/src/hotspot/share/adlc/forms.hpp --- a/src/hotspot/share/adlc/forms.hpp +++ b/src/hotspot/share/adlc/forms.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ADLC_FORMS_HPP -#define SHARE_VM_ADLC_FORMS_HPP +#pragma once // FORMS.HPP - ADL Parser Generic and Utility Forms Classes @@ -595,5 +594,3 @@ void print_asserts(FILE *fp); void dump(); }; - -#endif // SHARE_VM_ADLC_FORMS_HPP diff --git a/src/hotspot/share/adlc/formsopt.hpp b/src/hotspot/share/adlc/formsopt.hpp --- a/src/hotspot/share/adlc/formsopt.hpp +++ b/src/hotspot/share/adlc/formsopt.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ADLC_FORMSOPT_HPP -#define SHARE_VM_ADLC_FORMSOPT_HPP +#pragma once // FORMSOPT.HPP - ADL Parser Target Specific Optimization Forms Classes @@ -673,5 +672,3 @@ void dump(); void output(FILE *fp); }; - -#endif // SHARE_VM_ADLC_FORMSOPT_HPP diff --git a/src/hotspot/share/adlc/formssel.hpp b/src/hotspot/share/adlc/formssel.hpp --- a/src/hotspot/share/adlc/formssel.hpp +++ b/src/hotspot/share/adlc/formssel.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ADLC_FORMSSEL_HPP -#define SHARE_VM_ADLC_FORMSSEL_HPP +#pragma once // FORMSSEL.HPP - ADL Parser Instruction Selection Forms Classes @@ -1092,5 +1091,3 @@ void dump(); void output(FILE *fp); }; - -#endif // SHARE_VM_ADLC_FORMSSEL_HPP diff --git a/src/hotspot/share/aot/aotCodeHeap.hpp b/src/hotspot/share/aot/aotCodeHeap.hpp --- a/src/hotspot/share/aot/aotCodeHeap.hpp +++ b/src/hotspot/share/aot/aotCodeHeap.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_AOT_AOTCODEHEAP_HPP -#define SHARE_VM_AOT_AOTCODEHEAP_HPP +#pragma once #include "aot/aotCompiledMethod.hpp" #include "classfile/symbolTable.hpp" @@ -310,5 +309,3 @@ bool reconcile_dynamic_method(AOTCompiledMethod *caller, InstanceKlass* holder, int index, Method *adapter_method); }; - -#endif // SHARE_VM_AOT_AOTCODEHEAP_HPP diff --git a/src/hotspot/share/aot/aotCompiledMethod.hpp b/src/hotspot/share/aot/aotCompiledMethod.hpp --- a/src/hotspot/share/aot/aotCompiledMethod.hpp +++ b/src/hotspot/share/aot/aotCompiledMethod.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_AOT_AOTCOMPILEDMETHOD_HPP -#define SHARE_VM_AOT_AOTCOMPILEDMETHOD_HPP +#pragma once #include "code/codeCache.hpp" #include "code/compiledIC.hpp" @@ -313,5 +312,3 @@ ((NativeLoadGot*) instruction)->set_data(data); } }; - -#endif //SHARE_VM_AOT_AOTCOMPILEDMETHOD_HPP diff --git a/src/hotspot/share/aot/aotLoader.hpp b/src/hotspot/share/aot/aotLoader.hpp --- a/src/hotspot/share/aot/aotLoader.hpp +++ b/src/hotspot/share/aot/aotLoader.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_AOT_AOTLOADER_HPP -#define SHARE_VM_AOT_AOTLOADER_HPP +#pragma once #include "runtime/globals_extension.hpp" #include "runtime/handles.hpp" @@ -68,5 +67,3 @@ static bool reconcile_dynamic_invoke(InstanceKlass* holder, int index, Method* adapter_method, Klass *appendix_klass) NOT_AOT({ return true; }); }; - -#endif // SHARE_VM_AOT_AOTLOADER_HPP diff --git a/src/hotspot/share/aot/aotLoader.inline.hpp b/src/hotspot/share/aot/aotLoader.inline.hpp --- a/src/hotspot/share/aot/aotLoader.inline.hpp +++ b/src/hotspot/share/aot/aotLoader.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_AOT_AOTLOADER_INLLINE_HPP -#define SHARE_VM_AOT_AOTLOADER_INLLINE_HPP +#pragma once #include "aot/aotLoader.hpp" #include "utilities/growableArray.hpp" @@ -35,5 +34,3 @@ void AOTLoader::add_heap(AOTCodeHeap *heap) { heaps()->append(heap); } void AOTLoader::add_library(AOTLib *lib) { libraries()->append(lib); } #endif - -#endif // SHARE_VM_AOT_AOTLOADER_INLLINE_HPP diff --git a/src/hotspot/share/aot/compiledIC_aot.hpp b/src/hotspot/share/aot/compiledIC_aot.hpp --- a/src/hotspot/share/aot/compiledIC_aot.hpp +++ b/src/hotspot/share/aot/compiledIC_aot.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_AOT_COMPILEDIC_AOT_HPP -#define SHARE_VM_AOT_COMPILEDIC_AOT_HPP +#pragma once #include "code/compiledIC.hpp" #include "code/nativeInst.hpp" @@ -79,5 +78,3 @@ virtual void set_to_far(const methodHandle& callee, address entry) { set_to_compiled(entry); } virtual const char* name() const { return "CompiledPltStaticCall"; } }; - -#endif // SHARE_VM_AOT_COMPILEDIC_AOT_HPP diff --git a/src/hotspot/share/asm/assembler.hpp b/src/hotspot/share/asm/assembler.hpp --- a/src/hotspot/share/asm/assembler.hpp +++ b/src/hotspot/share/asm/assembler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ASM_ASSEMBLER_HPP -#define SHARE_VM_ASM_ASSEMBLER_HPP +#pragma once #include "asm/codeBuffer.hpp" #include "asm/register.hpp" @@ -457,5 +456,3 @@ }; #include CPU_HEADER(assembler) - -#endif // SHARE_VM_ASM_ASSEMBLER_HPP diff --git a/src/hotspot/share/asm/assembler.inline.hpp b/src/hotspot/share/asm/assembler.inline.hpp --- a/src/hotspot/share/asm/assembler.inline.hpp +++ b/src/hotspot/share/asm/assembler.inline.hpp @@ -22,11 +22,8 @@ * */ -#ifndef SHARE_VM_ASM_ASSEMBLER_INLINE_HPP -#define SHARE_VM_ASM_ASSEMBLER_INLINE_HPP +#pragma once #include "asm/assembler.hpp" #include CPU_HEADER_INLINE(assembler) - -#endif // SHARE_VM_ASM_ASSEMBLER_INLINE_HPP diff --git a/src/hotspot/share/asm/codeBuffer.hpp b/src/hotspot/share/asm/codeBuffer.hpp --- a/src/hotspot/share/asm/codeBuffer.hpp +++ b/src/hotspot/share/asm/codeBuffer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ASM_CODEBUFFER_HPP -#define SHARE_VM_ASM_CODEBUFFER_HPP +#pragma once #include "code/oopRecorder.hpp" #include "code/relocInfo.hpp" @@ -669,5 +668,3 @@ if (remaining() < amount) { _outer->expand(this, amount); return true; } return false; } - -#endif // SHARE_VM_ASM_CODEBUFFER_HPP diff --git a/src/hotspot/share/asm/macroAssembler.hpp b/src/hotspot/share/asm/macroAssembler.hpp --- a/src/hotspot/share/asm/macroAssembler.hpp +++ b/src/hotspot/share/asm/macroAssembler.hpp @@ -22,12 +22,9 @@ * */ -#ifndef SHARE_VM_ASM_MACROASSEMBLER_HPP -#define SHARE_VM_ASM_MACROASSEMBLER_HPP +#pragma once #include "asm/assembler.hpp" #include "utilities/macros.hpp" #include CPU_HEADER(macroAssembler) - -#endif // SHARE_VM_ASM_MACROASSEMBLER_HPP diff --git a/src/hotspot/share/asm/macroAssembler.inline.hpp b/src/hotspot/share/asm/macroAssembler.inline.hpp --- a/src/hotspot/share/asm/macroAssembler.inline.hpp +++ b/src/hotspot/share/asm/macroAssembler.inline.hpp @@ -22,10 +22,7 @@ * */ -#ifndef SHARE_VM_ASM_MACROASSEMBLER_INLINE_HPP -#define SHARE_VM_ASM_MACROASSEMBLER_INLINE_HPP +#pragma once #include "asm/macroAssembler.hpp" #include CPU_HEADER_INLINE(macroAssembler) - -#endif // SHARE_VM_ASM_MACROASSEMBLER_INLINE_HPP diff --git a/src/hotspot/share/asm/register.hpp b/src/hotspot/share/asm/register.hpp --- a/src/hotspot/share/asm/register.hpp +++ b/src/hotspot/share/asm/register.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ASM_REGISTER_HPP -#define SHARE_VM_ASM_REGISTER_HPP +#pragma once #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -357,5 +356,3 @@ p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h), p2i(i), p2i(j), p2i(k), p2i(l) ); } - -#endif // SHARE_VM_ASM_REGISTER_HPP diff --git a/src/hotspot/share/c1/c1_CFGPrinter.hpp b/src/hotspot/share/c1/c1_CFGPrinter.hpp --- a/src/hotspot/share/c1/c1_CFGPrinter.hpp +++ b/src/hotspot/share/c1/c1_CFGPrinter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_CFGPRINTER_HPP -#define SHARE_VM_C1_C1_CFGPRINTER_HPP +#pragma once #include "c1/c1_Compilation.hpp" #include "c1/c1_Instruction.hpp" @@ -87,5 +86,3 @@ }; #endif - -#endif // SHARE_VM_C1_C1_CFGPRINTER_HPP diff --git a/src/hotspot/share/c1/c1_Canonicalizer.hpp b/src/hotspot/share/c1/c1_Canonicalizer.hpp --- a/src/hotspot/share/c1/c1_Canonicalizer.hpp +++ b/src/hotspot/share/c1/c1_Canonicalizer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_CANONICALIZER_HPP -#define SHARE_VM_C1_C1_CANONICALIZER_HPP +#pragma once #include "c1/c1_Instruction.hpp" @@ -115,5 +114,3 @@ virtual void do_Assert (Assert* x); #endif }; - -#endif // SHARE_VM_C1_C1_CANONICALIZER_HPP diff --git a/src/hotspot/share/c1/c1_CodeStubs.hpp b/src/hotspot/share/c1/c1_CodeStubs.hpp --- a/src/hotspot/share/c1/c1_CodeStubs.hpp +++ b/src/hotspot/share/c1/c1_CodeStubs.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_CODESTUBS_HPP -#define SHARE_VM_C1_C1_CODESTUBS_HPP +#pragma once #include "c1/c1_FrameMap.hpp" #include "c1/c1_IR.hpp" @@ -535,5 +534,3 @@ virtual void print_name(outputStream* out) const { out->print("ArrayCopyStub"); } #endif // PRODUCT }; - -#endif // SHARE_VM_C1_C1_CODESTUBS_HPP diff --git a/src/hotspot/share/c1/c1_Compilation.hpp b/src/hotspot/share/c1/c1_Compilation.hpp --- a/src/hotspot/share/c1/c1_Compilation.hpp +++ b/src/hotspot/share/c1/c1_Compilation.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_COMPILATION_HPP -#define SHARE_VM_C1_C1_COMPILATION_HPP +#pragma once #include "ci/ciEnv.hpp" #include "ci/ciMethodData.hpp" @@ -346,5 +345,3 @@ int pco() { return _pco; } XHandlers* exception_handlers() { return _exception_handlers; } }; - -#endif // SHARE_VM_C1_C1_COMPILATION_HPP diff --git a/src/hotspot/share/c1/c1_Compiler.hpp b/src/hotspot/share/c1/c1_Compiler.hpp --- a/src/hotspot/share/c1/c1_Compiler.hpp +++ b/src/hotspot/share/c1/c1_Compiler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_COMPILER_HPP -#define SHARE_VM_C1_C1_COMPILER_HPP +#pragma once #include "compiler/abstractCompiler.hpp" #include "compiler/compilerDirectives.hpp" @@ -62,5 +61,3 @@ // Size of the code buffer static int code_buffer_size(); }; - -#endif // SHARE_VM_C1_C1_COMPILER_HPP diff --git a/src/hotspot/share/c1/c1_Decorators.hpp b/src/hotspot/share/c1/c1_Decorators.hpp --- a/src/hotspot/share/c1/c1_Decorators.hpp +++ b/src/hotspot/share/c1/c1_Decorators.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_DECORATORS_HPP -#define SHARE_VM_C1_C1_DECORATORS_HPP +#pragma once #include "oops/accessDecorators.hpp" #include "utilities/globalDefinitions.hpp" @@ -34,5 +33,3 @@ // Use the C1_MASK_BOOLEAN decorator for boolean accesses where the value // needs to be masked. const DecoratorSet C1_MASK_BOOLEAN = DECORATOR_LAST << 2; - -#endif // SHARE_VM_C1_C1_DECORATORS_HPP diff --git a/src/hotspot/share/c1/c1_Defs.hpp b/src/hotspot/share/c1/c1_Defs.hpp --- a/src/hotspot/share/c1/c1_Defs.hpp +++ b/src/hotspot/share/c1/c1_Defs.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_DEFS_HPP -#define SHARE_VM_C1_C1_DEFS_HPP +#pragma once #include "asm/register.hpp" #include "utilities/globalDefinitions.hpp" @@ -55,5 +54,3 @@ enum { float_saved_as_double = pd_float_saved_as_double }; - -#endif // SHARE_VM_C1_C1_DEFS_HPP diff --git a/src/hotspot/share/c1/c1_FpuStackSim.hpp b/src/hotspot/share/c1/c1_FpuStackSim.hpp --- a/src/hotspot/share/c1/c1_FpuStackSim.hpp +++ b/src/hotspot/share/c1/c1_FpuStackSim.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_FPUSTACKSIM_HPP -#define SHARE_VM_C1_C1_FPUSTACKSIM_HPP +#pragma once #include "c1/c1_FrameMap.hpp" #include "utilities/macros.hpp" @@ -33,5 +32,3 @@ class FpuStackSim; #include CPU_HEADER(c1_FpuStackSim) - -#endif // SHARE_VM_C1_C1_FPUSTACKSIM_HPP diff --git a/src/hotspot/share/c1/c1_FrameMap.hpp b/src/hotspot/share/c1/c1_FrameMap.hpp --- a/src/hotspot/share/c1/c1_FrameMap.hpp +++ b/src/hotspot/share/c1/c1_FrameMap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_FRAMEMAP_HPP -#define SHARE_VM_C1_C1_FRAMEMAP_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "c1/c1_Defs.hpp" @@ -279,5 +278,3 @@ } #endif // PRODUCT }; - -#endif // SHARE_VM_C1_C1_FRAMEMAP_HPP diff --git a/src/hotspot/share/c1/c1_GraphBuilder.hpp b/src/hotspot/share/c1/c1_GraphBuilder.hpp --- a/src/hotspot/share/c1/c1_GraphBuilder.hpp +++ b/src/hotspot/share/c1/c1_GraphBuilder.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_GRAPHBUILDER_HPP -#define SHARE_VM_C1_C1_GRAPHBUILDER_HPP +#pragma once #include "c1/c1_IR.hpp" #include "c1/c1_Instruction.hpp" @@ -423,5 +422,3 @@ BlockBegin* start() const { return _start; } }; - -#endif // SHARE_VM_C1_C1_GRAPHBUILDER_HPP diff --git a/src/hotspot/share/c1/c1_IR.hpp b/src/hotspot/share/c1/c1_IR.hpp --- a/src/hotspot/share/c1/c1_IR.hpp +++ b/src/hotspot/share/c1/c1_IR.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_IR_HPP -#define SHARE_VM_C1_C1_IR_HPP +#pragma once #include "c1/c1_Instruction.hpp" #include "ci/ciExceptionHandler.hpp" @@ -355,5 +354,3 @@ virtual void block_do(BlockBegin* block); }; - -#endif // SHARE_VM_C1_C1_IR_HPP diff --git a/src/hotspot/share/c1/c1_Instruction.hpp b/src/hotspot/share/c1/c1_Instruction.hpp --- a/src/hotspot/share/c1/c1_Instruction.hpp +++ b/src/hotspot/share/c1/c1_Instruction.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_INSTRUCTION_HPP -#define SHARE_VM_C1_C1_INSTRUCTION_HPP +#pragma once #include "c1/c1_Compilation.hpp" #include "c1/c1_LIR.hpp" @@ -2631,5 +2630,3 @@ inline void BlockBegin::add_successor(BlockBegin* sux) { assert(_end == NULL, "Would create mismatch with successors of BlockEnd"); _successors.append(sux); } #undef ASSERT_VALUES - -#endif // SHARE_VM_C1_C1_INSTRUCTION_HPP diff --git a/src/hotspot/share/c1/c1_InstructionPrinter.hpp b/src/hotspot/share/c1/c1_InstructionPrinter.hpp --- a/src/hotspot/share/c1/c1_InstructionPrinter.hpp +++ b/src/hotspot/share/c1/c1_InstructionPrinter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_INSTRUCTIONPRINTER_HPP -#define SHARE_VM_C1_C1_INSTRUCTIONPRINTER_HPP +#pragma once #include "c1/c1_IR.hpp" #include "c1/c1_Instruction.hpp" @@ -140,5 +139,3 @@ #endif }; #endif // PRODUCT - -#endif // SHARE_VM_C1_C1_INSTRUCTIONPRINTER_HPP diff --git a/src/hotspot/share/c1/c1_LIR.hpp b/src/hotspot/share/c1/c1_LIR.hpp --- a/src/hotspot/share/c1/c1_LIR.hpp +++ b/src/hotspot/share/c1/c1_LIR.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_LIR_HPP -#define SHARE_VM_C1_C1_LIR_HPP +#pragma once #include "c1/c1_Defs.hpp" #include "c1/c1_ValueType.hpp" @@ -2468,5 +2467,3 @@ inline LIR_Opr LIR_OprDesc::illegalOpr() { return LIR_OprFact::illegalOpr; }; - -#endif // SHARE_VM_C1_C1_LIR_HPP diff --git a/src/hotspot/share/c1/c1_LIRAssembler.hpp b/src/hotspot/share/c1/c1_LIRAssembler.hpp --- a/src/hotspot/share/c1/c1_LIRAssembler.hpp +++ b/src/hotspot/share/c1/c1_LIRAssembler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_LIRASSEMBLER_HPP -#define SHARE_VM_C1_C1_LIRASSEMBLER_HPP +#pragma once #include "c1/c1_CodeStubs.hpp" #include "ci/ciMethodData.hpp" @@ -278,5 +277,3 @@ return _deopt_handler_size; } }; - -#endif // SHARE_VM_C1_C1_LIRASSEMBLER_HPP diff --git a/src/hotspot/share/c1/c1_LIRGenerator.hpp b/src/hotspot/share/c1/c1_LIRGenerator.hpp --- a/src/hotspot/share/c1/c1_LIRGenerator.hpp +++ b/src/hotspot/share/c1/c1_LIRGenerator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_LIRGENERATOR_HPP -#define SHARE_VM_C1_C1_LIRGENERATOR_HPP +#pragma once #include "c1/c1_Decorators.hpp" #include "c1/c1_Instruction.hpp" @@ -685,5 +684,3 @@ jdouble get_jdouble_constant() const; jint get_address_constant() const; }; - -#endif // SHARE_VM_C1_C1_LIRGENERATOR_HPP diff --git a/src/hotspot/share/c1/c1_LinearScan.hpp b/src/hotspot/share/c1/c1_LinearScan.hpp --- a/src/hotspot/share/c1/c1_LinearScan.hpp +++ b/src/hotspot/share/c1/c1_LinearScan.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_LINEARSCAN_HPP -#define SHARE_VM_C1_C1_LINEARSCAN_HPP +#pragma once #include "c1/c1_FpuStackSim.hpp" #include "c1/c1_FrameMap.hpp" @@ -963,5 +962,3 @@ // Pick up platform-dependent implementation details #include CPU_HEADER(c1_LinearScan) - -#endif // SHARE_VM_C1_C1_LINEARSCAN_HPP diff --git a/src/hotspot/share/c1/c1_MacroAssembler.hpp b/src/hotspot/share/c1/c1_MacroAssembler.hpp --- a/src/hotspot/share/c1/c1_MacroAssembler.hpp +++ b/src/hotspot/share/c1/c1_MacroAssembler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_MACROASSEMBLER_HPP -#define SHARE_VM_C1_C1_MACROASSEMBLER_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "utilities/macros.hpp" @@ -92,5 +91,3 @@ void prologue(const char* name, bool must_gc_arguments); void epilogue(); }; - -#endif // SHARE_VM_C1_C1_MACROASSEMBLER_HPP diff --git a/src/hotspot/share/c1/c1_Optimizer.hpp b/src/hotspot/share/c1/c1_Optimizer.hpp --- a/src/hotspot/share/c1/c1_Optimizer.hpp +++ b/src/hotspot/share/c1/c1_Optimizer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_OPTIMIZER_HPP -#define SHARE_VM_C1_C1_OPTIMIZER_HPP +#pragma once #include "c1/c1_IR.hpp" #include "c1/c1_Instruction.hpp" @@ -41,5 +40,3 @@ void eliminate_blocks(); void eliminate_null_checks(); }; - -#endif // SHARE_VM_C1_C1_OPTIMIZER_HPP diff --git a/src/hotspot/share/c1/c1_RangeCheckElimination.hpp b/src/hotspot/share/c1/c1_RangeCheckElimination.hpp --- a/src/hotspot/share/c1/c1_RangeCheckElimination.hpp +++ b/src/hotspot/share/c1/c1_RangeCheckElimination.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_RANGECHECKELIMINATION_HPP -#define SHARE_VM_C1_C1_RANGECHECKELIMINATION_HPP +#pragma once #include "c1/c1_Instruction.hpp" @@ -239,5 +238,3 @@ void dump_condition_stack(BlockBegin *cur_block); static void print_statistics(); }; - -#endif // SHARE_VM_C1_C1_RANGECHECKELIMINATION_HPP diff --git a/src/hotspot/share/c1/c1_Runtime1.hpp b/src/hotspot/share/c1/c1_Runtime1.hpp --- a/src/hotspot/share/c1/c1_Runtime1.hpp +++ b/src/hotspot/share/c1/c1_Runtime1.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_RUNTIME1_HPP -#define SHARE_VM_C1_C1_RUNTIME1_HPP +#pragma once #include "c1/c1_FrameMap.hpp" #include "code/stubs.hpp" @@ -198,5 +197,3 @@ static void print_statistics() PRODUCT_RETURN; }; - -#endif // SHARE_VM_C1_C1_RUNTIME1_HPP diff --git a/src/hotspot/share/c1/c1_ValueMap.hpp b/src/hotspot/share/c1/c1_ValueMap.hpp --- a/src/hotspot/share/c1/c1_ValueMap.hpp +++ b/src/hotspot/share/c1/c1_ValueMap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_VALUEMAP_HPP -#define SHARE_VM_C1_C1_VALUEMAP_HPP +#pragma once #include "c1/c1_Instruction.hpp" #include "c1/c1_ValueSet.hpp" @@ -256,5 +255,3 @@ GlobalValueNumbering(IR* ir); void substitute(Instruction* instr); // substitute instruction if it is contained in current value map }; - -#endif // SHARE_VM_C1_C1_VALUEMAP_HPP diff --git a/src/hotspot/share/c1/c1_ValueSet.hpp b/src/hotspot/share/c1/c1_ValueSet.hpp --- a/src/hotspot/share/c1/c1_ValueSet.hpp +++ b/src/hotspot/share/c1/c1_ValueSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_VALUESET_HPP -#define SHARE_VM_C1_C1_VALUESET_HPP +#pragma once #include "c1/c1_Instruction.hpp" #include "memory/allocation.hpp" @@ -51,5 +50,3 @@ void set_from(ValueSet* other); bool equals (ValueSet* other); }; - -#endif // SHARE_VM_C1_C1_VALUESET_HPP diff --git a/src/hotspot/share/c1/c1_ValueSet.inline.hpp b/src/hotspot/share/c1/c1_ValueSet.inline.hpp --- a/src/hotspot/share/c1/c1_ValueSet.inline.hpp +++ b/src/hotspot/share/c1/c1_ValueSet.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_VALUESET_INLINE_HPP -#define SHARE_VM_C1_C1_VALUESET_INLINE_HPP +#pragma once #include "c1/c1_Instruction.hpp" #include "c1/c1_ValueSet.hpp" @@ -69,5 +68,3 @@ inline bool ValueSet::equals(ValueSet* other) { return _map.is_same(other->_map); } - -#endif // SHARE_VM_C1_C1_VALUESET_INLINE_HPP diff --git a/src/hotspot/share/c1/c1_ValueStack.hpp b/src/hotspot/share/c1/c1_ValueStack.hpp --- a/src/hotspot/share/c1/c1_ValueStack.hpp +++ b/src/hotspot/share/c1/c1_ValueStack.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_VALUESTACK_HPP -#define SHARE_VM_C1_C1_VALUESTACK_HPP +#pragma once #include "c1/c1_Instruction.hpp" @@ -330,5 +329,3 @@ } \ } \ } - -#endif // SHARE_VM_C1_C1_VALUESTACK_HPP diff --git a/src/hotspot/share/c1/c1_ValueType.hpp b/src/hotspot/share/c1/c1_ValueType.hpp --- a/src/hotspot/share/c1/c1_ValueType.hpp +++ b/src/hotspot/share/c1/c1_ValueType.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_VALUETYPE_HPP -#define SHARE_VM_C1_C1_VALUETYPE_HPP +#pragma once #include "c1/c1_Compilation.hpp" #include "ci/ciConstant.hpp" @@ -514,5 +513,3 @@ BasicType as_BasicType(ValueType* type); inline ValueType* as_ValueType(ciType* type) { return as_ValueType(type->basic_type()); } - -#endif // SHARE_VM_C1_C1_VALUETYPE_HPP diff --git a/src/hotspot/share/c1/c1_globals.hpp b/src/hotspot/share/c1/c1_globals.hpp --- a/src/hotspot/share/c1/c1_globals.hpp +++ b/src/hotspot/share/c1/c1_globals.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_C1_C1_GLOBALS_HPP -#define SHARE_VM_C1_C1_GLOBALS_HPP +#pragma once #include "runtime/globals.hpp" #include "utilities/macros.hpp" @@ -336,5 +335,3 @@ IGNORE_RANGE, \ IGNORE_CONSTRAINT, \ IGNORE_WRITEABLE) - -#endif // SHARE_VM_C1_C1_GLOBALS_HPP diff --git a/src/hotspot/share/ci/bcEscapeAnalyzer.hpp b/src/hotspot/share/ci/bcEscapeAnalyzer.hpp --- a/src/hotspot/share/ci/bcEscapeAnalyzer.hpp +++ b/src/hotspot/share/ci/bcEscapeAnalyzer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_BCESCAPEANALYZER_HPP -#define SHARE_VM_CI_BCESCAPEANALYZER_HPP +#pragma once #ifdef COMPILER2 #include "ci/ciObject.hpp" @@ -161,5 +160,3 @@ void dump(); #endif }; - -#endif // SHARE_VM_CI_BCESCAPEANALYZER_HPP diff --git a/src/hotspot/share/ci/ciArray.hpp b/src/hotspot/share/ci/ciArray.hpp --- a/src/hotspot/share/ci/ciArray.hpp +++ b/src/hotspot/share/ci/ciArray.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIARRAY_HPP -#define SHARE_VM_CI_CIARRAY_HPP +#pragma once #include "ci/ciArrayKlass.hpp" #include "ci/ciConstant.hpp" @@ -75,5 +74,3 @@ bool is_array() { return true; } bool is_java_object() { return true; } }; - -#endif // SHARE_VM_CI_CIARRAY_HPP diff --git a/src/hotspot/share/ci/ciArrayKlass.hpp b/src/hotspot/share/ci/ciArrayKlass.hpp --- a/src/hotspot/share/ci/ciArrayKlass.hpp +++ b/src/hotspot/share/ci/ciArrayKlass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIARRAYKLASS_HPP -#define SHARE_VM_CI_CIARRAYKLASS_HPP +#pragma once #include "ci/ciKlass.hpp" @@ -58,5 +57,3 @@ static ciArrayKlass* make(ciType* element_type); }; - -#endif // SHARE_VM_CI_CIARRAYKLASS_HPP diff --git a/src/hotspot/share/ci/ciBaseObject.hpp b/src/hotspot/share/ci/ciBaseObject.hpp --- a/src/hotspot/share/ci/ciBaseObject.hpp +++ b/src/hotspot/share/ci/ciBaseObject.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIBASEOBJECT_HPP -#define SHARE_VM_CI_CIBASEOBJECT_HPP +#pragma once #include "ci/ciClassList.hpp" #include "memory/allocation.hpp" @@ -87,4 +86,3 @@ return (ciMetadata*)this; } }; -#endif // SHARE_VM_CI_CIBASEOBJECT_HPP diff --git a/src/hotspot/share/ci/ciCallProfile.hpp b/src/hotspot/share/ci/ciCallProfile.hpp --- a/src/hotspot/share/ci/ciCallProfile.hpp +++ b/src/hotspot/share/ci/ciCallProfile.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CICALLPROFILE_HPP -#define SHARE_VM_CI_CICALLPROFILE_HPP +#pragma once #include "ci/ciClassList.hpp" #include "memory/allocation.hpp" @@ -91,5 +90,3 @@ return call; } }; - -#endif // SHARE_VM_CI_CICALLPROFILE_HPP diff --git a/src/hotspot/share/ci/ciCallSite.hpp b/src/hotspot/share/ci/ciCallSite.hpp --- a/src/hotspot/share/ci/ciCallSite.hpp +++ b/src/hotspot/share/ci/ciCallSite.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CICALLSITE_HPP -#define SHARE_VM_CI_CICALLSITE_HPP +#pragma once #include "ci/ciInstance.hpp" @@ -46,5 +45,3 @@ void print(); }; - -#endif // SHARE_VM_CI_CICALLSITE_HPP diff --git a/src/hotspot/share/ci/ciClassList.hpp b/src/hotspot/share/ci/ciClassList.hpp --- a/src/hotspot/share/ci/ciClassList.hpp +++ b/src/hotspot/share/ci/ciClassList.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CICLASSLIST_HPP -#define SHARE_VM_CI_CICLASSLIST_HPP +#pragma once class ciEnv; class ciObjectFactory; @@ -116,6 +115,4 @@ friend class ciInstanceKlass; \ friend class ciArrayKlass; \ friend class ciObjArrayKlass; \ -friend class ciTypeArrayKlass; \ - -#endif // SHARE_VM_CI_CICLASSLIST_HPP +friend class ciTypeArrayKlass; diff --git a/src/hotspot/share/ci/ciConstant.hpp b/src/hotspot/share/ci/ciConstant.hpp --- a/src/hotspot/share/ci/ciConstant.hpp +++ b/src/hotspot/share/ci/ciConstant.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CICONSTANT_HPP -#define SHARE_VM_CI_CICONSTANT_HPP +#pragma once #include "ci/ciClassList.hpp" #include "ci/ciNullObject.hpp" @@ -130,5 +129,3 @@ // Debugging output void print(); }; - -#endif // SHARE_VM_CI_CICONSTANT_HPP diff --git a/src/hotspot/share/ci/ciConstantPoolCache.hpp b/src/hotspot/share/ci/ciConstantPoolCache.hpp --- a/src/hotspot/share/ci/ciConstantPoolCache.hpp +++ b/src/hotspot/share/ci/ciConstantPoolCache.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CICONSTANTPOOLCACHE_HPP -#define SHARE_VM_CI_CICONSTANTPOOLCACHE_HPP +#pragma once #include "memory/resourceArea.hpp" #include "utilities/growableArray.hpp" @@ -51,5 +50,3 @@ void print(); }; - -#endif // SHARE_VM_CI_CICONSTANTPOOLCACHE_HPP diff --git a/src/hotspot/share/ci/ciEnv.hpp b/src/hotspot/share/ci/ciEnv.hpp --- a/src/hotspot/share/ci/ciEnv.hpp +++ b/src/hotspot/share/ci/ciEnv.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIENV_HPP -#define SHARE_VM_CI_CIENV_HPP +#pragma once #include "ci/ciClassList.hpp" #include "ci/ciObjectFactory.hpp" @@ -465,5 +464,3 @@ void dump_replay_data_unsafe(outputStream* out); void dump_compile_data(outputStream* out); }; - -#endif // SHARE_VM_CI_CIENV_HPP diff --git a/src/hotspot/share/ci/ciExceptionHandler.hpp b/src/hotspot/share/ci/ciExceptionHandler.hpp --- a/src/hotspot/share/ci/ciExceptionHandler.hpp +++ b/src/hotspot/share/ci/ciExceptionHandler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIEXCEPTIONHANDLER_HPP -#define SHARE_VM_CI_CIEXCEPTIONHANDLER_HPP +#pragma once #include "ci/ciClassList.hpp" #include "ci/ciInstanceKlass.hpp" @@ -79,5 +78,3 @@ void print(); }; - -#endif // SHARE_VM_CI_CIEXCEPTIONHANDLER_HPP diff --git a/src/hotspot/share/ci/ciField.hpp b/src/hotspot/share/ci/ciField.hpp --- a/src/hotspot/share/ci/ciField.hpp +++ b/src/hotspot/share/ci/ciField.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIFIELD_HPP -#define SHARE_VM_CI_CIFIELD_HPP +#pragma once #include "ci/ciClassList.hpp" #include "ci/ciConstant.hpp" @@ -200,5 +199,3 @@ void print(); void print_name_on(outputStream* st); }; - -#endif // SHARE_VM_CI_CIFIELD_HPP diff --git a/src/hotspot/share/ci/ciFlags.hpp b/src/hotspot/share/ci/ciFlags.hpp --- a/src/hotspot/share/ci/ciFlags.hpp +++ b/src/hotspot/share/ci/ciFlags.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIFLAGS_HPP -#define SHARE_VM_CI_CIFLAGS_HPP +#pragma once #include "jvm.h" #include "ci/ciClassList.hpp" @@ -73,5 +72,3 @@ void print_member_flags(outputStream* st = tty); void print(outputStream* st = tty); }; - -#endif // SHARE_VM_CI_CIFLAGS_HPP diff --git a/src/hotspot/share/ci/ciInstance.hpp b/src/hotspot/share/ci/ciInstance.hpp --- a/src/hotspot/share/ci/ciInstance.hpp +++ b/src/hotspot/share/ci/ciInstance.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIINSTANCE_HPP -#define SHARE_VM_CI_CIINSTANCE_HPP +#pragma once #include "ci/ciObject.hpp" #include "oops/instanceOop.hpp" @@ -71,5 +70,3 @@ ciKlass* java_lang_Class_klass(); }; - -#endif // SHARE_VM_CI_CIINSTANCE_HPP diff --git a/src/hotspot/share/ci/ciInstanceKlass.hpp b/src/hotspot/share/ci/ciInstanceKlass.hpp --- a/src/hotspot/share/ci/ciInstanceKlass.hpp +++ b/src/hotspot/share/ci/ciInstanceKlass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIINSTANCEKLASS_HPP -#define SHARE_VM_CI_CIINSTANCEKLASS_HPP +#pragma once #include "ci/ciConstantPoolCache.hpp" #include "ci/ciFlags.hpp" @@ -280,5 +279,3 @@ bool debug_stable_field_at(int offset); #endif }; - -#endif // SHARE_VM_CI_CIINSTANCEKLASS_HPP diff --git a/src/hotspot/share/ci/ciKlass.hpp b/src/hotspot/share/ci/ciKlass.hpp --- a/src/hotspot/share/ci/ciKlass.hpp +++ b/src/hotspot/share/ci/ciKlass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIKLASS_HPP -#define SHARE_VM_CI_CIKLASS_HPP +#pragma once #include "ci/ciType.hpp" #include "oops/klass.hpp" @@ -130,5 +129,3 @@ const char* external_name() const; }; - -#endif // SHARE_VM_CI_CIKLASS_HPP diff --git a/src/hotspot/share/ci/ciMemberName.hpp b/src/hotspot/share/ci/ciMemberName.hpp --- a/src/hotspot/share/ci/ciMemberName.hpp +++ b/src/hotspot/share/ci/ciMemberName.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIMEMBERNAME_HPP -#define SHARE_VM_CI_CIMEMBERNAME_HPP +#pragma once #include "ci/ciCallProfile.hpp" #include "ci/ciInstance.hpp" @@ -40,5 +39,3 @@ ciMethod* get_vmtarget() const; }; - -#endif // SHARE_VM_CI_CIMEMBERNAME_HPP diff --git a/src/hotspot/share/ci/ciMetadata.hpp b/src/hotspot/share/ci/ciMetadata.hpp --- a/src/hotspot/share/ci/ciMetadata.hpp +++ b/src/hotspot/share/ci/ciMetadata.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIMETADATA_HPP -#define SHARE_VM_CI_CIMETADATA_HPP +#pragma once #include "ci/ciBaseObject.hpp" #include "ci/ciClassList.hpp" @@ -117,4 +116,3 @@ void print_metadata(outputStream* st = tty); }; -#endif // SHARE_VM_CI_CIMETADATA_HPP diff --git a/src/hotspot/share/ci/ciMethod.hpp b/src/hotspot/share/ci/ciMethod.hpp --- a/src/hotspot/share/ci/ciMethod.hpp +++ b/src/hotspot/share/ci/ciMethod.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIMETHOD_HPP -#define SHARE_VM_CI_CIMETHOD_HPP +#pragma once #include "ci/ciFlags.hpp" #include "ci/ciInstanceKlass.hpp" @@ -362,5 +361,3 @@ static bool is_consistent_info(ciMethod* declared_method, ciMethod* resolved_method); }; - -#endif // SHARE_VM_CI_CIMETHOD_HPP diff --git a/src/hotspot/share/ci/ciMethodBlocks.hpp b/src/hotspot/share/ci/ciMethodBlocks.hpp --- a/src/hotspot/share/ci/ciMethodBlocks.hpp +++ b/src/hotspot/share/ci/ciMethodBlocks.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIMETHODBLOCKS_HPP -#define SHARE_VM_CI_CIMETHODBLOCKS_HPP +#pragma once #include "ci/ciMethod.hpp" #include "memory/resourceArea.hpp" @@ -128,5 +127,3 @@ void print_on(outputStream* st) const PRODUCT_RETURN; #endif }; - -#endif // SHARE_VM_CI_CIMETHODBLOCKS_HPP diff --git a/src/hotspot/share/ci/ciMethodData.hpp b/src/hotspot/share/ci/ciMethodData.hpp --- a/src/hotspot/share/ci/ciMethodData.hpp +++ b/src/hotspot/share/ci/ciMethodData.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIMETHODDATA_HPP -#define SHARE_VM_CI_CIMETHODDATA_HPP +#pragma once #include "ci/ciClassList.hpp" #include "ci/ciKlass.hpp" @@ -601,5 +600,3 @@ #endif void dump_replay_data(outputStream* out); }; - -#endif // SHARE_VM_CI_CIMETHODDATA_HPP diff --git a/src/hotspot/share/ci/ciMethodHandle.hpp b/src/hotspot/share/ci/ciMethodHandle.hpp --- a/src/hotspot/share/ci/ciMethodHandle.hpp +++ b/src/hotspot/share/ci/ciMethodHandle.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIMETHODHANDLE_HPP -#define SHARE_VM_CI_CIMETHODHANDLE_HPP +#pragma once #include "ci/ciClassList.hpp" #include "ci/ciInstance.hpp" @@ -40,5 +39,3 @@ ciMethod* get_vmtarget() const; }; - -#endif // SHARE_VM_CI_CIMETHODHANDLE_HPP diff --git a/src/hotspot/share/ci/ciMethodType.hpp b/src/hotspot/share/ci/ciMethodType.hpp --- a/src/hotspot/share/ci/ciMethodType.hpp +++ b/src/hotspot/share/ci/ciMethodType.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIMETHODTYPE_HPP -#define SHARE_VM_CI_CIMETHODTYPE_HPP +#pragma once #include "ci/ciInstance.hpp" @@ -47,5 +46,3 @@ ciType* ptype_at(int index) const; }; - -#endif // SHARE_VM_CI_CIMETHODTYPE_HPP diff --git a/src/hotspot/share/ci/ciNullObject.hpp b/src/hotspot/share/ci/ciNullObject.hpp --- a/src/hotspot/share/ci/ciNullObject.hpp +++ b/src/hotspot/share/ci/ciNullObject.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CINULLOBJECT_HPP -#define SHARE_VM_CI_CINULLOBJECT_HPP +#pragma once #include "ci/ciClassList.hpp" #include "ci/ciObject.hpp" @@ -53,5 +52,3 @@ // Get the distinguished instance of this klass. static ciNullObject* make(); }; - -#endif // SHARE_VM_CI_CINULLOBJECT_HPP diff --git a/src/hotspot/share/ci/ciObjArray.hpp b/src/hotspot/share/ci/ciObjArray.hpp --- a/src/hotspot/share/ci/ciObjArray.hpp +++ b/src/hotspot/share/ci/ciObjArray.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIOBJARRAY_HPP -#define SHARE_VM_CI_CIOBJARRAY_HPP +#pragma once #include "ci/ciArray.hpp" #include "ci/ciClassList.hpp" @@ -53,5 +52,3 @@ ciObject* obj_at(int index); }; - -#endif // SHARE_VM_CI_CIOBJARRAY_HPP diff --git a/src/hotspot/share/ci/ciObjArrayKlass.hpp b/src/hotspot/share/ci/ciObjArrayKlass.hpp --- a/src/hotspot/share/ci/ciObjArrayKlass.hpp +++ b/src/hotspot/share/ci/ciObjArrayKlass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIOBJARRAYKLASS_HPP -#define SHARE_VM_CI_CIOBJARRAYKLASS_HPP +#pragma once #include "ci/ciArrayKlass.hpp" @@ -76,5 +75,3 @@ virtual ciKlass* exact_klass(); }; - -#endif // SHARE_VM_CI_CIOBJARRAYKLASS_HPP diff --git a/src/hotspot/share/ci/ciObject.hpp b/src/hotspot/share/ci/ciObject.hpp --- a/src/hotspot/share/ci/ciObject.hpp +++ b/src/hotspot/share/ci/ciObject.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIOBJECT_HPP -#define SHARE_VM_CI_CIOBJECT_HPP +#pragma once #include "ci/ciBaseObject.hpp" #include "ci/ciClassList.hpp" @@ -184,5 +183,3 @@ // Print debugging output about the oop this ciObject represents. void print_oop(outputStream* st = tty); }; - -#endif // SHARE_VM_CI_CIOBJECT_HPP diff --git a/src/hotspot/share/ci/ciObjectFactory.hpp b/src/hotspot/share/ci/ciObjectFactory.hpp --- a/src/hotspot/share/ci/ciObjectFactory.hpp +++ b/src/hotspot/share/ci/ciObjectFactory.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIOBJECTFACTORY_HPP -#define SHARE_VM_CI_CIOBJECTFACTORY_HPP +#pragma once #include "ci/ciClassList.hpp" #include "ci/ciObject.hpp" @@ -144,5 +143,3 @@ void print_contents(); void print(); }; - -#endif // SHARE_VM_CI_CIOBJECTFACTORY_HPP diff --git a/src/hotspot/share/ci/ciReplay.hpp b/src/hotspot/share/ci/ciReplay.hpp --- a/src/hotspot/share/ci/ciReplay.hpp +++ b/src/hotspot/share/ci/ciReplay.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIREPLAY_HPP -#define SHARE_VM_CI_CIREPLAY_HPP +#pragma once #include "ci/ciMethod.hpp" @@ -124,5 +123,3 @@ #endif }; - -#endif // SHARE_VM_CI_CIREPLAY_HPP diff --git a/src/hotspot/share/ci/ciSignature.hpp b/src/hotspot/share/ci/ciSignature.hpp --- a/src/hotspot/share/ci/ciSignature.hpp +++ b/src/hotspot/share/ci/ciSignature.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CISIGNATURE_HPP -#define SHARE_VM_CI_CISIGNATURE_HPP +#pragma once #include "ci/ciClassList.hpp" #include "ci/ciSymbol.hpp" @@ -71,5 +70,3 @@ void print_signature(); void print(); }; - -#endif // SHARE_VM_CI_CISIGNATURE_HPP diff --git a/src/hotspot/share/ci/ciStreams.hpp b/src/hotspot/share/ci/ciStreams.hpp --- a/src/hotspot/share/ci/ciStreams.hpp +++ b/src/hotspot/share/ci/ciStreams.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CISTREAMS_HPP -#define SHARE_VM_CI_CISTREAMS_HPP +#pragma once #include "ci/ciClassList.hpp" #include "ci/ciExceptionHandler.hpp" @@ -437,5 +436,3 @@ Bytecode::Bytecode(const ciBytecodeStream* stream, address bcp): _bcp(bcp != NULL ? bcp : stream->cur_bcp()), _code(Bytecodes::code_at(NULL, addr_at(0))) {} Bytecode_lookupswitch::Bytecode_lookupswitch(const ciBytecodeStream* stream): Bytecode(stream) { verify(); } Bytecode_tableswitch::Bytecode_tableswitch(const ciBytecodeStream* stream): Bytecode(stream) { verify(); } - -#endif // SHARE_VM_CI_CISTREAMS_HPP diff --git a/src/hotspot/share/ci/ciSymbol.hpp b/src/hotspot/share/ci/ciSymbol.hpp --- a/src/hotspot/share/ci/ciSymbol.hpp +++ b/src/hotspot/share/ci/ciSymbol.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CISYMBOL_HPP -#define SHARE_VM_CI_CISYMBOL_HPP +#pragma once #include "ci/ciBaseObject.hpp" #include "ci/ciObject.hpp" @@ -113,5 +112,3 @@ bool is_signature_polymorphic_name() const; }; - -#endif // SHARE_VM_CI_CISYMBOL_HPP diff --git a/src/hotspot/share/ci/ciType.hpp b/src/hotspot/share/ci/ciType.hpp --- a/src/hotspot/share/ci/ciType.hpp +++ b/src/hotspot/share/ci/ciType.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CITYPE_HPP -#define SHARE_VM_CI_CITYPE_HPP +#pragma once #include "ci/ciMetadata.hpp" @@ -111,5 +110,3 @@ static ciReturnAddress* make(int bci); }; - -#endif // SHARE_VM_CI_CITYPE_HPP diff --git a/src/hotspot/share/ci/ciTypeArray.hpp b/src/hotspot/share/ci/ciTypeArray.hpp --- a/src/hotspot/share/ci/ciTypeArray.hpp +++ b/src/hotspot/share/ci/ciTypeArray.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CITYPEARRAY_HPP -#define SHARE_VM_CI_CITYPEARRAY_HPP +#pragma once #include "ci/ciArray.hpp" #include "ci/ciClassList.hpp" @@ -60,5 +59,3 @@ jbyte byte_at(int index); }; - -#endif // SHARE_VM_CI_CITYPEARRAY_HPP diff --git a/src/hotspot/share/ci/ciTypeArrayKlass.hpp b/src/hotspot/share/ci/ciTypeArrayKlass.hpp --- a/src/hotspot/share/ci/ciTypeArrayKlass.hpp +++ b/src/hotspot/share/ci/ciTypeArrayKlass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CITYPEARRAYKLASS_HPP -#define SHARE_VM_CI_CITYPEARRAYKLASS_HPP +#pragma once #include "ci/ciArrayKlass.hpp" @@ -62,5 +61,3 @@ return this; } }; - -#endif // SHARE_VM_CI_CITYPEARRAYKLASS_HPP diff --git a/src/hotspot/share/ci/ciTypeFlow.hpp b/src/hotspot/share/ci/ciTypeFlow.hpp --- a/src/hotspot/share/ci/ciTypeFlow.hpp +++ b/src/hotspot/share/ci/ciTypeFlow.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CITYPEFLOW_HPP -#define SHARE_VM_CI_CITYPEFLOW_HPP +#pragma once #ifdef COMPILER2 #include "ci/ciEnv.hpp" @@ -949,5 +948,3 @@ void rpo_print_on(outputStream* st) const PRODUCT_RETURN; }; - -#endif // SHARE_VM_CI_CITYPEFLOW_HPP diff --git a/src/hotspot/share/ci/ciUtilities.hpp b/src/hotspot/share/ci/ciUtilities.hpp --- a/src/hotspot/share/ci/ciUtilities.hpp +++ b/src/hotspot/share/ci/ciUtilities.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIUTILITIES_HPP -#define SHARE_VM_CI_CIUTILITIES_HPP +#pragma once #include "ci/ciEnv.hpp" #include "utilities/globalDefinitions.hpp" @@ -55,5 +54,3 @@ template T ci_card_table_address_as() { return reinterpret_cast(ci_card_table_address()); } - -#endif // SHARE_VM_CI_CIUTILITIES_HPP diff --git a/src/hotspot/share/ci/ciUtilities.inline.hpp b/src/hotspot/share/ci/ciUtilities.inline.hpp --- a/src/hotspot/share/ci/ciUtilities.inline.hpp +++ b/src/hotspot/share/ci/ciUtilities.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_CIUTILITIES_INLINE_HPP -#define SHARE_VM_CI_CIUTILITIES_INLINE_HPP +#pragma once #include "ci/ciUtilities.hpp" #include "runtime/interfaceSupport.inline.hpp" @@ -88,6 +87,3 @@ CLEAR_PENDING_EXCEPTION; \ } \ (void)(0 - -#endif // SHARE_VM_CI_CIUTILITIES_INLINE_HPP - diff --git a/src/hotspot/share/ci/compilerInterface.hpp b/src/hotspot/share/ci/compilerInterface.hpp --- a/src/hotspot/share/ci/compilerInterface.hpp +++ b/src/hotspot/share/ci/compilerInterface.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CI_COMPILERINTERFACE_HPP -#define SHARE_VM_CI_COMPILERINTERFACE_HPP +#pragma once #include "ci/ciArray.hpp" #include "ci/ciArrayKlass.hpp" @@ -49,5 +48,3 @@ // This is a dummy file used for including the complete // compiler interface. - -#endif // SHARE_VM_CI_COMPILERINTERFACE_HPP diff --git a/src/hotspot/share/classfile/altHashing.hpp b/src/hotspot/share/classfile/altHashing.hpp --- a/src/hotspot/share/classfile/altHashing.hpp +++ b/src/hotspot/share/classfile/altHashing.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_ALTHASHING_HPP -#define SHARE_VM_CLASSFILE_ALTHASHING_HPP +#pragma once #include "jni.h" #include "classfile/symbolTable.hpp" @@ -51,4 +50,3 @@ static juint murmur3_32(juint seed, const jbyte* data, int len); static juint murmur3_32(juint seed, const jchar* data, int len); }; -#endif // SHARE_VM_CLASSFILE_ALTHASHING_HPP diff --git a/src/hotspot/share/classfile/bytecodeAssembler.hpp b/src/hotspot/share/classfile/bytecodeAssembler.hpp --- a/src/hotspot/share/classfile/bytecodeAssembler.hpp +++ b/src/hotspot/share/classfile/bytecodeAssembler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_BYTECODEASSEMBLER_HPP -#define SHARE_VM_CLASSFILE_BYTECODEASSEMBLER_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/method.hpp" @@ -210,5 +209,3 @@ void load(BasicType bt, u4 index); void _return(BasicType bt); }; - -#endif // SHARE_VM_CLASSFILE_BYTECODEASSEMBLER_HPP diff --git a/src/hotspot/share/classfile/classFileParser.hpp b/src/hotspot/share/classfile/classFileParser.hpp --- a/src/hotspot/share/classfile/classFileParser.hpp +++ b/src/hotspot/share/classfile/classFileParser.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP -#define SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP +#pragma once #include "memory/referenceType.hpp" #include "oops/annotations.hpp" @@ -545,5 +544,3 @@ #endif }; - -#endif // SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP diff --git a/src/hotspot/share/classfile/classFileStream.hpp b/src/hotspot/share/classfile/classFileStream.hpp --- a/src/hotspot/share/classfile/classFileStream.hpp +++ b/src/hotspot/share/classfile/classFileStream.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP -#define SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/bytes.hpp" @@ -142,5 +141,3 @@ uint64_t compute_fingerprint() const; }; - -#endif // SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP diff --git a/src/hotspot/share/classfile/classListParser.hpp b/src/hotspot/share/classfile/classListParser.hpp --- a/src/hotspot/share/classfile/classListParser.hpp +++ b/src/hotspot/share/classfile/classListParser.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_CLASSLISTPARSER_HPP -#define SHARE_VM_MEMORY_CLASSLISTPARSER_HPP +#pragma once #include "utilities/exceptions.hpp" #include "utilities/globalDefinitions.hpp" @@ -127,4 +126,3 @@ InstanceKlass* lookup_super_for_current_class(Symbol* super_name); InstanceKlass* lookup_interface_for_current_class(Symbol* interface_name); }; -#endif diff --git a/src/hotspot/share/classfile/classLoader.hpp b/src/hotspot/share/classfile/classLoader.hpp --- a/src/hotspot/share/classfile/classLoader.hpp +++ b/src/hotspot/share/classfile/classLoader.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_CLASSLOADER_HPP -#define SHARE_VM_CLASSFILE_CLASSLOADER_HPP +#pragma once #include "jimage.hpp" #include "runtime/handles.hpp" @@ -505,5 +504,3 @@ ~PerfClassTraceTime(); void initialize(); }; - -#endif // SHARE_VM_CLASSFILE_CLASSLOADER_HPP diff --git a/src/hotspot/share/classfile/classLoader.inline.hpp b/src/hotspot/share/classfile/classLoader.inline.hpp --- a/src/hotspot/share/classfile/classLoader.inline.hpp +++ b/src/hotspot/share/classfile/classLoader.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_CLASSLOADER_INLINE_HPP -#define SHARE_VM_CLASSFILE_CLASSLOADER_INLINE_HPP +#pragma once #include "classfile/classLoader.hpp" #include "runtime/orderAccess.hpp" @@ -95,5 +94,3 @@ } #endif // INCLUDE_CDS - -#endif // SHARE_VM_CLASSFILE_CLASSLOADER_INLINE_HPP diff --git a/src/hotspot/share/classfile/classLoaderData.hpp b/src/hotspot/share/classfile/classLoaderData.hpp --- a/src/hotspot/share/classfile/classLoaderData.hpp +++ b/src/hotspot/share/classfile/classLoaderData.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATA_HPP -#define SHARE_VM_CLASSFILE_CLASSLOADERDATA_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/memRegion.hpp" @@ -326,5 +325,3 @@ JFR_ONLY(DEFINE_TRACE_ID_METHODS;) }; - -#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATA_HPP diff --git a/src/hotspot/share/classfile/classLoaderData.inline.hpp b/src/hotspot/share/classfile/classLoaderData.inline.hpp --- a/src/hotspot/share/classfile/classLoaderData.inline.hpp +++ b/src/hotspot/share/classfile/classLoaderData.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATA_INLINE_HPP -#define SHARE_VM_CLASSFILE_CLASSLOADERDATA_INLINE_HPP +#pragma once #include "classfile/classLoaderData.hpp" #include "classfile/javaClasses.hpp" @@ -54,5 +53,3 @@ assert(loader_data != NULL, "Must be"); return loader_data; } - -#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATA_INLINE_HPP diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.hpp --- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp +++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_HPP -#define SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_HPP +#pragma once #include "classfile/classLoaderData.hpp" #include "memory/allocation.hpp" @@ -185,4 +184,3 @@ bool repeat() { return _data != NULL; } ClassLoaderMetaspace* get_next(); }; -#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_HPP diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp --- a/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp +++ b/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP -#define SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP +#pragma once #include "classfile/classLoaderDataGraph.hpp" #include "classfile/javaClasses.hpp" @@ -78,5 +77,3 @@ _safepoint_cleanup_needed = false; // reset return do_cleaning; } - -#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP diff --git a/src/hotspot/share/classfile/classLoaderExt.hpp b/src/hotspot/share/classfile/classLoaderExt.hpp --- a/src/hotspot/share/classfile/classLoaderExt.hpp +++ b/src/hotspot/share/classfile/classLoaderExt.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_CLASSLOADEREXT_HPP -#define SHARE_VM_CLASSFILE_CLASSLOADEREXT_HPP +#pragma once #include "classfile/classLoader.hpp" #include "classfile/moduleEntry.hpp" @@ -123,5 +122,3 @@ } #endif }; - -#endif // SHARE_VM_CLASSFILE_CLASSLOADEREXT_HPP diff --git a/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp b/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp --- a/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp +++ b/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp @@ -23,8 +23,7 @@ * */ -#ifndef HOTSPOT_SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP_ -#define HOTSPOT_SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP_ +#pragma once #include "services/diagnosticCommand.hpp" @@ -55,5 +54,3 @@ virtual void execute(DCmdSource source, TRAPS); }; - -#endif /* HOTSPOT_SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP_ */ diff --git a/src/hotspot/share/classfile/classLoaderStats.hpp b/src/hotspot/share/classfile/classLoaderStats.hpp --- a/src/hotspot/share/classfile/classLoaderStats.hpp +++ b/src/hotspot/share/classfile/classLoaderStats.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_CLASSLOADERSTATS_HPP -#define SHARE_VM_CLASSFILE_CLASSLOADERSTATS_HPP +#pragma once #include "classfile/classLoaderData.hpp" @@ -149,5 +148,3 @@ void doit(); }; - -#endif // SHARE_VM_CLASSFILE_CLASSLOADERSTATS_HPP diff --git a/src/hotspot/share/classfile/compactHashtable.hpp b/src/hotspot/share/classfile/compactHashtable.hpp --- a/src/hotspot/share/classfile/compactHashtable.hpp +++ b/src/hotspot/share/classfile/compactHashtable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_COMPACTHASHTABLE_HPP -#define SHARE_VM_CLASSFILE_COMPACTHASHTABLE_HPP +#pragma once #include "oops/array.hpp" #include "oops/symbol.hpp" @@ -427,5 +426,3 @@ void get_utf8(char* utf8_buffer, int utf8_length); static void put_utf8(outputStream* st, const char* utf8_string, int utf8_length); }; - -#endif // SHARE_VM_CLASSFILE_COMPACTHASHTABLE_HPP diff --git a/src/hotspot/share/classfile/defaultMethods.hpp b/src/hotspot/share/classfile/defaultMethods.hpp --- a/src/hotspot/share/classfile/defaultMethods.hpp +++ b/src/hotspot/share/classfile/defaultMethods.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_DEFAULTMETHODS_HPP -#define SHARE_VM_CLASSFILE_DEFAULTMETHODS_HPP +#pragma once #include "runtime/handles.hpp" #include "utilities/growableArray.hpp" @@ -45,4 +44,3 @@ static void generate_default_methods( InstanceKlass* klass, const GrowableArray* mirandas, TRAPS); }; -#endif // SHARE_VM_CLASSFILE_DEFAULTMETHODS_HPP diff --git a/src/hotspot/share/classfile/dictionary.hpp b/src/hotspot/share/classfile/dictionary.hpp --- a/src/hotspot/share/classfile/dictionary.hpp +++ b/src/hotspot/share/classfile/dictionary.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_DICTIONARY_HPP -#define SHARE_VM_CLASSFILE_DICTIONARY_HPP +#pragma once #include "classfile/protectionDomainCache.hpp" #include "classfile/systemDictionary.hpp" @@ -307,4 +306,3 @@ return (SymbolPropertyEntry*) Hashtable::bucket(i); } }; -#endif // SHARE_VM_CLASSFILE_DICTIONARY_HPP diff --git a/src/hotspot/share/classfile/dictionary.inline.hpp b/src/hotspot/share/classfile/dictionary.inline.hpp --- a/src/hotspot/share/classfile/dictionary.inline.hpp +++ b/src/hotspot/share/classfile/dictionary.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_DICTIONARY_INLINE_HPP -#define SHARE_VM_CLASSFILE_DICTIONARY_INLINE_HPP +#pragma once #include "classfile/dictionary.hpp" #include "runtime/orderAccess.hpp" @@ -35,5 +34,3 @@ inline void DictionaryEntry::release_set_pd_set(ProtectionDomainEntry* new_head) { OrderAccess::release_store(&_pd_set, new_head); } - -#endif // SHARE_VM_CLASSFILE_DICTIONARY_INLINE_HPP diff --git a/src/hotspot/share/classfile/javaAssertions.hpp b/src/hotspot/share/classfile/javaAssertions.hpp --- a/src/hotspot/share/classfile/javaAssertions.hpp +++ b/src/hotspot/share/classfile/javaAssertions.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_JAVAASSERTIONS_HPP -#define SHARE_VM_CLASSFILE_JAVAASSERTIONS_HPP +#pragma once #include "oops/objArrayOop.hpp" #include "oops/typeArrayOop.hpp" @@ -103,5 +102,3 @@ tty->print_cr("JavaAssertions::setSystemClassDefault(%d)", enabled); _sysDefault = enabled; } - -#endif // SHARE_VM_CLASSFILE_JAVAASSERTIONS_HPP diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp --- a/src/hotspot/share/classfile/javaClasses.hpp +++ b/src/hotspot/share/classfile/javaClasses.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_JAVACLASSES_HPP -#define SHARE_VM_CLASSFILE_JAVACLASSES_HPP +#pragma once #include "classfile/systemDictionary.hpp" #include "jvmtifiles/jvmti.h" @@ -1537,5 +1536,3 @@ }; #undef DECLARE_INJECTED_FIELD_ENUM - -#endif // SHARE_VM_CLASSFILE_JAVACLASSES_HPP diff --git a/src/hotspot/share/classfile/javaClasses.inline.hpp b/src/hotspot/share/classfile/javaClasses.inline.hpp --- a/src/hotspot/share/classfile/javaClasses.inline.hpp +++ b/src/hotspot/share/classfile/javaClasses.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_JAVACLASSES_INLINE_HPP -#define SHARE_VM_CLASSFILE_JAVACLASSES_INLINE_HPP +#pragma once #include "classfile/javaClasses.hpp" #include "oops/access.inline.hpp" @@ -257,5 +256,3 @@ return holder->source_file_name(); } } - -#endif // SHARE_VM_CLASSFILE_JAVACLASSES_INLINE_HPP diff --git a/src/hotspot/share/classfile/klassFactory.hpp b/src/hotspot/share/classfile/klassFactory.hpp --- a/src/hotspot/share/classfile/klassFactory.hpp +++ b/src/hotspot/share/classfile/klassFactory.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_KLASSFACTORY_HPP -#define SHARE_VM_CLASSFILE_KLASSFACTORY_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/handles.hpp" @@ -82,5 +81,3 @@ Handle class_loader, Handle protection_domain, TRAPS); }; - -#endif // SHARE_VM_CLASSFILE_KLASSFACTORY_HPP diff --git a/src/hotspot/share/classfile/loaderConstraints.hpp b/src/hotspot/share/classfile/loaderConstraints.hpp --- a/src/hotspot/share/classfile/loaderConstraints.hpp +++ b/src/hotspot/share/classfile/loaderConstraints.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_LOADERCONSTRAINTS_HPP -#define SHARE_VM_CLASSFILE_LOADERCONSTRAINTS_HPP +#pragma once #include "classfile/placeholders.hpp" #include "utilities/hashtable.hpp" @@ -129,5 +128,3 @@ // convenience void set_loader(int i, oop p); }; - -#endif // SHARE_VM_CLASSFILE_LOADERCONSTRAINTS_HPP diff --git a/src/hotspot/share/classfile/metadataOnStackMark.hpp b/src/hotspot/share/classfile/metadataOnStackMark.hpp --- a/src/hotspot/share/classfile/metadataOnStackMark.hpp +++ b/src/hotspot/share/classfile/metadataOnStackMark.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_METADATAONSTACKMARK_HPP -#define SHARE_VM_CLASSFILE_METADATAONSTACKMARK_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/chunkedList.hpp" @@ -54,5 +53,3 @@ static void record(Metadata* m); static void retire_current_buffer(); }; - -#endif // SHARE_VM_CLASSFILE_METADATAONSTACKMARK_HPP diff --git a/src/hotspot/share/classfile/moduleEntry.hpp b/src/hotspot/share/classfile/moduleEntry.hpp --- a/src/hotspot/share/classfile/moduleEntry.hpp +++ b/src/hotspot/share/classfile/moduleEntry.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_MODULEENTRY_HPP -#define SHARE_VM_CLASSFILE_MODULEENTRY_HPP +#pragma once #include "jni.h" #include "classfile/classLoaderData.hpp" @@ -263,5 +262,3 @@ void print(outputStream* st = tty); void verify(); }; - -#endif // SHARE_VM_CLASSFILE_MODULEENTRY_HPP diff --git a/src/hotspot/share/classfile/modules.hpp b/src/hotspot/share/classfile/modules.hpp --- a/src/hotspot/share/classfile/modules.hpp +++ b/src/hotspot/share/classfile/modules.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_MODULES_HPP -#define SHARE_VM_CLASSFILE_MODULES_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/handles.hpp" @@ -125,5 +124,3 @@ static bool is_package_defined(Symbol* package_name, Handle h_loader, TRAPS); static ModuleEntryTable* get_module_entry_table(Handle h_loader); }; - -#endif // SHARE_VM_CLASSFILE_MODULES_HPP diff --git a/src/hotspot/share/classfile/packageEntry.hpp b/src/hotspot/share/classfile/packageEntry.hpp --- a/src/hotspot/share/classfile/packageEntry.hpp +++ b/src/hotspot/share/classfile/packageEntry.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_PACKAGEENTRY_HPP -#define SHARE_VM_CLASSFILE_PACKAGEENTRY_HPP +#pragma once #include "classfile/moduleEntry.hpp" #include "oops/symbol.hpp" @@ -264,5 +263,3 @@ void print(outputStream* st = tty); void verify(); }; - -#endif // SHARE_VM_CLASSFILE_PACKAGEENTRY_HPP diff --git a/src/hotspot/share/classfile/placeholders.hpp b/src/hotspot/share/classfile/placeholders.hpp --- a/src/hotspot/share/classfile/placeholders.hpp +++ b/src/hotspot/share/classfile/placeholders.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP -#define SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP +#pragma once #include "runtime/thread.hpp" #include "utilities/hashtable.hpp" @@ -320,5 +319,3 @@ void print_entry(outputStream* st) const; void verify() const; }; - -#endif // SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP diff --git a/src/hotspot/share/classfile/protectionDomainCache.hpp b/src/hotspot/share/classfile/protectionDomainCache.hpp --- a/src/hotspot/share/classfile/protectionDomainCache.hpp +++ b/src/hotspot/share/classfile/protectionDomainCache.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_PROTECTIONDOMAINCACHE_HPP -#define SHARE_VM_CLASSFILE_PROTECTIONDOMAINCACHE_HPP +#pragma once #include "oops/oop.hpp" #include "oops/weakHandle.hpp" @@ -120,4 +119,3 @@ oop object(); oop object_no_keepalive(); }; -#endif // SHARE_VM_CLASSFILE_PROTECTIONDOMAINCACHE_HPP diff --git a/src/hotspot/share/classfile/resolutionErrors.hpp b/src/hotspot/share/classfile/resolutionErrors.hpp --- a/src/hotspot/share/classfile/resolutionErrors.hpp +++ b/src/hotspot/share/classfile/resolutionErrors.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_RESOLUTIONERRORS_HPP -#define SHARE_VM_CLASSFILE_RESOLUTIONERRORS_HPP +#pragma once #include "oops/constantPool.hpp" #include "utilities/hashtable.hpp" @@ -116,5 +115,3 @@ return (ResolutionErrorEntry**)HashtableEntry::next_addr(); } }; - -#endif // SHARE_VM_CLASSFILE_RESOLUTIONERRORS_HPP diff --git a/src/hotspot/share/classfile/sharedPathsMiscInfo.hpp b/src/hotspot/share/classfile/sharedPathsMiscInfo.hpp --- a/src/hotspot/share/classfile/sharedPathsMiscInfo.hpp +++ b/src/hotspot/share/classfile/sharedPathsMiscInfo.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_SHAREDPATHSMISCINFO_HPP -#define SHARE_VM_CLASSFILE_SHAREDPATHSMISCINFO_HPP +#pragma once #include "classfile/classLoader.hpp" #include "runtime/os.hpp" @@ -164,5 +163,3 @@ public: bool check(); }; - -#endif // SHARE_VM_CLASSFILE_SHAREDPATHSMISCINFO_HPP diff --git a/src/hotspot/share/classfile/stackMapFrame.hpp b/src/hotspot/share/classfile/stackMapFrame.hpp --- a/src/hotspot/share/classfile/stackMapFrame.hpp +++ b/src/hotspot/share/classfile/stackMapFrame.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_STACKMAPFRAME_HPP -#define SHARE_VM_CLASSFILE_STACKMAPFRAME_HPP +#pragma once #include "classfile/verificationType.hpp" #include "classfile/verifier.hpp" @@ -294,5 +293,3 @@ void print_on(outputStream* str) const; }; - -#endif // SHARE_VM_CLASSFILE_STACKMAPFRAME_HPP diff --git a/src/hotspot/share/classfile/stackMapTable.hpp b/src/hotspot/share/classfile/stackMapTable.hpp --- a/src/hotspot/share/classfile/stackMapTable.hpp +++ b/src/hotspot/share/classfile/stackMapTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP -#define SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP +#pragma once #include "classfile/stackMapFrame.hpp" #include "classfile/verifier.hpp" @@ -154,5 +153,3 @@ } } }; - -#endif // SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP diff --git a/src/hotspot/share/classfile/stackMapTableFormat.hpp b/src/hotspot/share/classfile/stackMapTableFormat.hpp --- a/src/hotspot/share/classfile/stackMapTableFormat.hpp +++ b/src/hotspot/share/classfile/stackMapTableFormat.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_STACKMAPTABLEFORMAT_HPP -#define SHARE_VM_CLASSFILE_STACKMAPTABLEFORMAT_HPP +#pragma once #include "classfile/verificationType.hpp" @@ -962,5 +961,3 @@ }; #undef FOR_EACH_STACKMAP_FRAME_TYPE - -#endif // SHARE_VM_CLASSFILE_STACKMAPTABLEFORMAT_HPP diff --git a/src/hotspot/share/classfile/stringTable.hpp b/src/hotspot/share/classfile/stringTable.hpp --- a/src/hotspot/share/classfile/stringTable.hpp +++ b/src/hotspot/share/classfile/stringTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_STRINGTABLE_HPP -#define SHARE_VM_CLASSFILE_STRINGTABLE_HPP +#pragma once #include "gc/shared/oopStorage.hpp" #include "gc/shared/oopStorageParState.hpp" @@ -176,5 +175,3 @@ static size_t verify_and_compare_entries(); static void verify(); }; - -#endif // SHARE_VM_CLASSFILE_STRINGTABLE_HPP diff --git a/src/hotspot/share/classfile/symbolTable.hpp b/src/hotspot/share/classfile/symbolTable.hpp --- a/src/hotspot/share/classfile/symbolTable.hpp +++ b/src/hotspot/share/classfile/symbolTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP -#define SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/padded.hpp" @@ -258,5 +257,3 @@ // Histogram static void print_histogram() PRODUCT_RETURN; }; - -#endif // SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp --- a/src/hotspot/share/classfile/systemDictionary.hpp +++ b/src/hotspot/share/classfile/systemDictionary.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP -#define SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP +#pragma once #include "classfile/classLoader.hpp" #include "jvmci/systemDictionary_jvmci.hpp" @@ -702,5 +701,3 @@ static bool _has_checkPackageAccess; }; - -#endif // SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP diff --git a/src/hotspot/share/classfile/systemDictionaryShared.hpp b/src/hotspot/share/classfile/systemDictionaryShared.hpp --- a/src/hotspot/share/classfile/systemDictionaryShared.hpp +++ b/src/hotspot/share/classfile/systemDictionaryShared.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP -#define SHARE_VM_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP +#pragma once #include "oops/klass.hpp" #include "classfile/dictionary.hpp" @@ -299,5 +298,3 @@ DEBUG_ONLY(static bool checked_excluded_classes() {return _checked_excluded_classes;}) }; - -#endif // SHARE_VM_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP diff --git a/src/hotspot/share/classfile/verificationType.hpp b/src/hotspot/share/classfile/verificationType.hpp --- a/src/hotspot/share/classfile/verificationType.hpp +++ b/src/hotspot/share/classfile/verificationType.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP -#define SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP +#pragma once #include "classfile/systemDictionary.hpp" #include "oops/instanceKlass.hpp" @@ -340,5 +339,3 @@ bool from_is_array, bool from_is_object, TRAPS); }; - -#endif // SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP diff --git a/src/hotspot/share/classfile/verifier.hpp b/src/hotspot/share/classfile/verifier.hpp --- a/src/hotspot/share/classfile/verifier.hpp +++ b/src/hotspot/share/classfile/verifier.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_VERIFIER_HPP -#define SHARE_VM_CLASSFILE_VERIFIER_HPP +#pragma once #include "classfile/verificationType.hpp" #include "oops/klass.hpp" @@ -462,5 +461,3 @@ return 1; } } - -#endif // SHARE_VM_CLASSFILE_VERIFIER_HPP diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp --- a/src/hotspot/share/classfile/vmSymbols.hpp +++ b/src/hotspot/share/classfile/vmSymbols.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CLASSFILE_VMSYMBOLS_HPP -#define SHARE_VM_CLASSFILE_VMSYMBOLS_HPP +#pragma once #include "classfile/moduleEntry.hpp" #include "jfr/support/jfrIntrinsics.hpp" @@ -1655,5 +1654,3 @@ static bool is_intrinsic_disabled(vmIntrinsics::ID id); static bool is_intrinsic_available(vmIntrinsics::ID id); }; - -#endif // SHARE_VM_CLASSFILE_VMSYMBOLS_HPP diff --git a/src/hotspot/share/code/codeBehaviours.hpp b/src/hotspot/share/code/codeBehaviours.hpp --- a/src/hotspot/share/code/codeBehaviours.hpp +++ b/src/hotspot/share/code/codeBehaviours.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_CODE_CODEBEHAVIOURS_HPP -#define SHARE_CODE_CODEBEHAVIOURS_HPP +#pragma once #include "memory/allocation.hpp" @@ -46,5 +45,3 @@ virtual void unlock(CompiledMethod* method); virtual bool is_safe(CompiledMethod* method); }; - -#endif // SHARE_CODE_CODEBEHAVIOURS_HPP diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp --- a/src/hotspot/share/code/codeBlob.hpp +++ b/src/hotspot/share/code/codeBlob.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_CODEBLOB_HPP -#define SHARE_VM_CODE_CODEBLOB_HPP +#pragma once #include "asm/codeBuffer.hpp" #include "compiler/compilerDefinitions.hpp" @@ -731,5 +730,3 @@ // Typing bool is_safepoint_stub() const { return true; } }; - -#endif // SHARE_VM_CODE_CODEBLOB_HPP diff --git a/src/hotspot/share/code/codeCache.hpp b/src/hotspot/share/code/codeCache.hpp --- a/src/hotspot/share/code/codeCache.hpp +++ b/src/hotspot/share/code/codeCache.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_CODECACHE_HPP -#define SHARE_VM_CODE_CODECACHE_HPP +#pragma once #include "code/codeBlob.hpp" #include "code/nmethod.hpp" @@ -429,5 +428,3 @@ typedef CodeBlobIterator CompiledMethodIterator; typedef CodeBlobIterator NMethodIterator; - -#endif // SHARE_VM_CODE_CODECACHE_HPP diff --git a/src/hotspot/share/code/codeHeapState.hpp b/src/hotspot/share/code/codeHeapState.hpp --- a/src/hotspot/share/code/codeHeapState.hpp +++ b/src/hotspot/share/code/codeHeapState.hpp @@ -23,8 +23,7 @@ * */ -#ifndef SHARE_CODE_CODEHEAPSTATE_HPP -#define SHARE_CODE_CODEHEAPSTATE_HPP +#pragma once #include "memory/heap.hpp" #include "utilities/debug.hpp" @@ -228,5 +227,3 @@ int maxTemp; int minTemp; }; - -#endif // SHARE_CODE_CODEHEAPSTATE_HPP diff --git a/src/hotspot/share/code/compiledIC.hpp b/src/hotspot/share/code/compiledIC.hpp --- a/src/hotspot/share/code/compiledIC.hpp +++ b/src/hotspot/share/code/compiledIC.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_COMPILEDIC_HPP -#define SHARE_VM_CODE_COMPILEDIC_HPP +#pragma once #include "code/nativeInst.hpp" #include "interpreter/linkResolver.hpp" @@ -453,5 +452,3 @@ virtual address resolve_call_stub() const; virtual const char* name() const { return "CompiledDirectStaticCall"; } }; - -#endif // SHARE_VM_CODE_COMPILEDIC_HPP diff --git a/src/hotspot/share/code/compiledMethod.hpp b/src/hotspot/share/code/compiledMethod.hpp --- a/src/hotspot/share/code/compiledMethod.hpp +++ b/src/hotspot/share/code/compiledMethod.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_COMPILEDMETHOD_HPP -#define SHARE_VM_CODE_COMPILEDMETHOD_HPP +#pragma once #include "code/codeBlob.hpp" #include "code/pcDesc.hpp" @@ -413,5 +412,3 @@ // Used by some GCs to chain nmethods. nmethod* _scavenge_root_link; // from CodeCache::scavenge_root_nmethods }; - -#endif //SHARE_VM_CODE_COMPILEDMETHOD_HPP diff --git a/src/hotspot/share/code/compiledMethod.inline.hpp b/src/hotspot/share/code/compiledMethod.inline.hpp --- a/src/hotspot/share/code/compiledMethod.inline.hpp +++ b/src/hotspot/share/code/compiledMethod.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_COMPILEDMETHOD_INLINE_HPP -#define SHARE_VM_CODE_COMPILEDMETHOD_INLINE_HPP +#pragma once #include "code/compiledMethod.hpp" #include "code/nativeInst.hpp" @@ -75,6 +74,3 @@ // increment_count is only called under lock, but there may be concurrent readers. inline void ExceptionCache::increment_count() { OrderAccess::release_store(&_count, _count + 1); } - - -#endif //SHARE_VM_CODE_COMPILEDMETHOD_INLINE_HPP diff --git a/src/hotspot/share/code/compressedStream.hpp b/src/hotspot/share/code/compressedStream.hpp --- a/src/hotspot/share/code/compressedStream.hpp +++ b/src/hotspot/share/code/compressedStream.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_COMPRESSEDSTREAM_HPP -#define SHARE_VM_CODE_COMPRESSEDSTREAM_HPP +#pragma once #include "memory/allocation.hpp" @@ -156,5 +155,3 @@ void write_double(jdouble value); // write_int(reverse_int()) void write_long(jlong value); // write_signed_int() }; - -#endif // SHARE_VM_CODE_COMPRESSEDSTREAM_HPP diff --git a/src/hotspot/share/code/debugInfo.hpp b/src/hotspot/share/code/debugInfo.hpp --- a/src/hotspot/share/code/debugInfo.hpp +++ b/src/hotspot/share/code/debugInfo.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_DEBUGINFO_HPP -#define SHARE_VM_CODE_DEBUGINFO_HPP +#pragma once #include "code/compressedStream.hpp" #include "code/location.hpp" @@ -300,5 +299,3 @@ void write_metadata(Metadata* m); }; - -#endif // SHARE_VM_CODE_DEBUGINFO_HPP diff --git a/src/hotspot/share/code/debugInfoRec.hpp b/src/hotspot/share/code/debugInfoRec.hpp --- a/src/hotspot/share/code/debugInfoRec.hpp +++ b/src/hotspot/share/code/debugInfoRec.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_DEBUGINFOREC_HPP -#define SHARE_VM_CODE_DEBUGINFOREC_HPP +#pragma once #include "ci/ciClassList.hpp" #include "ci/ciInstanceKlass.hpp" @@ -207,5 +206,3 @@ public: enum { serialized_null = 0 }; }; - -#endif // SHARE_VM_CODE_DEBUGINFOREC_HPP diff --git a/src/hotspot/share/code/dependencies.hpp b/src/hotspot/share/code/dependencies.hpp --- a/src/hotspot/share/code/dependencies.hpp +++ b/src/hotspot/share/code/dependencies.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_DEPENDENCIES_HPP -#define SHARE_VM_CODE_DEPENDENCIES_HPP +#pragma once #include "ci/ciCallSite.hpp" #include "ci/ciKlass.hpp" @@ -798,5 +797,3 @@ oop call_site() const { return _call_site(); } oop method_handle() const { return _method_handle(); } }; - -#endif // SHARE_VM_CODE_DEPENDENCIES_HPP diff --git a/src/hotspot/share/code/dependencyContext.hpp b/src/hotspot/share/code/dependencyContext.hpp --- a/src/hotspot/share/code/dependencyContext.hpp +++ b/src/hotspot/share/code/dependencyContext.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_DEPENDENCYCONTEXT_HPP -#define SHARE_VM_CODE_DEPENDENCYCONTEXT_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oop.hpp" @@ -132,4 +131,3 @@ bool is_dependent_nmethod(nmethod* nm); #endif //PRODUCT }; -#endif // SHARE_VM_CODE_DEPENDENCYCONTEXT_HPP diff --git a/src/hotspot/share/code/exceptionHandlerTable.hpp b/src/hotspot/share/code/exceptionHandlerTable.hpp --- a/src/hotspot/share/code/exceptionHandlerTable.hpp +++ b/src/hotspot/share/code/exceptionHandlerTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_EXCEPTIONHANDLERTABLE_HPP -#define SHARE_VM_CODE_EXCEPTIONHANDLERTABLE_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/method.hpp" @@ -162,5 +161,3 @@ void print(address base) const; void verify(nmethod *nm) const; }; - -#endif // SHARE_VM_CODE_EXCEPTIONHANDLERTABLE_HPP diff --git a/src/hotspot/share/code/icBuffer.hpp b/src/hotspot/share/code/icBuffer.hpp --- a/src/hotspot/share/code/icBuffer.hpp +++ b/src/hotspot/share/code/icBuffer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_ICBUFFER_HPP -#define SHARE_VM_CODE_ICBUFFER_HPP +#pragma once #include "asm/codeBuffer.hpp" #include "code/stubs.hpp" @@ -177,5 +176,3 @@ static address ic_destination_for(CompiledIC *ic); static void* cached_value_for(CompiledIC *ic); }; - -#endif // SHARE_VM_CODE_ICBUFFER_HPP diff --git a/src/hotspot/share/code/location.hpp b/src/hotspot/share/code/location.hpp --- a/src/hotspot/share/code/location.hpp +++ b/src/hotspot/share/code/location.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_LOCATION_HPP -#define SHARE_VM_CODE_LOCATION_HPP +#pragma once #include "asm/assembler.hpp" #include "code/vmreg.hpp" @@ -122,5 +121,3 @@ // check static bool legal_offset_in_bytes(int offset_in_bytes); }; - -#endif // SHARE_VM_CODE_LOCATION_HPP diff --git a/src/hotspot/share/code/nativeInst.hpp b/src/hotspot/share/code/nativeInst.hpp --- a/src/hotspot/share/code/nativeInst.hpp +++ b/src/hotspot/share/code/nativeInst.hpp @@ -22,11 +22,8 @@ * */ -#ifndef SHARE_VM_CODE_NATIVEINST_HPP -#define SHARE_VM_CODE_NATIVEINST_HPP +#pragma once #include "utilities/macros.hpp" #include CPU_HEADER(nativeInst) - -#endif // SHARE_VM_CODE_NATIVEINST_HPP diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp --- a/src/hotspot/share/code/nmethod.hpp +++ b/src/hotspot/share/code/nmethod.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_NMETHOD_HPP -#define SHARE_VM_CODE_NMETHOD_HPP +#pragma once #include "code/compiledMethod.hpp" @@ -667,5 +666,3 @@ lock(_nm); } }; - -#endif // SHARE_VM_CODE_NMETHOD_HPP diff --git a/src/hotspot/share/code/oopRecorder.hpp b/src/hotspot/share/code/oopRecorder.hpp --- a/src/hotspot/share/code/oopRecorder.hpp +++ b/src/hotspot/share/code/oopRecorder.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_OOPRECORDER_HPP -#define SHARE_VM_CODE_OOPRECORDER_HPP +#pragma once #include "memory/universe.hpp" #include "runtime/handles.hpp" @@ -255,6 +254,3 @@ } #endif }; - - -#endif // SHARE_VM_CODE_OOPRECORDER_HPP diff --git a/src/hotspot/share/code/pcDesc.hpp b/src/hotspot/share/code/pcDesc.hpp --- a/src/hotspot/share/code/pcDesc.hpp +++ b/src/hotspot/share/code/pcDesc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_PCDESC_HPP -#define SHARE_VM_CODE_PCDESC_HPP +#pragma once // PcDescs map a physical PC (given as offset from start of nmethod) to @@ -95,5 +94,3 @@ void print(CompiledMethod* code); bool verify(CompiledMethod* code); }; - -#endif // SHARE_VM_CODE_PCDESC_HPP diff --git a/src/hotspot/share/code/relocInfo.hpp b/src/hotspot/share/code/relocInfo.hpp --- a/src/hotspot/share/code/relocInfo.hpp +++ b/src/hotspot/share/code/relocInfo.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_RELOCINFO_HPP -#define SHARE_VM_CODE_RELOCINFO_HPP +#pragma once #include "runtime/os.hpp" #include "utilities/macros.hpp" @@ -1390,5 +1389,3 @@ inline RelocIterator::RelocIterator(CompiledMethod* nm, address begin, address limit) { initialize(nm, begin, limit); } - -#endif // SHARE_VM_CODE_RELOCINFO_HPP diff --git a/src/hotspot/share/code/relocInfo_ext.hpp b/src/hotspot/share/code/relocInfo_ext.hpp --- a/src/hotspot/share/code/relocInfo_ext.hpp +++ b/src/hotspot/share/code/relocInfo_ext.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_RELOCINFO_EXT_HPP -#define SHARE_VM_CODE_RELOCINFO_EXT_HPP +#pragma once // symbolic_Relocation allows to anotate some addresses in the generated code. // @@ -57,5 +56,3 @@ // get the new value for a given symbolic type static address symbolic_value(symbolic_reference t); }; - -#endif // SHARE_VM_CODE_RELOCINFO_EXT_HPP diff --git a/src/hotspot/share/code/scopeDesc.hpp b/src/hotspot/share/code/scopeDesc.hpp --- a/src/hotspot/share/code/scopeDesc.hpp +++ b/src/hotspot/share/code/scopeDesc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_SCOPEDESC_HPP -#define SHARE_VM_CODE_SCOPEDESC_HPP +#pragma once #include "code/debugInfo.hpp" #include "code/pcDesc.hpp" @@ -140,5 +139,3 @@ void print_value_on(outputStream* st) const; #endif }; - -#endif // SHARE_VM_CODE_SCOPEDESC_HPP diff --git a/src/hotspot/share/code/stubs.hpp b/src/hotspot/share/code/stubs.hpp --- a/src/hotspot/share/code/stubs.hpp +++ b/src/hotspot/share/code/stubs.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_STUBS_HPP -#define SHARE_VM_CODE_STUBS_HPP +#pragma once #include "asm/codeBuffer.hpp" #include "memory/allocation.hpp" @@ -214,5 +213,3 @@ void print(); // prints information about the stub queue }; - -#endif // SHARE_VM_CODE_STUBS_HPP diff --git a/src/hotspot/share/code/vmreg.hpp b/src/hotspot/share/code/vmreg.hpp --- a/src/hotspot/share/code/vmreg.hpp +++ b/src/hotspot/share/code/vmreg.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_VMREG_HPP -#define SHARE_VM_CODE_VMREG_HPP +#pragma once #include "asm/register.hpp" #include "utilities/globalDefinitions.hpp" @@ -196,5 +195,3 @@ VMRegPair(VMReg f) { _second = VMRegImpl::Bad(); _first = f; } VMRegPair() { _second = VMRegImpl::Bad(); _first = VMRegImpl::Bad(); } }; - -#endif // SHARE_VM_CODE_VMREG_HPP diff --git a/src/hotspot/share/code/vmreg.inline.hpp b/src/hotspot/share/code/vmreg.inline.hpp --- a/src/hotspot/share/code/vmreg.inline.hpp +++ b/src/hotspot/share/code/vmreg.inline.hpp @@ -22,11 +22,8 @@ * */ -#ifndef SHARE_VM_CODE_VMREG_INLINE_HPP -#define SHARE_VM_CODE_VMREG_INLINE_HPP +#pragma once #include "asm/register.hpp" #include "code/vmreg.hpp" #include CPU_HEADER_INLINE(vmreg) - -#endif // SHARE_VM_CODE_VMREG_INLINE_HPP diff --git a/src/hotspot/share/code/vtableStubs.hpp b/src/hotspot/share/code/vtableStubs.hpp --- a/src/hotspot/share/code/vtableStubs.hpp +++ b/src/hotspot/share/code/vtableStubs.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_CODE_VTABLESTUBS_HPP -#define SHARE_VM_CODE_VTABLESTUBS_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "code/vmreg.hpp" @@ -180,5 +179,3 @@ void print() const { print_on(tty); } }; - -#endif // SHARE_VM_CODE_VTABLESTUBS_HPP diff --git a/src/hotspot/share/compiler/abstractCompiler.hpp b/src/hotspot/share/compiler/abstractCompiler.hpp --- a/src/hotspot/share/compiler/abstractCompiler.hpp +++ b/src/hotspot/share/compiler/abstractCompiler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP -#define SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP +#pragma once #include "ci/compilerInterface.hpp" #include "compiler/compilerDefinitions.hpp" @@ -183,5 +182,3 @@ CompilerStatistics* stats() { return &_stats; } #endif }; - -#endif // SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP diff --git a/src/hotspot/share/compiler/compileBroker.hpp b/src/hotspot/share/compiler/compileBroker.hpp --- a/src/hotspot/share/compiler/compileBroker.hpp +++ b/src/hotspot/share/compiler/compileBroker.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_COMPILER_COMPILEBROKER_HPP -#define SHARE_VM_COMPILER_COMPILEBROKER_HPP +#pragma once #include "ci/compilerInterface.hpp" #include "compiler/abstractCompiler.hpp" @@ -425,5 +424,3 @@ static void print_info(outputStream *out); static void print_heapinfo(outputStream *out, const char* function, const char* granularity ); }; - -#endif // SHARE_VM_COMPILER_COMPILEBROKER_HPP diff --git a/src/hotspot/share/compiler/compileLog.hpp b/src/hotspot/share/compiler/compileLog.hpp --- a/src/hotspot/share/compiler/compileLog.hpp +++ b/src/hotspot/share/compiler/compileLog.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_COMPILER_COMPILELOG_HPP -#define SHARE_VM_COMPILER_COMPILELOG_HPP +#pragma once #include "utilities/xmlstream.hpp" @@ -96,5 +95,3 @@ static void finish_log(outputStream* out); static void finish_log_on_error(outputStream* out, char *buf, int buflen); }; - -#endif // SHARE_VM_COMPILER_COMPILELOG_HPP diff --git a/src/hotspot/share/compiler/compileTask.hpp b/src/hotspot/share/compiler/compileTask.hpp --- a/src/hotspot/share/compiler/compileTask.hpp +++ b/src/hotspot/share/compiler/compileTask.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_COMPILER_COMPILETASK_HPP -#define SHARE_VM_COMPILER_COMPILETASK_HPP +#pragma once #include "ci/ciMethod.hpp" #include "code/nmethod.hpp" @@ -211,5 +210,3 @@ } static void print_inlining_ul(ciMethod* method, int inline_level, int bci, const char* msg = NULL); }; - -#endif // SHARE_VM_COMPILER_COMPILETASK_HPP diff --git a/src/hotspot/share/compiler/compilerDefinitions.hpp b/src/hotspot/share/compiler/compilerDefinitions.hpp --- a/src/hotspot/share/compiler/compilerDefinitions.hpp +++ b/src/hotspot/share/compiler/compilerDefinitions.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_COMPILER_COMPILERDEFINITIONS_HPP -#define SHARE_VM_COMPILER_COMPILERDEFINITIONS_HPP +#pragma once #include "memory/allocation.hpp" @@ -131,5 +130,3 @@ private: static void set_tiered_flags(); }; - -#endif // SHARE_VM_COMPILER_COMPILERDEFINITIONS_HPP diff --git a/src/hotspot/share/compiler/compilerDirectives.hpp b/src/hotspot/share/compiler/compilerDirectives.hpp --- a/src/hotspot/share/compiler/compilerDirectives.hpp +++ b/src/hotspot/share/compiler/compilerDirectives.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_COMPILER_COMPILERDIRECTIVES_HPP -#define SHARE_VM_COMPILER_COMPILERDIRECTIVES_HPP +#pragma once #include "ci/ciMetadata.hpp" #include "ci/ciMethod.hpp" @@ -185,5 +184,3 @@ DirectiveSet* _c1_store; DirectiveSet* _c2_store; }; - -#endif // SHARE_VM_COMPILER_COMPILERDIRECTIVES_HPP diff --git a/src/hotspot/share/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp --- a/src/hotspot/share/compiler/compilerOracle.hpp +++ b/src/hotspot/share/compiler/compilerOracle.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_COMPILER_COMPILERORACLE_HPP -#define SHARE_VM_COMPILER_COMPILERORACLE_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oopsHierarchy.hpp" @@ -90,5 +89,3 @@ // Tells whether there are any methods to print for print_method_statistics() static bool should_print_methods(); }; - -#endif // SHARE_VM_COMPILER_COMPILERORACLE_HPP diff --git a/src/hotspot/share/compiler/directivesParser.hpp b/src/hotspot/share/compiler/directivesParser.hpp --- a/src/hotspot/share/compiler/directivesParser.hpp +++ b/src/hotspot/share/compiler/directivesParser.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_COMPILER_DIRECTIVESPARSER_HPP -#define SHARE_VM_COMPILER_DIRECTIVESPARSER_HPP +#pragma once #include "utilities/json.hpp" #include "compiler/compilerDirectives.hpp" @@ -138,5 +137,3 @@ static uint mask(keytype kt); }; - -#endif // SHARE_VM_COMPILER_DIRECTIVESPARSER_HPP diff --git a/src/hotspot/share/compiler/disassembler.hpp b/src/hotspot/share/compiler/disassembler.hpp --- a/src/hotspot/share/compiler/disassembler.hpp +++ b/src/hotspot/share/compiler/disassembler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_COMPILER_DISASSEMBLER_HPP -#define SHARE_VM_COMPILER_DISASSEMBLER_HPP +#pragma once #include "asm/codeBuffer.hpp" #include "runtime/globals.hpp" @@ -89,5 +88,3 @@ return masm; } }; - -#endif // SHARE_VM_COMPILER_DISASSEMBLER_HPP diff --git a/src/hotspot/share/compiler/methodLiveness.hpp b/src/hotspot/share/compiler/methodLiveness.hpp --- a/src/hotspot/share/compiler/methodLiveness.hpp +++ b/src/hotspot/share/compiler/methodLiveness.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_COMPILER_METHODLIVENESS_HPP -#define SHARE_VM_COMPILER_METHODLIVENESS_HPP +#pragma once #include "utilities/bitMap.hpp" #include "utilities/growableArray.hpp" @@ -273,5 +272,3 @@ static void print_times() PRODUCT_RETURN; }; - -#endif // SHARE_VM_COMPILER_METHODLIVENESS_HPP diff --git a/src/hotspot/share/compiler/methodMatcher.hpp b/src/hotspot/share/compiler/methodMatcher.hpp --- a/src/hotspot/share/compiler/methodMatcher.hpp +++ b/src/hotspot/share/compiler/methodMatcher.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_COMPILER_METHODMATCHER_HPP -#define SHARE_VM_COMPILER_METHODMATCHER_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/handles.hpp" @@ -122,6 +121,3 @@ static InlineMatcher* parse_inline_pattern(char* line, const char*& error_msg); InlineMatcher* clone(); }; - -#endif // SHARE_VM_COMPILER_METHODMATCHER_HPP - diff --git a/src/hotspot/share/compiler/oopMap.hpp b/src/hotspot/share/compiler/oopMap.hpp --- a/src/hotspot/share/compiler/oopMap.hpp +++ b/src/hotspot/share/compiler/oopMap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_COMPILER_OOPMAP_HPP -#define SHARE_VM_COMPILER_OOPMAP_HPP +#pragma once #include "code/compressedStream.hpp" #include "code/vmreg.hpp" @@ -466,5 +465,3 @@ } }; #endif // COMPILER2_OR_JVMCI - -#endif // SHARE_VM_COMPILER_OOPMAP_HPP diff --git a/src/hotspot/share/gc/cms/adaptiveFreeList.hpp b/src/hotspot/share/gc/cms/adaptiveFreeList.hpp --- a/src/hotspot/share/gc/cms/adaptiveFreeList.hpp +++ b/src/hotspot/share/gc/cms/adaptiveFreeList.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP -#define SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP +#pragma once #include "gc/cms/allocationStats.hpp" #include "memory/freeList.hpp" @@ -225,5 +224,3 @@ void verify_stats() const; #endif // NOT PRODUCT }; - -#endif // SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP diff --git a/src/hotspot/share/gc/cms/allocationStats.hpp b/src/hotspot/share/gc/cms/allocationStats.hpp --- a/src/hotspot/share/gc/cms/allocationStats.hpp +++ b/src/hotspot/share/gc/cms/allocationStats.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_ALLOCATIONSTATS_HPP -#define SHARE_VM_GC_CMS_ALLOCATIONSTATS_HPP +#pragma once #include "gc/shared/gcUtil.hpp" #include "logging/log.hpp" @@ -149,5 +148,3 @@ void set_returned_bytes(size_t v) { _returned_bytes = v; } ) }; - -#endif // SHARE_VM_GC_CMS_ALLOCATIONSTATS_HPP diff --git a/src/hotspot/share/gc/cms/cmsArguments.hpp b/src/hotspot/share/gc/cms/cmsArguments.hpp --- a/src/hotspot/share/gc/cms/cmsArguments.hpp +++ b/src/hotspot/share/gc/cms/cmsArguments.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_CMS_CMSARGUMENTS_HPP -#define SHARE_GC_CMS_CMSARGUMENTS_HPP +#pragma once #include "gc/shared/gcArguments.hpp" @@ -38,5 +37,3 @@ virtual size_t conservative_max_heap_alignment(); virtual CollectedHeap* create_heap(); }; - -#endif // SHARE_GC_CMS_CMSARGUMENTS_HPP diff --git a/src/hotspot/share/gc/cms/cmsCardTable.hpp b/src/hotspot/share/gc/cms/cmsCardTable.hpp --- a/src/hotspot/share/gc/cms/cmsCardTable.hpp +++ b/src/hotspot/share/gc/cms/cmsCardTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_CMS_CMSCARDTABLE_HPP -#define SHARE_GC_CMS_CMSCARDTABLE_HPP +#pragma once #include "gc/shared/cardTableRS.hpp" #include "utilities/globalDefinitions.hpp" @@ -86,5 +85,3 @@ public: CMSCardTable(MemRegion whole_heap); }; - -#endif // SHARE_GC_CMS_CMSCARDTABLE_HPP diff --git a/src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp b/src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp --- a/src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp +++ b/src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_CMSCOLLECTORPOLICY_HPP -#define SHARE_VM_GC_CMS_CMSCOLLECTORPOLICY_HPP +#pragma once #include "gc/shared/collectorPolicy.hpp" @@ -34,5 +33,3 @@ public: ConcurrentMarkSweepPolicy() {} }; - -#endif // SHARE_VM_GC_CMS_CMSCOLLECTORPOLICY_HPP diff --git a/src/hotspot/share/gc/cms/cmsGCStats.hpp b/src/hotspot/share/gc/cms/cmsGCStats.hpp --- a/src/hotspot/share/gc/cms/cmsGCStats.hpp +++ b/src/hotspot/share/gc/cms/cmsGCStats.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_CMS_CMSGCSTATS_HPP -#define SHARE_GC_CMS_CMSGCSTATS_HPP +#pragma once #include "gc/shared/gcStats.hpp" @@ -35,5 +34,3 @@ return CMSGCStatsKind; } }; - -#endif // SHARE_GC_CMS_CMSGCSTATS_HPP diff --git a/src/hotspot/share/gc/cms/cmsHeap.hpp b/src/hotspot/share/gc/cms/cmsHeap.hpp --- a/src/hotspot/share/gc/cms/cmsHeap.hpp +++ b/src/hotspot/share/gc/cms/cmsHeap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_CMSHEAP_HPP -#define SHARE_VM_GC_CMS_CMSHEAP_HPP +#pragma once #include "gc/cms/concurrentMarkSweepGeneration.hpp" #include "gc/cms/parNewGeneration.hpp" @@ -138,5 +137,3 @@ void collect_mostly_concurrent(GCCause::Cause cause); }; - -#endif // SHARE_VM_GC_CMS_CMSHEAP_HPP diff --git a/src/hotspot/share/gc/cms/cmsHeap.inline.hpp b/src/hotspot/share/gc/cms/cmsHeap.inline.hpp --- a/src/hotspot/share/gc/cms/cmsHeap.inline.hpp +++ b/src/hotspot/share/gc/cms/cmsHeap.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_CMS_CMSHEAP_INLINE_HPP -#define SHARE_GC_CMS_CMSHEAP_INLINE_HPP +#pragma once #include "gc/cms/cmsHeap.hpp" #include "gc/cms/concurrentMarkSweepGeneration.inline.hpp" @@ -35,5 +34,3 @@ young_gen()->oop_since_save_marks_iterate(cur); old_gen()->oop_since_save_marks_iterate(older); } - -#endif // SHARE_GC_CMS_CMSHEAP_INLINE_HPP diff --git a/src/hotspot/share/gc/cms/cmsLockVerifier.hpp b/src/hotspot/share/gc/cms/cmsLockVerifier.hpp --- a/src/hotspot/share/gc/cms/cmsLockVerifier.hpp +++ b/src/hotspot/share/gc/cms/cmsLockVerifier.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_CMSLOCKVERIFIER_HPP -#define SHARE_VM_GC_CMS_CMSLOCKVERIFIER_HPP +#pragma once #include "runtime/mutex.hpp" @@ -43,5 +42,3 @@ assert_locked(lock, NULL); } }; - -#endif // SHARE_VM_GC_CMS_CMSLOCKVERIFIER_HPP diff --git a/src/hotspot/share/gc/cms/cmsOopClosures.hpp b/src/hotspot/share/gc/cms/cmsOopClosures.hpp --- a/src/hotspot/share/gc/cms/cmsOopClosures.hpp +++ b/src/hotspot/share/gc/cms/cmsOopClosures.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_CMSOOPCLOSURES_HPP -#define SHARE_VM_GC_CMS_CMSOOPCLOSURES_HPP +#pragma once #include "gc/shared/genOopClosures.hpp" #include "gc/shared/taskqueue.hpp" @@ -329,5 +328,3 @@ virtual void do_oop(oop* p); virtual void do_oop(narrowOop* p); }; - -#endif // SHARE_VM_GC_CMS_CMSOOPCLOSURES_HPP diff --git a/src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp b/src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp --- a/src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp +++ b/src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP -#define SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP +#pragma once #include "gc/cms/cmsOopClosures.hpp" #include "gc/cms/concurrentMarkSweepGeneration.hpp" @@ -84,5 +83,3 @@ DO_OOP_WORK_IMPL(CMSKeepAliveClosure) DO_OOP_WORK_IMPL(CMSInnerParMarkAndPushClosure) DO_OOP_WORK_IMPL(CMSParKeepAliveClosure) - -#endif // SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP diff --git a/src/hotspot/share/gc/cms/cmsVMOperations.hpp b/src/hotspot/share/gc/cms/cmsVMOperations.hpp --- a/src/hotspot/share/gc/cms/cmsVMOperations.hpp +++ b/src/hotspot/share/gc/cms/cmsVMOperations.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_CMSVMOPERATIONS_HPP -#define SHARE_VM_GC_CMS_CMSVMOPERATIONS_HPP +#pragma once #include "gc/cms/concurrentMarkSweepGeneration.hpp" #include "gc/shared/gcCause.hpp" @@ -142,5 +141,3 @@ virtual bool is_cheap_allocated() const { return false; } virtual bool evaluate_at_safepoint() const; }; - -#endif // SHARE_VM_GC_CMS_CMSVMOPERATIONS_HPP diff --git a/src/hotspot/share/gc/cms/cms_globals.hpp b/src/hotspot/share/gc/cms/cms_globals.hpp --- a/src/hotspot/share/gc/cms/cms_globals.hpp +++ b/src/hotspot/share/gc/cms/cms_globals.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_CMS_CMS_GLOBALS_HPP -#define SHARE_GC_CMS_CMS_GLOBALS_HPP +#pragma once #define GC_CMS_FLAGS(develop, \ develop_pd, \ @@ -425,5 +424,3 @@ "during card table scanning") \ range(1, max_intx) \ constraint(ParGCCardsPerStrideChunkConstraintFunc,AfterMemoryInit) - -#endif // SHARE_GC_CMS_CMS_GLOBALS_HPP diff --git a/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp b/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp --- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp +++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP -#define SHARE_VM_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP +#pragma once #include "gc/cms/adaptiveFreeList.hpp" #include "gc/cms/promotionInfo.hpp" @@ -740,5 +739,3 @@ * CMSSpoolBlockSize); return CompactibleFreeListSpace::adjustObjectSize(sz); } - -#endif // SHARE_VM_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP diff --git a/src/hotspot/share/gc/cms/compactibleFreeListSpace.inline.hpp b/src/hotspot/share/gc/cms/compactibleFreeListSpace.inline.hpp --- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.inline.hpp +++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_CMS_COMPACTIBLEFREELISTSPACE_INLINE_HPP -#define SHARE_GC_CMS_COMPACTIBLEFREELISTSPACE_INLINE_HPP +#pragma once #include "gc/cms/compactibleFreeListSpace.hpp" #include "gc/cms/promotionInfo.inline.hpp" @@ -38,5 +37,3 @@ // promoted as a result of the iteration they are iterated over as well. assert(_promoInfo.noPromotions(), "_promoInfo inconsistency"); } - -#endif // SHARE_GC_CMS_COMPACTIBLEFREELISTSPACE_INLINE_HPP diff --git a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp --- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp +++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP -#define SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP +#pragma once #include "gc/cms/cmsOopClosures.hpp" #include "gc/cms/gSpaceCounters.hpp" @@ -1791,6 +1790,3 @@ public: TraceCMSMemoryManagerStats(CMSCollector::CollectorState phase, GCCause::Cause cause); }; - - -#endif // SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP diff --git a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp --- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp +++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP -#define SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP +#pragma once #include "gc/cms/cmsHeap.hpp" #include "gc/cms/cmsLockVerifier.hpp" @@ -468,5 +467,3 @@ CardTable::card_size /* bytes */)); _t->par_mark_range(mr2); } - -#endif // SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP diff --git a/src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp b/src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp --- a/src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp +++ b/src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP -#define SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP +#pragma once #include "gc/cms/concurrentMarkSweepGeneration.hpp" #include "gc/shared/concurrentGCThread.hpp" @@ -165,5 +164,3 @@ } } }; - -#endif // SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP diff --git a/src/hotspot/share/gc/cms/freeChunk.hpp b/src/hotspot/share/gc/cms/freeChunk.hpp --- a/src/hotspot/share/gc/cms/freeChunk.hpp +++ b/src/hotspot/share/gc/cms/freeChunk.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_FREECHUNK_HPP -#define SHARE_VM_GC_CMS_FREECHUNK_HPP +#pragma once #include "memory/memRegion.hpp" #include "oops/markOop.hpp" @@ -145,6 +144,3 @@ }; extern size_t MinChunkSize; - - -#endif // SHARE_VM_GC_CMS_FREECHUNK_HPP diff --git a/src/hotspot/share/gc/cms/gSpaceCounters.hpp b/src/hotspot/share/gc/cms/gSpaceCounters.hpp --- a/src/hotspot/share/gc/cms/gSpaceCounters.hpp +++ b/src/hotspot/share/gc/cms/gSpaceCounters.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_GSPACECOUNTERS_HPP -#define SHARE_VM_GC_CMS_GSPACECOUNTERS_HPP +#pragma once #include "gc/shared/generation.hpp" #include "gc/shared/generationCounters.hpp" @@ -106,5 +105,3 @@ return _gen->used(); } }; - -#endif // SHARE_VM_GC_CMS_GSPACECOUNTERS_HPP diff --git a/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.hpp b/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.hpp --- a/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.hpp +++ b/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_CMS_COMMANDLINEFLAGCONSTRAINTSCMS_HPP -#define SHARE_GC_CMS_COMMANDLINEFLAGCONSTRAINTSCMS_HPP +#pragma once #include "runtime/globals.hpp" #include "utilities/globalDefinitions.hpp" @@ -44,5 +43,3 @@ // CMS Subconstraints JVMFlag::Error ParallelGCThreadsConstraintFuncCMS(uint value, bool verbose); JVMFlag::Error OldPLABSizeConstraintFuncCMS(size_t value, bool verbose); - -#endif // SHARE_GC_CMS_COMMANDLINEFLAGCONSTRAINTSCMS_HPP diff --git a/src/hotspot/share/gc/cms/parNewGeneration.hpp b/src/hotspot/share/gc/cms/parNewGeneration.hpp --- a/src/hotspot/share/gc/cms/parNewGeneration.hpp +++ b/src/hotspot/share/gc/cms/parNewGeneration.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_PARNEWGENERATION_HPP -#define SHARE_VM_GC_CMS_PARNEWGENERATION_HPP +#pragma once #include "gc/cms/parOopClosures.hpp" #include "gc/serial/defNewGeneration.hpp" @@ -414,5 +413,3 @@ static oop real_forwardee(oop obj); }; - -#endif // SHARE_VM_GC_CMS_PARNEWGENERATION_HPP diff --git a/src/hotspot/share/gc/cms/parNewGeneration.inline.hpp b/src/hotspot/share/gc/cms/parNewGeneration.inline.hpp --- a/src/hotspot/share/gc/cms/parNewGeneration.inline.hpp +++ b/src/hotspot/share/gc/cms/parNewGeneration.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_PARNEWGENERATION_INLINE_HPP -#define SHARE_VM_GC_CMS_PARNEWGENERATION_INLINE_HPP +#pragma once #include "gc/cms/parNewGeneration.hpp" #include "gc/shared/plab.inline.hpp" @@ -34,4 +33,3 @@ if (obj != NULL) return obj; else return alloc_in_to_space_slow(word_sz); } -#endif // SHARE_VM_GC_CMS_PARNEWGENERATION_INLINE_HPP diff --git a/src/hotspot/share/gc/cms/parOopClosures.hpp b/src/hotspot/share/gc/cms/parOopClosures.hpp --- a/src/hotspot/share/gc/cms/parOopClosures.hpp +++ b/src/hotspot/share/gc/cms/parOopClosures.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_PAROOPCLOSURES_HPP -#define SHARE_VM_GC_CMS_PAROOPCLOSURES_HPP +#pragma once #include "gc/shared/genOopClosures.hpp" #include "gc/shared/taskqueue.hpp" @@ -142,5 +141,3 @@ ParallelTaskTerminator* terminator_); virtual void do_void(); }; - -#endif // SHARE_VM_GC_CMS_PAROOPCLOSURES_HPP diff --git a/src/hotspot/share/gc/cms/parOopClosures.inline.hpp b/src/hotspot/share/gc/cms/parOopClosures.inline.hpp --- a/src/hotspot/share/gc/cms/parOopClosures.inline.hpp +++ b/src/hotspot/share/gc/cms/parOopClosures.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP -#define SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP +#pragma once #include "gc/cms/cmsHeap.hpp" #include "gc/cms/parNewGeneration.hpp" @@ -142,5 +141,3 @@ inline void ParScanWithoutBarrierClosure::do_oop(oop* p) { ParScanClosure::do_oop_work(p, false, false); } inline void ParScanWithoutBarrierClosure::do_oop(narrowOop* p) { ParScanClosure::do_oop_work(p, false, false); } - -#endif // SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP diff --git a/src/hotspot/share/gc/cms/promotionInfo.hpp b/src/hotspot/share/gc/cms/promotionInfo.hpp --- a/src/hotspot/share/gc/cms/promotionInfo.hpp +++ b/src/hotspot/share/gc/cms/promotionInfo.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_PROMOTIONINFO_HPP -#define SHARE_VM_GC_CMS_PROMOTIONINFO_HPP +#pragma once #include "gc/cms/freeChunk.hpp" @@ -183,6 +182,3 @@ void print_on(outputStream* st) const; }; - - -#endif // SHARE_VM_GC_CMS_PROMOTIONINFO_HPP diff --git a/src/hotspot/share/gc/cms/promotionInfo.inline.hpp b/src/hotspot/share/gc/cms/promotionInfo.inline.hpp --- a/src/hotspot/share/gc/cms/promotionInfo.inline.hpp +++ b/src/hotspot/share/gc/cms/promotionInfo.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_CMS_PROMOTIONINFO_INLINE_HPP -#define SHARE_GC_CMS_PROMOTIONINFO_INLINE_HPP +#pragma once #include "gc/cms/promotionInfo.hpp" #include "oops/oop.inline.hpp" @@ -73,5 +72,3 @@ assert(_spoolHead == _spoolTail, "emptied spooling buffers"); assert(_firstIndex == _nextIndex, "empty buffer"); } - -#endif // SHARE_GC_CMS_PROMOTIONINFO_INLINE_HPP diff --git a/src/hotspot/share/gc/cms/vmStructs_cms.hpp b/src/hotspot/share/gc/cms/vmStructs_cms.hpp --- a/src/hotspot/share/gc/cms/vmStructs_cms.hpp +++ b/src/hotspot/share/gc/cms/vmStructs_cms.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP -#define SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP +#pragma once #include "gc/cms/cmsHeap.hpp" #include "gc/cms/compactibleFreeListSpace.hpp" @@ -87,5 +86,3 @@ declare_constant(CompactibleFreeListSpace::IndexSetSize) \ declare_constant(Generation::ConcurrentMarkSweep) \ declare_constant(Generation::ParNew) - -#endif // SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP diff --git a/src/hotspot/share/gc/cms/yieldingWorkgroup.hpp b/src/hotspot/share/gc/cms/yieldingWorkgroup.hpp --- a/src/hotspot/share/gc/cms/yieldingWorkgroup.hpp +++ b/src/hotspot/share/gc/cms/yieldingWorkgroup.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CMS_YIELDINGWORKGROUP_HPP -#define SHARE_VM_GC_CMS_YIELDINGWORKGROUP_HPP +#pragma once #include "gc/shared/workgroup.hpp" #include "utilities/macros.hpp" @@ -268,5 +267,3 @@ void internal_note_start(); void internal_note_finish(); }; - -#endif // SHARE_VM_GC_CMS_YIELDINGWORKGROUP_HPP diff --git a/src/hotspot/share/gc/epsilon/epsilonArguments.hpp b/src/hotspot/share/gc/epsilon/epsilonArguments.hpp --- a/src/hotspot/share/gc/epsilon/epsilonArguments.hpp +++ b/src/hotspot/share/gc/epsilon/epsilonArguments.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_EPSILON_EPSILONARGUMENTS_HPP -#define SHARE_GC_EPSILON_EPSILONARGUMENTS_HPP +#pragma once #include "gc/shared/gcArguments.hpp" @@ -35,5 +34,3 @@ virtual size_t conservative_max_heap_alignment(); virtual CollectedHeap* create_heap(); }; - -#endif // SHARE_GC_EPSILON_EPSILONARGUMENTS_HPP diff --git a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp --- a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp +++ b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_EPSILON_BARRIERSET_HPP -#define SHARE_VM_GC_EPSILON_BARRIERSET_HPP +#pragma once #include "gc/shared/barrierSetAssembler.hpp" #include "gc/shared/barrierSet.hpp" @@ -53,5 +52,3 @@ struct BarrierSet::GetType { typedef ::EpsilonBarrierSet type; }; - -#endif // SHARE_VM_GC_EPSILON_BARRIERSET_HPP diff --git a/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp b/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp --- a/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp +++ b/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_EPSILON_COLLECTORPOLICY_HPP -#define SHARE_VM_GC_EPSILON_COLLECTORPOLICY_HPP +#pragma once #include "gc/shared/collectorPolicy.hpp" @@ -38,5 +37,3 @@ public: EpsilonCollectorPolicy() : CollectorPolicy() {}; }; - -#endif // SHARE_VM_GC_EPSILON_COLLECTORPOLICY_HPP diff --git a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp --- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp +++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_EPSILON_COLLECTEDHEAP_HPP -#define SHARE_VM_GC_EPSILON_COLLECTEDHEAP_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "gc/shared/softRefPolicy.hpp" @@ -148,5 +147,3 @@ virtual void print_tracing_info() const; }; - -#endif // SHARE_VM_GC_EPSILON_COLLECTEDHEAP_HPP diff --git a/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp --- a/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp +++ b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP -#define SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP +#pragma once #include "gc/epsilon/epsilonHeap.hpp" #include "services/memoryPool.hpp" @@ -40,5 +39,3 @@ size_t max_size() const { return _heap->max_capacity(); } MemoryUsage get_memory_usage(); }; - -#endif // SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP diff --git a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp --- a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp +++ b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP -#define SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP +#pragma once #include "memory/allocation.hpp" @@ -39,6 +38,3 @@ EpsilonMonitoringSupport(EpsilonHeap* heap); void update_counters(); }; - -#endif // SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP - diff --git a/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp b/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp --- a/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp +++ b/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP -#define SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP +#pragma once #include "runtime/thread.hpp" #include "utilities/debug.hpp" @@ -66,5 +65,3 @@ data(thread)->_last_tlab_time = time; } }; - -#endif // SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP diff --git a/src/hotspot/share/gc/epsilon/epsilon_globals.hpp b/src/hotspot/share/gc/epsilon/epsilon_globals.hpp --- a/src/hotspot/share/gc/epsilon/epsilon_globals.hpp +++ b/src/hotspot/share/gc/epsilon/epsilon_globals.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_EPSILON_GLOBALS_HPP -#define SHARE_VM_GC_EPSILON_GLOBALS_HPP +#pragma once #include "runtime/globals.hpp" // @@ -92,5 +91,3 @@ "Min expansion step for heap. Larger value improves performance " \ "at the potential expense of memory waste.") \ range(1, max_intx) - -#endif // SHARE_VM_GC_EPSILON_GLOBALS_HPP diff --git a/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp b/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp --- a/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp +++ b/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_EPSILON_VMSTRUCTS_HPP -#define SHARE_GC_EPSILON_VMSTRUCTS_HPP +#pragma once #include "gc/epsilon/epsilonHeap.hpp" #include "gc/shared/space.hpp" @@ -42,5 +41,3 @@ #define VM_INT_CONSTANTS_EPSILONGC(declare_constant, \ declare_constant_with_value) - -#endif // SHARE_GC_EPSILON_VMSTRUCTS_HPP diff --git a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp --- a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp +++ b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_C1_G1BARRIERSETC1_HPP -#define SHARE_GC_G1_C1_G1BARRIERSETC1_HPP +#pragma once #include "c1/c1_CodeStubs.hpp" #include "gc/shared/c1/modRefBarrierSetC1.hpp" @@ -134,5 +133,3 @@ virtual void generate_c1_runtime_stubs(BufferBlob* buffer_blob); }; - -#endif // SHARE_GC_G1_C1_G1BARRIERSETC1_HPP diff --git a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp --- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp +++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_C2_G1BARRIERSETC2_HPP -#define SHARE_GC_SHARED_C2_G1BARRIERSETC2_HPP +#pragma once #include "gc/shared/c2/cardTableBarrierSetC2.hpp" @@ -95,5 +94,3 @@ virtual bool escape_add_to_con_graph(ConnectionGraph* conn_graph, PhaseGVN* gvn, Unique_Node_List* delayed_worklist, Node* n, uint opcode) const; }; - -#endif // SHARE_GC_SHARED_C2_G1BARRIERSETC2_HPP diff --git a/src/hotspot/share/gc/g1/collectionSetChooser.hpp b/src/hotspot/share/gc/g1/collectionSetChooser.hpp --- a/src/hotspot/share/gc/g1/collectionSetChooser.hpp +++ b/src/hotspot/share/gc/g1/collectionSetChooser.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_COLLECTIONSETCHOOSER_HPP -#define SHARE_VM_GC_G1_COLLECTIONSETCHOOSER_HPP +#pragma once #include "gc/g1/heapRegion.hpp" #include "utilities/growableArray.hpp" @@ -198,6 +197,3 @@ bool should_add(HeapRegion* hr) { return _chooser->should_add(hr); } }; - -#endif // SHARE_VM_GC_G1_COLLECTIONSETCHOOSER_HPP - diff --git a/src/hotspot/share/gc/g1/dirtyCardQueue.hpp b/src/hotspot/share/gc/g1/dirtyCardQueue.hpp --- a/src/hotspot/share/gc/g1/dirtyCardQueue.hpp +++ b/src/hotspot/share/gc/g1/dirtyCardQueue.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP -#define SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP +#pragma once #include "gc/shared/ptrQueue.hpp" #include "memory/allocation.hpp" @@ -163,5 +162,3 @@ } }; - -#endif // SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP diff --git a/src/hotspot/share/gc/g1/evacuationInfo.hpp b/src/hotspot/share/gc/g1/evacuationInfo.hpp --- a/src/hotspot/share/gc/g1/evacuationInfo.hpp +++ b/src/hotspot/share/gc/g1/evacuationInfo.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_EVACUATIONINFO_HPP -#define SHARE_VM_GC_G1_EVACUATIONINFO_HPP +#pragma once #include "memory/allocation.hpp" @@ -77,5 +76,3 @@ size_t bytes_copied() { return _bytes_copied; } uint regions_freed() { return _regions_freed; } }; - -#endif // SHARE_VM_GC_G1_EVACUATIONINFO_HPP diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.hpp --- a/src/hotspot/share/gc/g1/g1AllocRegion.hpp +++ b/src/hotspot/share/gc/g1/g1AllocRegion.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1ALLOCREGION_HPP -#define SHARE_VM_GC_G1_G1ALLOCREGION_HPP +#pragma once #include "gc/g1/heapRegion.hpp" #include "gc/g1/g1EvacStats.hpp" @@ -280,5 +279,3 @@ // allocating into that card at the same time. virtual HeapRegion* release(); }; - -#endif // SHARE_VM_GC_G1_G1ALLOCREGION_HPP diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp --- a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp +++ b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP -#define SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP +#pragma once #include "gc/g1/g1AllocRegion.hpp" #include "gc/g1/heapRegion.inline.hpp" @@ -142,5 +141,3 @@ } return NULL; } - -#endif // SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1Allocator.hpp b/src/hotspot/share/gc/g1/g1Allocator.hpp --- a/src/hotspot/share/gc/g1/g1Allocator.hpp +++ b/src/hotspot/share/gc/g1/g1Allocator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1ALLOCATOR_HPP -#define SHARE_VM_GC_G1_G1ALLOCATOR_HPP +#pragma once #include "gc/g1/g1AllocRegion.hpp" #include "gc/g1/g1InCSetState.hpp" @@ -287,5 +286,3 @@ // unnecessarily. static inline bool archive_check_enabled(); }; - -#endif // SHARE_VM_GC_G1_G1ALLOCATOR_HPP diff --git a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp --- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp +++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1ALLOCATOR_INLINE_HPP -#define SHARE_VM_GC_G1_G1ALLOCATOR_INLINE_HPP +#pragma once #include "gc/g1/g1Allocator.hpp" #include "gc/g1/g1AllocRegion.inline.hpp" @@ -163,5 +162,3 @@ return (archive_check_enabled() && (in_closed_archive_range(object) || in_open_archive_range(object))); } - -#endif // SHARE_VM_GC_G1_G1ALLOCATOR_HPP diff --git a/src/hotspot/share/gc/g1/g1Analytics.hpp b/src/hotspot/share/gc/g1/g1Analytics.hpp --- a/src/hotspot/share/gc/g1/g1Analytics.hpp +++ b/src/hotspot/share/gc/g1/g1Analytics.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1MEASUREMENTS_HPP -#define SHARE_VM_GC_G1_G1MEASUREMENTS_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -157,5 +156,3 @@ double last_known_gc_end_time_sec() const; }; - -#endif // SHARE_VM_GC_G1_G1MEASUREMENTS_HPP diff --git a/src/hotspot/share/gc/g1/g1Arguments.hpp b/src/hotspot/share/gc/g1/g1Arguments.hpp --- a/src/hotspot/share/gc/g1/g1Arguments.hpp +++ b/src/hotspot/share/gc/g1/g1Arguments.hpp @@ -23,8 +23,7 @@ * */ -#ifndef SHARE_GC_G1_G1ARGUMENTS_HPP -#define SHARE_GC_G1_G1ARGUMENTS_HPP +#pragma once #include "gc/shared/gcArguments.hpp" @@ -42,5 +41,3 @@ virtual size_t conservative_max_heap_alignment(); virtual CollectedHeap* create_heap(); }; - -#endif // SHARE_GC_G1_G1ARGUMENTS_HPP diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.hpp --- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp +++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1BARRIERSET_HPP -#define SHARE_VM_GC_G1_G1BARRIERSET_HPP +#pragma once #include "gc/g1/dirtyCardQueue.hpp" #include "gc/g1/g1SATBMarkQueueSet.hpp" @@ -125,5 +124,3 @@ struct BarrierSet::GetType { typedef ::G1BarrierSet type; }; - -#endif // SHARE_VM_GC_G1_G1BARRIERSET_HPP diff --git a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp --- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp +++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1BARRIERSET_INLINE_HPP -#define SHARE_VM_GC_G1_G1BARRIERSET_INLINE_HPP +#pragma once #include "gc/g1/g1BarrierSet.hpp" #include "gc/g1/g1CardTable.hpp" @@ -104,5 +103,3 @@ bs->write_ref_field_pre(addr); Raw::oop_store(addr, new_value); } - -#endif // SHARE_VM_GC_G1_G1BARRIERSET_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1BarrierSetAssembler.hpp b/src/hotspot/share/gc/g1/g1BarrierSetAssembler.hpp --- a/src/hotspot/share/gc/g1/g1BarrierSetAssembler.hpp +++ b/src/hotspot/share/gc/g1/g1BarrierSetAssembler.hpp @@ -22,11 +22,8 @@ * */ -#ifndef SHARE_GC_G1_G1BARRIERSETASSEMBLER_HPP -#define SHARE_GC_G1_G1BARRIERSETASSEMBLER_HPP +#pragma once #include "utilities/macros.hpp" #include CPU_HEADER(gc/g1/g1BarrierSetAssembler) - -#endif // SHARE_GC_G1_G1BARRIERSETASSEMBLER_HPP diff --git a/src/hotspot/share/gc/g1/g1BarrierSetRuntime.hpp b/src/hotspot/share/gc/g1/g1BarrierSetRuntime.hpp --- a/src/hotspot/share/gc/g1/g1BarrierSetRuntime.hpp +++ b/src/hotspot/share/gc/g1/g1BarrierSetRuntime.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1BARRIERSETRUNTIME_HPP -#define SHARE_GC_G1_G1BARRIERSETRUNTIME_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oopsHierarchy.hpp" @@ -44,5 +43,3 @@ static void write_ref_field_pre_entry(oopDesc* orig, JavaThread *thread); static void write_ref_field_post_entry(void* card_addr, JavaThread* thread); }; - -#endif // SHARE_GC_G1_G1BARRIERSETRUNTIME_HPP diff --git a/src/hotspot/share/gc/g1/g1BiasedArray.hpp b/src/hotspot/share/gc/g1/g1BiasedArray.hpp --- a/src/hotspot/share/gc/g1/g1BiasedArray.hpp +++ b/src/hotspot/share/gc/g1/g1BiasedArray.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1BIASEDARRAY_HPP -#define SHARE_VM_GC_G1_G1BIASEDARRAY_HPP +#pragma once #include "memory/memRegion.hpp" #include "utilities/debug.hpp" @@ -193,5 +192,3 @@ this->clear(); } }; - -#endif // SHARE_VM_GC_G1_G1BIASEDARRAY_HPP diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp --- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp +++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_HPP -#define SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_HPP +#pragma once #include "gc/g1/g1RegionToSpaceMapper.hpp" #include "gc/shared/blockOffsetTable.hpp" @@ -231,5 +230,3 @@ void print_on(outputStream* out) PRODUCT_RETURN; }; - -#endif // SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_HPP diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp --- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp +++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP -#define SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP +#pragma once #include "gc/g1/g1BlockOffsetTable.hpp" #include "gc/g1/heapRegion.hpp" @@ -164,5 +163,3 @@ assert(q <= addr, "wrong order for current and arg"); return q; } - -#endif // SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1CardCounts.hpp b/src/hotspot/share/gc/g1/g1CardCounts.hpp --- a/src/hotspot/share/gc/g1/g1CardCounts.hpp +++ b/src/hotspot/share/gc/g1/g1CardCounts.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CARDCOUNTS_HPP -#define SHARE_VM_GC_G1_G1CARDCOUNTS_HPP +#pragma once #include "gc/g1/g1CardTable.hpp" #include "gc/g1/g1RegionToSpaceMapper.hpp" @@ -127,5 +126,3 @@ // Clear the entire card counts table during GC. void clear_all(); }; - -#endif // SHARE_VM_GC_G1_G1CARDCOUNTS_HPP diff --git a/src/hotspot/share/gc/g1/g1CardTable.hpp b/src/hotspot/share/gc/g1/g1CardTable.hpp --- a/src/hotspot/share/gc/g1/g1CardTable.hpp +++ b/src/hotspot/share/gc/g1/g1CardTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CARDTABLE_HPP -#define SHARE_VM_GC_G1_G1CARDTABLE_HPP +#pragma once #include "gc/g1/g1RegionToSpaceMapper.hpp" #include "gc/shared/cardTable.hpp" @@ -109,5 +108,3 @@ virtual bool is_in_young(oop obj) const; }; - -#endif // SHARE_VM_GC_G1_G1CARDTABLE_HPP diff --git a/src/hotspot/share/gc/g1/g1CardTable.inline.hpp b/src/hotspot/share/gc/g1/g1CardTable.inline.hpp --- a/src/hotspot/share/gc/g1/g1CardTable.inline.hpp +++ b/src/hotspot/share/gc/g1/g1CardTable.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CARDTABLE_INLINE_HPP -#define SHARE_VM_GC_G1_G1CARDTABLE_INLINE_HPP +#pragma once #include "gc/g1/g1CardTable.hpp" @@ -36,5 +35,3 @@ } _byte_map[card_index] = val; } - -#endif // SHARE_VM_GC_G1_G1CARDTABLE_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp b/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp --- a/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp +++ b/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CODEBLOBCLOSURE_HPP -#define SHARE_VM_GC_G1_G1CODEBLOBCLOSURE_HPP +#pragma once #include "gc/g1/g1CollectedHeap.hpp" #include "memory/iterator.hpp" @@ -56,6 +55,3 @@ void do_code_blob(CodeBlob* cb); }; - -#endif // SHARE_VM_GC_G1_G1CODEBLOBCLOSURE_HPP - diff --git a/src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp b/src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp --- a/src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp +++ b/src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CODECACHEREMSET_HPP -#define SHARE_VM_GC_G1_G1CODECACHEREMSET_HPP +#pragma once class CodeBlobClosure; class G1CodeRootSetTable; @@ -83,5 +82,3 @@ size_t mem_size(); }; - -#endif // SHARE_VM_GC_G1_G1CODECACHEREMSET_HPP diff --git a/src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp b/src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp --- a/src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp +++ b/src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_GC_G1_G1CODEROOTSETTABLE_HPP -#define SHARE_VM_GC_G1_G1CODEROOTSETTABLE_HPP +#pragma once #include "utilities/hashtable.hpp" @@ -72,5 +71,3 @@ size_t mem_size(); }; - -#endif /* SHARE_VM_GC_G1_G1CODEROOTSETTABLE_HPP */ diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp --- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP -#define SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP +#pragma once #include "gc/g1/evacuationInfo.hpp" #include "gc/g1/g1BarrierSet.hpp" @@ -1451,5 +1450,3 @@ private: inline bool offer_termination(); }; - -#endif // SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp --- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP -#define SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP +#pragma once #include "gc/g1/g1BarrierSet.hpp" #include "gc/g1/g1CollectedHeap.hpp" @@ -292,5 +291,3 @@ _in_cset_fast_test.clear_humongous(region); } } - -#endif // SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1CollectionSet.hpp b/src/hotspot/share/gc/g1/g1CollectionSet.hpp --- a/src/hotspot/share/gc/g1/g1CollectionSet.hpp +++ b/src/hotspot/share/gc/g1/g1CollectionSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1COLLECTIONSET_HPP -#define SHARE_VM_GC_G1_G1COLLECTIONSET_HPP +#pragma once #include "gc/g1/collectionSetChooser.hpp" #include "utilities/debug.hpp" @@ -274,6 +273,3 @@ void complete_evacuation(); bool evacuation_failed(); }; - -#endif // SHARE_VM_GC_G1_G1COLLECTIONSET_HPP - diff --git a/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp b/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp --- a/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp +++ b/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP -#define SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP +#pragma once #include "gc/shared/collectorPolicy.hpp" @@ -41,4 +40,3 @@ virtual size_t heap_reserved_size_bytes() const; virtual bool is_hetero_heap() const; }; -#endif // SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP diff --git a/src/hotspot/share/gc/g1/g1CollectorState.hpp b/src/hotspot/share/gc/g1/g1CollectorState.hpp --- a/src/hotspot/share/gc/g1/g1CollectorState.hpp +++ b/src/hotspot/share/gc/g1/g1CollectorState.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1COLLECTORSTATE_HPP -#define SHARE_VM_GC_G1_G1COLLECTORSTATE_HPP +#pragma once #include "gc/g1/g1YCTypes.hpp" #include "utilities/globalDefinitions.hpp" @@ -122,5 +121,3 @@ } } }; - -#endif // SHARE_VM_GC_G1_G1COLLECTORSTATE_HPP diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp --- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARK_HPP -#define SHARE_VM_GC_G1_G1CONCURRENTMARK_HPP +#pragma once #include "gc/g1/g1ConcurrentMarkBitMap.hpp" #include "gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp" @@ -868,5 +867,3 @@ virtual bool do_heap_region(HeapRegion* r); ~G1PrintRegionLivenessInfoClosure(); }; - -#endif // SHARE_VM_GC_G1_G1CONCURRENTMARK_HPP diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp --- a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARK_INLINE_HPP -#define SHARE_VM_GC_G1_G1CONCURRENTMARK_INLINE_HPP +#pragma once #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1ConcurrentMark.hpp" @@ -286,5 +285,3 @@ return false; } } - -#endif // SHARE_VM_GC_G1_G1CONCURRENTMARK_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_HPP -#define SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_HPP +#pragma once #include "gc/g1/g1RegionToSpaceMapper.hpp" #include "gc/shared/markBitMap.hpp" @@ -80,5 +79,3 @@ void clear_region(HeapRegion* hr); }; - -#endif // SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_HPP diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP -#define SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP +#pragma once #include "gc/g1/g1ConcurrentMarkBitMap.hpp" #include "gc/shared/markBitMap.inline.hpp" @@ -50,5 +49,3 @@ } return true; } - -#endif // SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP -#define SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP +#pragma once #include "oops/oopsHierarchy.hpp" @@ -55,5 +54,3 @@ // continuation. size_t process_obj(oop obj); }; - -#endif /* SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP */ diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP -#define SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP +#pragma once #include "oops/oop.inline.hpp" #include "oops/oopsHierarchy.hpp" @@ -32,5 +31,3 @@ inline bool G1CMObjArrayProcessor::should_be_sliced(oop obj) { return obj->is_objArray() && ((size_t)((objArrayOop)obj)->size()) >= 2 * ObjArrayMarkingStride; } - -#endif /* SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP */ diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.hpp --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_HPP -#define SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_HPP +#pragma once #include "gc/shared/concurrentGCPhaseManager.hpp" #include "gc/shared/concurrentGCThread.hpp" @@ -97,5 +96,3 @@ return &_phase_manager_stack; } }; - -#endif // SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_HPP diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP -#define SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP +#pragma once #include "gc/g1/g1ConcurrentMark.hpp" #include "gc/g1/g1ConcurrentMarkThread.hpp" @@ -37,5 +36,3 @@ inline double G1ConcurrentMarkThread::vtime_mark_accum() { return _vtime_mark_accum + _cm->all_task_accum_vtime(); } - -#endif // SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefine.hpp b/src/hotspot/share/gc/g1/g1ConcurrentRefine.hpp --- a/src/hotspot/share/gc/g1/g1ConcurrentRefine.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentRefine.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CONCURRENTREFINE_HPP -#define SHARE_VM_GC_G1_G1CONCURRENTREFINE_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -135,5 +134,3 @@ size_t yellow_zone() const { return _yellow_zone; } size_t red_zone() const { return _red_zone; } }; - -#endif // SHARE_VM_GC_G1_G1CONCURRENTREFINE_HPP diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp b/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp --- a/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1CONCURRENTREFINETHREAD_HPP -#define SHARE_VM_GC_G1_G1CONCURRENTREFINETHREAD_HPP +#pragma once #include "gc/g1/dirtyCardQueue.hpp" #include "gc/shared/concurrentGCThread.hpp" @@ -66,5 +65,3 @@ // Total virtual time so far. double vtime_accum() { return _vtime_accum; } }; - -#endif // SHARE_VM_GC_G1_G1CONCURRENTREFINETHREAD_HPP diff --git a/src/hotspot/share/gc/g1/g1EdenRegions.hpp b/src/hotspot/share/gc/g1/g1EdenRegions.hpp --- a/src/hotspot/share/gc/g1/g1EdenRegions.hpp +++ b/src/hotspot/share/gc/g1/g1EdenRegions.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1EDENREGIONS_HPP -#define SHARE_VM_GC_G1_G1EDENREGIONS_HPP +#pragma once #include "gc/g1/heapRegion.hpp" #include "runtime/globals.hpp" @@ -45,5 +44,3 @@ uint length() const { return _length; } }; - -#endif // SHARE_VM_GC_G1_G1EDENREGIONS_HPP diff --git a/src/hotspot/share/gc/g1/g1EvacFailure.hpp b/src/hotspot/share/gc/g1/g1EvacFailure.hpp --- a/src/hotspot/share/gc/g1/g1EvacFailure.hpp +++ b/src/hotspot/share/gc/g1/g1EvacFailure.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1EVACFAILURE_HPP -#define SHARE_VM_GC_G1_G1EVACFAILURE_HPP +#pragma once #include "gc/g1/g1OopClosures.hpp" #include "gc/g1/heapRegionManager.hpp" @@ -44,5 +43,3 @@ void work(uint worker_id); }; - -#endif // SHARE_VM_GC_G1_G1EVACFAILURE_HPP diff --git a/src/hotspot/share/gc/g1/g1EvacStats.hpp b/src/hotspot/share/gc/g1/g1EvacStats.hpp --- a/src/hotspot/share/gc/g1/g1EvacStats.hpp +++ b/src/hotspot/share/gc/g1/g1EvacStats.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1EVACSTATS_HPP -#define SHARE_VM_GC_G1_G1EVACSTATS_HPP +#pragma once #include "gc/shared/plab.hpp" @@ -73,5 +72,3 @@ inline void add_region_end_waste(size_t value); inline void add_failure_used_and_waste(size_t used, size_t waste); }; - -#endif // SHARE_VM_GC_G1_G1EVACSTATS_HPP diff --git a/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp --- a/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp +++ b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1EVACSTATS_INLINE_HPP -#define SHARE_VM_GC_G1_G1EVACSTATS_INLINE_HPP +#pragma once #include "gc/g1/g1EvacStats.hpp" #include "runtime/atomic.hpp" @@ -41,5 +40,3 @@ Atomic::add(used, &_failure_used); Atomic::add(waste, &_failure_waste); } - -#endif // SHARE_VM_GC_G1_G1EVACSTATS_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1FromCardCache.hpp b/src/hotspot/share/gc/g1/g1FromCardCache.hpp --- a/src/hotspot/share/gc/g1/g1FromCardCache.hpp +++ b/src/hotspot/share/gc/g1/g1FromCardCache.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1FROMCARDCACHE_HPP -#define SHARE_VM_GC_G1_G1FROMCARDCACHE_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/ostream.hpp" @@ -89,5 +88,3 @@ return _static_mem_size; } }; - -#endif // SHARE_VM_GC_G1_G1FROMCARDCACHE_HPP diff --git a/src/hotspot/share/gc/g1/g1FullCollector.hpp b/src/hotspot/share/gc/g1/g1FullCollector.hpp --- a/src/hotspot/share/gc/g1/g1FullCollector.hpp +++ b/src/hotspot/share/gc/g1/g1FullCollector.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1FULLCOLLECTOR_HPP -#define SHARE_GC_G1_G1FULLCOLLECTOR_HPP +#pragma once #include "gc/g1/g1FullGCCompactionPoint.hpp" #include "gc/g1/g1FullGCMarker.hpp" @@ -101,6 +100,3 @@ void run_task(AbstractGangTask* task); }; - - -#endif // SHARE_GC_G1_G1FULLCOLLECTOR_HPP diff --git a/src/hotspot/share/gc/g1/g1FullGCAdjustTask.hpp b/src/hotspot/share/gc/g1/g1FullGCAdjustTask.hpp --- a/src/hotspot/share/gc/g1/g1FullGCAdjustTask.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCAdjustTask.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1FULLGCADJUSTTASK_HPP -#define SHARE_GC_G1_G1FULLGCADJUSTTASK_HPP +#pragma once #include "gc/g1/g1FullGCOopClosures.hpp" #include "gc/g1/g1FullGCTask.hpp" @@ -48,5 +47,3 @@ G1FullGCAdjustTask(G1FullCollector* collector); void work(uint worker_id); }; - -#endif // SHARE_GC_G1_G1FULLGCADJUSTTASK_HPP diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp b/src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp --- a/src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1FULLGCCOMPACTTASK_HPP -#define SHARE_GC_G1_G1FULLGCCOMPACTTASK_HPP +#pragma once #include "gc/g1/g1FullGCCompactionPoint.hpp" #include "gc/g1/g1FullGCScope.hpp" @@ -57,5 +56,3 @@ size_t apply(oop object); }; }; - -#endif // SHARE_GC_G1_G1FULLGCCOMPACTTASK_HPP diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.hpp b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.hpp --- a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1FULLGCCOMPACTIONPOINT_HPP -#define SHARE_GC_G1_G1FULLGCCOMPACTIONPOINT_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oopsHierarchy.hpp" @@ -60,5 +59,3 @@ GrowableArray* regions(); }; - -#endif // SHARE_GC_G1_G1FULLGCCOMPACTIONPOINT_HPP diff --git a/src/hotspot/share/gc/g1/g1FullGCMarkTask.hpp b/src/hotspot/share/gc/g1/g1FullGCMarkTask.hpp --- a/src/hotspot/share/gc/g1/g1FullGCMarkTask.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCMarkTask.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1FULLGCMARKTASK_HPP -#define SHARE_GC_G1_G1FULLGCMARKTASK_HPP +#pragma once #include "gc/g1/g1FullGCCompactionPoint.hpp" #include "gc/g1/g1FullGCScope.hpp" @@ -42,5 +41,3 @@ G1FullGCMarkTask(G1FullCollector* collector); void work(uint worker_id); }; - -#endif // SHARE_GC_G1_G1FULLGCMARKTASK_HPP diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.hpp --- a/src/hotspot/share/gc/g1/g1FullGCMarker.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCMarker.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1FULLGCMARKER_HPP -#define SHARE_GC_G1_G1FULLGCMARKER_HPP +#pragma once #include "gc/g1/g1FullGCOopClosures.hpp" #include "gc/shared/preservedMarks.hpp" @@ -94,5 +93,3 @@ G1MarkAndPushClosure* mark_closure() { return &_mark_closure; } G1FollowStackClosure* stack_closure() { return &_stack_closure; } }; - -#endif // SHARE_GC_G1_G1FULLGCMARKER_HPP diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp --- a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1MARKSTACK_INLINE_HPP -#define SHARE_VM_GC_G1_G1MARKSTACK_INLINE_HPP +#pragma once #include "gc/g1/g1Allocator.inline.hpp" #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp" @@ -172,5 +171,3 @@ inline void G1FullGCMarker::follow_cld(ClassLoaderData* cld) { _cld_closure.do_cld(cld); } - -#endif diff --git a/src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp b/src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp --- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1FULLGCOOPCLOSURES_HPP -#define SHARE_GC_G1_G1FULLGCOOPCLOSURES_HPP +#pragma once #include "memory/iterator.hpp" #include "memory/universe.hpp" @@ -115,5 +114,3 @@ G1FollowStackClosure(G1FullGCMarker* marker) : _marker(marker) {} virtual void do_void(); }; - -#endif // SHARE_GC_G1_G1FULLGCOOPCLOSURES_HPP diff --git a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp --- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP -#define SHARE_VM_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP +#pragma once #include "gc/g1/g1Allocator.inline.hpp" #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp" @@ -100,5 +99,3 @@ inline void G1FullKeepAliveClosure::do_oop_work(T* p) { _marker->mark_and_push(p); } - -#endif diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp --- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1FULLGCPREPARETASK_HPP -#define SHARE_GC_G1_G1FULLGCPREPARETASK_HPP +#pragma once #include "gc/g1/g1FullGCCompactionPoint.hpp" #include "gc/g1/g1FullGCScope.hpp" @@ -91,5 +90,3 @@ size_t apply(oop object); }; }; - -#endif // SHARE_GC_G1_G1FULLGCPREPARETASK_HPP diff --git a/src/hotspot/share/gc/g1/g1FullGCReferenceProcessorExecutor.hpp b/src/hotspot/share/gc/g1/g1FullGCReferenceProcessorExecutor.hpp --- a/src/hotspot/share/gc/g1/g1FullGCReferenceProcessorExecutor.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCReferenceProcessorExecutor.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1FULLGCREFERENCEPROCESSOREXECUTOR_HPP -#define SHARE_GC_G1_G1FULLGCREFERENCEPROCESSOREXECUTOR_HPP +#pragma once #include "gc/g1/g1FullGCCompactionPoint.hpp" #include "gc/g1/g1FullGCScope.hpp" @@ -70,5 +69,3 @@ virtual void work(uint worker_id); }; }; - -#endif // SHARE_GC_G1_G1FULLGCREFERENCEPROCESSOREXECUTOR_HPP diff --git a/src/hotspot/share/gc/g1/g1FullGCScope.hpp b/src/hotspot/share/gc/g1/g1FullGCScope.hpp --- a/src/hotspot/share/gc/g1/g1FullGCScope.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCScope.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1FULLGCSCOPE_HPP -#define SHARE_VM_GC_G1_G1FULLGCSCOPE_HPP +#pragma once #include "gc/g1/g1CollectedHeap.hpp" #include "gc/g1/g1HeapTransition.hpp" @@ -64,5 +63,3 @@ G1FullGCTracer* tracer(); G1HeapTransition* heap_transition(); }; - -#endif //SHARE_VM_GC_G1_G1FULLGCSCOPE_HPP diff --git a/src/hotspot/share/gc/g1/g1FullGCTask.hpp b/src/hotspot/share/gc/g1/g1FullGCTask.hpp --- a/src/hotspot/share/gc/g1/g1FullGCTask.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCTask.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1FULLGCTASK_HPP -#define SHARE_GC_G1_G1FULLGCTASK_HPP +#pragma once #include "gc/shared/workgroup.hpp" #include "utilities/ticks.hpp" @@ -41,5 +40,3 @@ G1FullCollector* collector() { return _collector; } void log_task(const char* name, uint worker_id, const Ticks& start, const Ticks& stop = Ticks::now()); }; - -#endif // SHARE_GC_G1_G1FULLGCTASK_HPP diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp --- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp +++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1GCPHASETIMES_HPP -#define SHARE_VM_GC_G1_G1GCPHASETIMES_HPP +#pragma once #include "gc/shared/referenceProcessorPhaseTimes.hpp" #include "gc/shared/weakProcessorPhaseTimes.hpp" @@ -424,5 +423,3 @@ G1EvacPhaseTimesTracker(G1GCPhaseTimes* phase_times, G1ParScanThreadState* pss, G1GCPhaseTimes::GCParPhases phase, uint worker_id); virtual ~G1EvacPhaseTimesTracker(); }; - -#endif // SHARE_VM_GC_G1_G1GCPHASETIMES_HPP diff --git a/src/hotspot/share/gc/g1/g1HRPrinter.hpp b/src/hotspot/share/gc/g1/g1HRPrinter.hpp --- a/src/hotspot/share/gc/g1/g1HRPrinter.hpp +++ b/src/hotspot/share/gc/g1/g1HRPrinter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1HRPRINTER_HPP -#define SHARE_VM_GC_G1_G1HRPRINTER_HPP +#pragma once #include "gc/g1/heapRegion.hpp" #include "logging/log.hpp" @@ -104,5 +103,3 @@ } } }; - -#endif // SHARE_VM_GC_G1_G1HRPRINTER_HPP diff --git a/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp b/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp --- a/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1HEAPREGIONEVENTSENDER_HPP -#define SHARE_VM_GC_G1_G1HEAPREGIONEVENTSENDER_HPP +#pragma once #include "memory/allocation.hpp" @@ -31,5 +30,3 @@ public: static void send_events(); }; - -#endif // SHARE_VM_GC_G1_G1HEAPREGIONEVENTSENDER_HPP diff --git a/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp b/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp --- a/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1HEAPREGIONTRACETYPE_HPP -#define SHARE_VM_GC_G1_G1HEAPREGIONTRACETYPE_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -56,5 +55,3 @@ } } }; - -#endif // SHARE_VM_GC_G1_G1HEAPREGIONTRACETYPE_HPP diff --git a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp --- a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp +++ b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1HEAPSIZINGPOLICY_HPP -#define SHARE_VM_GC_G1_G1HEAPSIZINGPOLICY_HPP +#pragma once #include "memory/allocation.hpp" @@ -59,5 +58,3 @@ static G1HeapSizingPolicy* create(const G1CollectedHeap* g1h, const G1Analytics* analytics); }; - -#endif // SRC_SHARE_VM_GC_G1_G1HEAPSIZINGPOLICY_HPP diff --git a/src/hotspot/share/gc/g1/g1HeapTransition.hpp b/src/hotspot/share/gc/g1/g1HeapTransition.hpp --- a/src/hotspot/share/gc/g1/g1HeapTransition.hpp +++ b/src/hotspot/share/gc/g1/g1HeapTransition.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1HEAPTRANSITION_HPP -#define SHARE_VM_GC_G1_G1HEAPTRANSITION_HPP +#pragma once #include "gc/shared/plab.hpp" @@ -49,5 +48,3 @@ void print(); }; - -#endif // SHARE_VM_GC_G1_G1HEAPTRANSITION_HPP diff --git a/src/hotspot/share/gc/g1/g1HeapVerifier.hpp b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp --- a/src/hotspot/share/gc/g1/g1HeapVerifier.hpp +++ b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1HEAPVERIFIER_HPP -#define SHARE_VM_GC_G1_G1HEAPVERIFIER_HPP +#pragma once #include "gc/g1/heapRegionSet.hpp" #include "memory/allocation.hpp" @@ -118,5 +117,3 @@ static void verify_ready_for_archiving(); static void verify_archive_regions(); }; - -#endif // SHARE_VM_GC_G1_G1HEAPVERIFIER_HPP diff --git a/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp b/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp --- a/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp +++ b/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP -#define SHARE_VM_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP +#pragma once #include "gc/g1/g1CollectorPolicy.hpp" #include "gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp" @@ -44,5 +43,3 @@ virtual bool is_hetero_heap() const; static size_t reasonable_max_memory_for_young(); }; - -#endif // SHARE_VM_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP diff --git a/src/hotspot/share/gc/g1/g1HeterogeneousHeapPolicy.hpp b/src/hotspot/share/gc/g1/g1HeterogeneousHeapPolicy.hpp --- a/src/hotspot/share/gc/g1/g1HeterogeneousHeapPolicy.hpp +++ b/src/hotspot/share/gc/g1/g1HeterogeneousHeapPolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP -#define SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP +#pragma once #include "gc/g1/g1CollectorPolicy.hpp" #include "gc/g1/g1Policy.hpp" @@ -45,4 +44,3 @@ virtual bool force_upgrade_to_full(); }; -#endif // SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP diff --git a/src/hotspot/share/gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp b/src/hotspot/share/gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp --- a/src/hotspot/share/gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp +++ b/src/hotspot/share/gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP -#define SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP +#pragma once #include "gc/g1/g1YoungGenSizer.hpp" @@ -47,5 +46,3 @@ virtual void heap_size_changed(uint new_number_of_heap_regions); }; - -#endif // SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP diff --git a/src/hotspot/share/gc/g1/g1HotCardCache.hpp b/src/hotspot/share/gc/g1/g1HotCardCache.hpp --- a/src/hotspot/share/gc/g1/g1HotCardCache.hpp +++ b/src/hotspot/share/gc/g1/g1HotCardCache.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1HOTCARDCACHE_HPP -#define SHARE_VM_GC_G1_G1HOTCARDCACHE_HPP +#pragma once #include "gc/g1/g1CardCounts.hpp" #include "gc/g1/g1_globals.hpp" @@ -140,5 +139,3 @@ } } }; - -#endif // SHARE_VM_GC_G1_G1HOTCARDCACHE_HPP diff --git a/src/hotspot/share/gc/g1/g1IHOPControl.hpp b/src/hotspot/share/gc/g1/g1IHOPControl.hpp --- a/src/hotspot/share/gc/g1/g1IHOPControl.hpp +++ b/src/hotspot/share/gc/g1/g1IHOPControl.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1IHOPCONTROL_HPP -#define SHARE_VM_GC_G1_G1IHOPCONTROL_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/numberSeq.hpp" @@ -145,5 +144,3 @@ virtual void print(); virtual void send_trace_event(G1NewTracer* tracer); }; - -#endif // SHARE_VM_GC_G1_G1IHOPCONTROL_HPP diff --git a/src/hotspot/share/gc/g1/g1InCSetState.hpp b/src/hotspot/share/gc/g1/g1InCSetState.hpp --- a/src/hotspot/share/gc/g1/g1InCSetState.hpp +++ b/src/hotspot/share/gc/g1/g1InCSetState.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1INCSETSTATE_HPP -#define SHARE_VM_GC_G1_G1INCSETSTATE_HPP +#pragma once #include "gc/g1/g1BiasedArray.hpp" #include "gc/g1/heapRegion.hpp" @@ -138,5 +137,3 @@ void clear() { G1BiasedMappedArray::clear(); } void clear(const HeapRegion* hr) { return set_by_index(hr->hrm_index(), InCSetState::NotInCSet); } }; - -#endif // SHARE_VM_GC_G1_G1INCSETSTATE_HPP diff --git a/src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp b/src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp --- a/src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp +++ b/src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP -#define SHARE_VM_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/debug.hpp" @@ -83,5 +82,3 @@ // Returns whether we have a result that can be retrieved. bool has_result() const { return _mixed_start_time > 0.0 && _initial_mark_end_time > 0.0; } }; - -#endif // SHARE_VM_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP diff --git a/src/hotspot/share/gc/g1/g1MMUTracker.hpp b/src/hotspot/share/gc/g1/g1MMUTracker.hpp --- a/src/hotspot/share/gc/g1/g1MMUTracker.hpp +++ b/src/hotspot/share/gc/g1/g1MMUTracker.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1MMUTRACKER_HPP -#define SHARE_VM_GC_G1_G1MMUTRACKER_HPP +#pragma once #include "gc/shared/gcId.hpp" #include "memory/allocation.hpp" @@ -141,5 +140,3 @@ virtual double when_sec(double current_time, double pause_time); }; - -#endif // SHARE_VM_GC_G1_G1MMUTRACKER_HPP diff --git a/src/hotspot/share/gc/g1/g1MemoryPool.hpp b/src/hotspot/share/gc/g1/g1MemoryPool.hpp --- a/src/hotspot/share/gc/g1/g1MemoryPool.hpp +++ b/src/hotspot/share/gc/g1/g1MemoryPool.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1MEMORYPOOL_HPP -#define SHARE_VM_GC_G1_G1MEMORYPOOL_HPP +#pragma once #include "gc/g1/g1MonitoringSupport.hpp" #include "services/memoryPool.hpp" @@ -92,5 +91,3 @@ MemoryUsage get_memory_usage(); }; - -#endif // SHARE_VM_GC_G1_G1MEMORYPOOL_HPP diff --git a/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp --- a/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp +++ b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1MONITORINGSUPPORT_HPP -#define SHARE_VM_GC_G1_G1MONITORINGSUPPORT_HPP +#pragma once #include "gc/shared/collectorCounters.hpp" #include "gc/shared/generationCounters.hpp" @@ -258,5 +257,3 @@ public: G1MonitoringScope(G1MonitoringSupport* g1mm, bool full_gc, bool all_memory_pools_affected); }; - -#endif // SHARE_VM_GC_G1_G1MONITORINGSUPPORT_HPP diff --git a/src/hotspot/share/gc/g1/g1OopClosures.hpp b/src/hotspot/share/gc/g1/g1OopClosures.hpp --- a/src/hotspot/share/gc/g1/g1OopClosures.hpp +++ b/src/hotspot/share/gc/g1/g1OopClosures.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1OOPCLOSURES_HPP -#define SHARE_VM_GC_G1_G1OOPCLOSURES_HPP +#pragma once #include "gc/g1/g1InCSetState.hpp" #include "memory/iterator.hpp" @@ -250,5 +249,3 @@ virtual ReferenceIterationMode reference_iteration_mode() { return DO_FIELDS; } }; - -#endif // SHARE_VM_GC_G1_G1OOPCLOSURES_HPP diff --git a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp --- a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp +++ b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1OOPCLOSURES_INLINE_HPP -#define SHARE_VM_GC_G1_G1OOPCLOSURES_INLINE_HPP +#pragma once #include "gc/g1/g1CollectedHeap.hpp" #include "gc/g1/g1ConcurrentMark.inline.hpp" @@ -278,5 +277,3 @@ HeapRegionRemSet* rem_set = to->rem_set(); rem_set->add_reference(p, _worker_id); } - -#endif // SHARE_VM_GC_G1_G1OOPCLOSURES_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1OopStarChunkedList.hpp b/src/hotspot/share/gc/g1/g1OopStarChunkedList.hpp --- a/src/hotspot/share/gc/g1/g1OopStarChunkedList.hpp +++ b/src/hotspot/share/gc/g1/g1OopStarChunkedList.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1OOPSTARCHUNKEDLIST_HPP -#define SHARE_GC_G1_G1OOPSTARCHUNKEDLIST_HPP +#pragma once #include "oops/oopsHierarchy.hpp" #include "utilities/chunkedList.hpp" @@ -60,5 +59,3 @@ inline void push_root(oop* p); inline void push_root(narrowOop* p); }; - -#endif // SHARE_GC_G1_G1OOPSTARCHUNKEDLIST_HPP diff --git a/src/hotspot/share/gc/g1/g1OopStarChunkedList.inline.hpp b/src/hotspot/share/gc/g1/g1OopStarChunkedList.inline.hpp --- a/src/hotspot/share/gc/g1/g1OopStarChunkedList.inline.hpp +++ b/src/hotspot/share/gc/g1/g1OopStarChunkedList.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_G1OOPSTARCHUNKEDLIST_INLINE_HPP -#define SHARE_GC_G1_G1OOPSTARCHUNKEDLIST_INLINE_HPP +#pragma once #include "gc/g1/g1OopStarChunkedList.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" @@ -80,5 +79,3 @@ } } } - -#endif // SHARE_GC_G1_G1OOPSTARCHUNKEDLIST_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp --- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp +++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP -#define SHARE_VM_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP +#pragma once #include "memory/memRegion.hpp" #include "memory/virtualspace.hpp" @@ -151,5 +150,3 @@ void print_on(outputStream* out) PRODUCT_RETURN; void print(); }; - -#endif // SHARE_VM_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp --- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp +++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP -#define SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP +#pragma once #include "gc/g1/dirtyCardQueue.hpp" #include "gc/g1/g1CardTable.hpp" @@ -248,5 +247,3 @@ private: G1ParScanThreadState* new_par_scan_state(uint worker_id, size_t young_cset_length); }; - -#endif // SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp --- a/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp +++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP -#define SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP +#pragma once #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1OopStarChunkedList.inline.hpp" @@ -222,5 +221,3 @@ G1OopStarChunkedList* G1ParScanThreadState::oops_into_optional_region(const HeapRegion* hr) { return &_oops_into_optional_regions[hr->index_in_opt_cset()]; } - -#endif // SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp --- a/src/hotspot/share/gc/g1/g1Policy.hpp +++ b/src/hotspot/share/gc/g1/g1Policy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1POLICY_HPP -#define SHARE_VM_GC_G1_G1POLICY_HPP +#pragma once #include "gc/g1/g1CollectorPolicy.hpp" #include "gc/g1/g1CollectorState.hpp" @@ -440,5 +439,3 @@ return false; } }; - -#endif // SHARE_VM_GC_G1_G1POLICY_HPP diff --git a/src/hotspot/share/gc/g1/g1Predictions.hpp b/src/hotspot/share/gc/g1/g1Predictions.hpp --- a/src/hotspot/share/gc/g1/g1Predictions.hpp +++ b/src/hotspot/share/gc/g1/g1Predictions.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1PREDICTIONS_HPP -#define SHARE_VM_GC_G1_G1PREDICTIONS_HPP +#pragma once #include "utilities/numberSeq.hpp" @@ -58,5 +57,3 @@ return seq->davg() + _sigma * stddev_estimate(seq); } }; - -#endif // SHARE_VM_GC_G1_G1PREDICTIONS_HPP diff --git a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp --- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp +++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_HPP -#define SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -126,5 +125,3 @@ size_t hits() const { return _cache_hits; } size_t misses() const { return _cache_misses; } }; - -#endif // SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_HPP diff --git a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp --- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp +++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP -#define SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP +#pragma once #include "gc/g1/g1RegionMarkStatsCache.hpp" #include "runtime/atomic.hpp" @@ -50,5 +49,3 @@ } cur->clear(); } - -#endif // SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp --- a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp +++ b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1REGIONTOSPACEMAPPER_HPP -#define SHARE_VM_GC_G1_G1REGIONTOSPACEMAPPER_HPP +#pragma once #include "gc/g1/g1PageBasedVirtualSpace.hpp" #include "memory/allocation.hpp" @@ -121,4 +120,3 @@ virtual void commit_regions(uint start_idx, size_t num_regions = 1, WorkGang* pretouch_workers = NULL); virtual void uncommit_regions(uint start_idx, size_t num_regions = 1); }; -#endif // SHARE_VM_GC_G1_G1REGIONTOSPACEMAPPER_HPP diff --git a/src/hotspot/share/gc/g1/g1RemSet.hpp b/src/hotspot/share/gc/g1/g1RemSet.hpp --- a/src/hotspot/share/gc/g1/g1RemSet.hpp +++ b/src/hotspot/share/gc/g1/g1RemSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1REMSET_HPP -#define SHARE_VM_GC_G1_G1REMSET_HPP +#pragma once #include "gc/g1/dirtyCardQueue.hpp" #include "gc/g1/g1CardTable.hpp" @@ -177,5 +176,3 @@ size_t cards_claimed() const { return _cards_claimed; } size_t cards_skipped() const { return _cards_skipped; } }; - -#endif // SHARE_VM_GC_G1_G1REMSET_HPP diff --git a/src/hotspot/share/gc/g1/g1RemSetSummary.hpp b/src/hotspot/share/gc/g1/g1RemSetSummary.hpp --- a/src/hotspot/share/gc/g1/g1RemSetSummary.hpp +++ b/src/hotspot/share/gc/g1/g1RemSetSummary.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1REMSETSUMMARY_HPP -#define SHARE_VM_GC_G1_G1REMSETSUMMARY_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/ostream.hpp" @@ -96,5 +95,3 @@ return _num_coarsenings; } }; - -#endif // SHARE_VM_GC_G1_G1REMSETSUMMARY_HPP diff --git a/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp --- a/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp +++ b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1REMSETTRACKINGPOLICY_HPP -#define SHARE_VM_GC_G1_G1REMSETTRACKINGPOLICY_HPP +#pragma once #include "gc/g1/heapRegion.hpp" #include "gc/g1/heapRegionType.hpp" @@ -53,6 +52,3 @@ // Update remembered set tracking state when the region is freed. void update_at_free(HeapRegion* r); }; - -#endif /* SHARE_VM_GC_G1_G1REMSETTRACKINGPOLICY_HPP */ - diff --git a/src/hotspot/share/gc/g1/g1RootClosures.hpp b/src/hotspot/share/gc/g1/g1RootClosures.hpp --- a/src/hotspot/share/gc/g1/g1RootClosures.hpp +++ b/src/hotspot/share/gc/g1/g1RootClosures.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1ROOTCLOSURESET_HPP -#define SHARE_VM_GC_G1_G1ROOTCLOSURESET_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/iterator.hpp" @@ -64,5 +63,3 @@ static G1EvacuationRootClosures* create_root_closures(G1ParScanThreadState* pss, G1CollectedHeap* g1h); }; - -#endif // SHARE_VM_GC_G1_G1ROOTCLOSURESET_HPP diff --git a/src/hotspot/share/gc/g1/g1RootProcessor.hpp b/src/hotspot/share/gc/g1/g1RootProcessor.hpp --- a/src/hotspot/share/gc/g1/g1RootProcessor.hpp +++ b/src/hotspot/share/gc/g1/g1RootProcessor.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP -#define SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP +#pragma once #include "gc/shared/oopStorageParState.hpp" #include "gc/shared/strongRootsScope.hpp" @@ -124,5 +123,3 @@ // Number of worker threads used by the root processor. uint n_workers() const; }; - -#endif // SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP diff --git a/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp b/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp --- a/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp +++ b/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1SATBMARKQUEUE_HPP -#define SHARE_VM_GC_G1_G1SATBMARKQUEUE_HPP +#pragma once #include "gc/shared/satbMarkQueue.hpp" @@ -48,5 +47,3 @@ virtual SATBMarkQueue& satb_queue_for_thread(JavaThread* const t) const; virtual void filter(SATBMarkQueue* queue); }; - -#endif // SHARE_VM_GC_G1_G1SATBMARKQUEUE_HPP diff --git a/src/hotspot/share/gc/g1/g1StringDedup.hpp b/src/hotspot/share/gc/g1/g1StringDedup.hpp --- a/src/hotspot/share/gc/g1/g1StringDedup.hpp +++ b/src/hotspot/share/gc/g1/g1StringDedup.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1STRINGDEDUP_HPP -#define SHARE_VM_GC_G1_G1STRINGDEDUP_HPP +#pragma once // // G1 string deduplication candidate selection @@ -108,5 +107,3 @@ } } }; - -#endif // SHARE_VM_GC_G1_G1STRINGDEDUP_HPP diff --git a/src/hotspot/share/gc/g1/g1StringDedupQueue.hpp b/src/hotspot/share/gc/g1/g1StringDedupQueue.hpp --- a/src/hotspot/share/gc/g1/g1StringDedupQueue.hpp +++ b/src/hotspot/share/gc/g1/g1StringDedupQueue.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1STRINGDEDUPQUEUE_HPP -#define SHARE_VM_GC_G1_G1STRINGDEDUPQUEUE_HPP +#pragma once #include "gc/shared/stringdedup/stringDedupQueue.hpp" #include "memory/allocation.hpp" @@ -83,5 +82,3 @@ void print_statistics_impl(); void verify_impl(); }; - -#endif // SHARE_VM_GC_G1_G1STRINGDEDUPQUEUE_HPP diff --git a/src/hotspot/share/gc/g1/g1StringDedupStat.hpp b/src/hotspot/share/gc/g1/g1StringDedupStat.hpp --- a/src/hotspot/share/gc/g1/g1StringDedupStat.hpp +++ b/src/hotspot/share/gc/g1/g1StringDedupStat.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1STRINGDEDUPSTAT_HPP -#define SHARE_VM_GC_G1_G1STRINGDEDUPSTAT_HPP +#pragma once #include "gc/shared/stringdedup/stringDedupStat.hpp" @@ -48,5 +47,3 @@ void reset(); }; - -#endif // SHARE_VM_GC_G1_G1STRINGDEDUPSTAT_HPP diff --git a/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp b/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp --- a/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp +++ b/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1SURVIVORREGIONS_HPP -#define SHARE_VM_GC_G1_G1SURVIVORREGIONS_HPP +#pragma once #include "runtime/globals.hpp" @@ -50,5 +49,3 @@ return _regions; } }; - -#endif // SHARE_VM_GC_G1_G1SURVIVORREGIONS_HPP diff --git a/src/hotspot/share/gc/g1/g1ThreadLocalData.hpp b/src/hotspot/share/gc/g1/g1ThreadLocalData.hpp --- a/src/hotspot/share/gc/g1/g1ThreadLocalData.hpp +++ b/src/hotspot/share/gc/g1/g1ThreadLocalData.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_G1_G1THREADLOCALDATA_HPP -#define SHARE_GC_G1_G1THREADLOCALDATA_HPP +#pragma once #include "gc/g1/dirtyCardQueue.hpp" #include "gc/g1/g1BarrierSet.hpp" @@ -90,5 +89,3 @@ return dirty_card_queue_offset() + DirtyCardQueue::byte_offset_of_buf(); } }; - -#endif // SHARE_GC_G1_G1THREADLOCALDATA_HPP diff --git a/src/hotspot/share/gc/g1/g1VMOperations.hpp b/src/hotspot/share/gc/g1/g1VMOperations.hpp --- a/src/hotspot/share/gc/g1/g1VMOperations.hpp +++ b/src/hotspot/share/gc/g1/g1VMOperations.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1VMOPERATIONS_HPP -#define SHARE_VM_GC_G1_G1VMOPERATIONS_HPP +#pragma once #include "gc/shared/gcId.hpp" #include "gc/shared/gcVMOperations.hpp" @@ -80,5 +79,3 @@ virtual bool doit_prologue(); virtual void doit_epilogue(); }; - -#endif // SHARE_VM_GC_G1_G1VMOPERATIONS_HPP diff --git a/src/hotspot/share/gc/g1/g1YCTypes.hpp b/src/hotspot/share/gc/g1/g1YCTypes.hpp --- a/src/hotspot/share/gc/g1/g1YCTypes.hpp +++ b/src/hotspot/share/gc/g1/g1YCTypes.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1YCTYPES_HPP -#define SHARE_VM_GC_G1_G1YCTYPES_HPP +#pragma once #include "utilities/debug.hpp" @@ -47,5 +46,3 @@ } } }; - -#endif // SHARE_VM_GC_G1_G1YCTYPES_HPP diff --git a/src/hotspot/share/gc/g1/g1YoungGenSizer.hpp b/src/hotspot/share/gc/g1/g1YoungGenSizer.hpp --- a/src/hotspot/share/gc/g1/g1YoungGenSizer.hpp +++ b/src/hotspot/share/gc/g1/g1YoungGenSizer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1YOUNGGENSIZER_HPP -#define SHARE_VM_GC_G1_G1YOUNGGENSIZER_HPP +#pragma once #include "gc/g1/g1CollectorPolicy.hpp" #include "utilities/globalDefinitions.hpp" @@ -110,5 +109,3 @@ static G1YoungGenSizer* create_gen_sizer(G1CollectorPolicy* policy); }; - -#endif // SHARE_VM_GC_G1_G1YOUNGGENSIZER_HPP diff --git a/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp --- a/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp +++ b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP -#define SHARE_VM_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP +#pragma once #include "gc/shared/concurrentGCThread.hpp" @@ -62,5 +61,3 @@ G1YoungRemSetSamplingThread(); double vtime_accum() { return _vtime_accum; } }; - -#endif // SHARE_VM_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP diff --git a/src/hotspot/share/gc/g1/g1_globals.hpp b/src/hotspot/share/gc/g1/g1_globals.hpp --- a/src/hotspot/share/gc/g1/g1_globals.hpp +++ b/src/hotspot/share/gc/g1/g1_globals.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_G1_GLOBALS_HPP -#define SHARE_VM_GC_G1_G1_GLOBALS_HPP +#pragma once #include // for DBL_MAX // @@ -325,7 +324,4 @@ "reduce these calls, we keep a buffer of extra regions to " \ "absorb small changes in young gen length. This flag takes " \ "the buffer size as an percentage of young gen length") \ - range(0, 100) \ - - -#endif // SHARE_VM_GC_G1_G1_GLOBALS_HPP + range(0, 100) diff --git a/src/hotspot/share/gc/g1/heapRegion.hpp b/src/hotspot/share/gc/g1/heapRegion.hpp --- a/src/hotspot/share/gc/g1/heapRegion.hpp +++ b/src/hotspot/share/gc/g1/heapRegion.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_HEAPREGION_HPP -#define SHARE_VM_GC_G1_HEAPREGION_HPP +#pragma once #include "gc/g1/g1BlockOffsetTable.hpp" #include "gc/g1/g1HeapRegionTraceType.hpp" @@ -720,5 +719,3 @@ // and returned "false" in all cases. bool is_complete() { return _is_complete; } }; - -#endif // SHARE_VM_GC_G1_HEAPREGION_HPP diff --git a/src/hotspot/share/gc/g1/heapRegion.inline.hpp b/src/hotspot/share/gc/g1/heapRegion.inline.hpp --- a/src/hotspot/share/gc/g1/heapRegion.inline.hpp +++ b/src/hotspot/share/gc/g1/heapRegion.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP -#define SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP +#pragma once #include "gc/g1/g1BlockOffsetTable.inline.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" @@ -361,5 +360,3 @@ return true; } - -#endif // SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionBounds.hpp b/src/hotspot/share/gc/g1/heapRegionBounds.hpp --- a/src/hotspot/share/gc/g1/heapRegionBounds.hpp +++ b/src/hotspot/share/gc/g1/heapRegionBounds.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP -#define SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP +#pragma once #include "memory/allocation.hpp" @@ -50,5 +49,3 @@ static inline size_t max_size(); static inline size_t target_number(); }; - -#endif // SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp b/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp --- a/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp +++ b/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP -#define SHARE_VM_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP +#pragma once #include "gc/g1/heapRegionBounds.hpp" @@ -38,5 +37,3 @@ size_t HeapRegionBounds::target_number() { return TARGET_REGION_NUMBER; } - -#endif // SHARE_VM_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionManager.hpp b/src/hotspot/share/gc/g1/heapRegionManager.hpp --- a/src/hotspot/share/gc/g1/heapRegionManager.hpp +++ b/src/hotspot/share/gc/g1/heapRegionManager.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_HEAPREGIONMANAGER_HPP -#define SHARE_VM_GC_G1_HEAPREGIONMANAGER_HPP +#pragma once #include "gc/g1/g1BiasedArray.hpp" #include "gc/g1/g1CollectorPolicy.hpp" @@ -295,4 +294,3 @@ // Claim the given region, returns true if successfully claimed. bool claim_region(uint region_index); }; -#endif // SHARE_VM_GC_G1_HEAPREGIONMANAGER_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp b/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp --- a/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp +++ b/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP -#define SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP +#pragma once #include "gc/g1/heapRegion.hpp" #include "gc/g1/heapRegionManager.hpp" @@ -76,5 +75,3 @@ inline void HeapRegionManager::allocate_free_regions_starting_at(uint first, uint num_regions) { _free_list.remove_starting_at(at(first), num_regions); } - -#endif // SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionRemSet.hpp b/src/hotspot/share/gc/g1/heapRegionRemSet.hpp --- a/src/hotspot/share/gc/g1/heapRegionRemSet.hpp +++ b/src/hotspot/share/gc/g1/heapRegionRemSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_HEAPREGIONREMSET_HPP -#define SHARE_VM_GC_G1_HEAPREGIONREMSET_HPP +#pragma once #include "gc/g1/g1CodeCacheRemSet.hpp" #include "gc/g1/g1FromCardCache.hpp" @@ -403,5 +402,3 @@ return n_yielded_fine() + n_yielded_coarse() + n_yielded_sparse(); } }; - -#endif // SHARE_VM_GC_G1_HEAPREGIONREMSET_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionSet.hpp b/src/hotspot/share/gc/g1/heapRegionSet.hpp --- a/src/hotspot/share/gc/g1/heapRegionSet.hpp +++ b/src/hotspot/share/gc/g1/heapRegionSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_HEAPREGIONSET_HPP -#define SHARE_VM_GC_G1_HEAPREGIONSET_HPP +#pragma once #include "gc/g1/heapRegion.hpp" #include "utilities/macros.hpp" @@ -229,5 +228,3 @@ _curr(list->_head) { } }; - -#endif // SHARE_VM_GC_G1_HEAPREGIONSET_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp b/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp --- a/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp +++ b/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_HEAPREGIONSET_INLINE_HPP -#define SHARE_VM_GC_G1_HEAPREGIONSET_INLINE_HPP +#pragma once #include "gc/g1/heapRegionSet.hpp" @@ -146,6 +145,3 @@ remove(hr); return hr; } - -#endif // SHARE_VM_GC_G1_HEAPREGIONSET_INLINE_HPP - diff --git a/src/hotspot/share/gc/g1/heapRegionTracer.hpp b/src/hotspot/share/gc/g1/heapRegionTracer.hpp --- a/src/hotspot/share/gc/g1/heapRegionTracer.hpp +++ b/src/hotspot/share/gc/g1/heapRegionTracer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_HEAPREGIONTRACER_HPP -#define SHARE_VM_GC_G1_HEAPREGIONTRACER_HPP +#pragma once #include "gc/g1/g1HeapRegionTraceType.hpp" #include "memory/allocation.hpp" @@ -36,5 +35,3 @@ uintptr_t start, size_t used); }; - -#endif // SHARE_VM_GC_G1_HEAPREGIONTRACER_HPP diff --git a/src/hotspot/share/gc/g1/heapRegionType.hpp b/src/hotspot/share/gc/g1/heapRegionType.hpp --- a/src/hotspot/share/gc/g1/heapRegionType.hpp +++ b/src/hotspot/share/gc/g1/heapRegionType.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP -#define SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP +#pragma once #include "gc/g1/g1HeapRegionTraceType.hpp" @@ -195,5 +194,3 @@ static const HeapRegionType Old; static const HeapRegionType Humongous; }; - -#endif // SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP diff --git a/src/hotspot/share/gc/g1/heterogeneousHeapRegionManager.hpp b/src/hotspot/share/gc/g1/heterogeneousHeapRegionManager.hpp --- a/src/hotspot/share/gc/g1/heterogeneousHeapRegionManager.hpp +++ b/src/hotspot/share/gc/g1/heterogeneousHeapRegionManager.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP -#define SHARE_VM_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP +#pragma once #include "gc/g1/heapRegionManager.hpp" @@ -146,5 +145,3 @@ void verify(); }; - -#endif // SHARE_VM_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP diff --git a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.hpp b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.hpp --- a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.hpp +++ b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_G1_COMMANDLINEFLAGCONSTRAINTSG1_HPP -#define SHARE_GC_G1_COMMANDLINEFLAGCONSTRAINTSG1_HPP +#pragma once #include "runtime/globals.hpp" #include "utilities/globalDefinitions.hpp" @@ -42,5 +41,3 @@ JVMFlag::Error NewSizeConstraintFuncG1(size_t value, bool verbose); size_t MaxSizeForHeapAlignmentG1(); - -#endif // SHARE_GC_SHARED_COMMANDLINEFLAGCONSTRAINTSG1_HPP diff --git a/src/hotspot/share/gc/g1/sparsePRT.hpp b/src/hotspot/share/gc/g1/sparsePRT.hpp --- a/src/hotspot/share/gc/g1/sparsePRT.hpp +++ b/src/hotspot/share/gc/g1/sparsePRT.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_SPARSEPRT_HPP -#define SHARE_VM_GC_G1_SPARSEPRT_HPP +#pragma once #include "gc/g1/g1CollectedHeap.hpp" #include "gc/g1/heapRegion.hpp" @@ -263,5 +262,3 @@ return RSHashTableIter::has_next(card_index); } }; - -#endif // SHARE_VM_GC_G1_SPARSEPRT_HPP diff --git a/src/hotspot/share/gc/g1/survRateGroup.hpp b/src/hotspot/share/gc/g1/survRateGroup.hpp --- a/src/hotspot/share/gc/g1/survRateGroup.hpp +++ b/src/hotspot/share/gc/g1/survRateGroup.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_SURVRATEGROUP_HPP -#define SHARE_VM_GC_G1_SURVRATEGROUP_HPP +#pragma once #include "utilities/numberSeq.hpp" @@ -87,5 +86,3 @@ } }; - -#endif // SHARE_VM_GC_G1_SURVRATEGROUP_HPP diff --git a/src/hotspot/share/gc/g1/vmStructs_g1.hpp b/src/hotspot/share/gc/g1/vmStructs_g1.hpp --- a/src/hotspot/share/gc/g1/vmStructs_g1.hpp +++ b/src/hotspot/share/gc/g1/vmStructs_g1.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_G1_VMSTRUCTS_G1_HPP -#define SHARE_VM_GC_G1_VMSTRUCTS_G1_HPP +#pragma once #include "gc/g1/g1CollectedHeap.hpp" #include "gc/g1/heapRegion.hpp" @@ -109,5 +108,3 @@ declare_toplevel_type(G1MonitoringSupport*) \ \ declare_integer_type(HeapRegionType::Tag volatile) - -#endif // SHARE_VM_GC_G1_VMSTRUCTS_G1_HPP diff --git a/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp b/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp --- a/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp +++ b/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONS_HPP -#define SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONS_HPP +#pragma once #include "gc/parallel/adjoiningVirtualSpaces.hpp" #include "gc/parallel/asPSOldGen.hpp" @@ -81,4 +80,3 @@ // Return new AdjoiningGenerations instance based on collector policy (specifically - whether heap is heterogeneous). static AdjoiningGenerations* create_adjoining_generations(ReservedSpace rs, GenerationSizer* policy, size_t alignment); }; -#endif // SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONS_HPP diff --git a/src/hotspot/share/gc/parallel/adjoiningGenerationsForHeteroHeap.hpp b/src/hotspot/share/gc/parallel/adjoiningGenerationsForHeteroHeap.hpp --- a/src/hotspot/share/gc/parallel/adjoiningGenerationsForHeteroHeap.hpp +++ b/src/hotspot/share/gc/parallel/adjoiningGenerationsForHeteroHeap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP -#define SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP +#pragma once #include "gc/parallel/adjoiningGenerations.hpp" @@ -81,5 +80,3 @@ // Return the total byte size of the reserved space size_t reserved_byte_size(); }; -#endif // SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP - diff --git a/src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp b/src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp --- a/src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp +++ b/src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP -#define SHARE_VM_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP +#pragma once #include "gc/parallel/psVirtualspace.hpp" @@ -112,4 +111,3 @@ size_t init_low_byte_size, size_t init_high_byte_size); }; -#endif // SHARE_VM_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP diff --git a/src/hotspot/share/gc/parallel/asPSOldGen.hpp b/src/hotspot/share/gc/parallel/asPSOldGen.hpp --- a/src/hotspot/share/gc/parallel/asPSOldGen.hpp +++ b/src/hotspot/share/gc/parallel/asPSOldGen.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP -#define SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP +#pragma once #include "gc/parallel/mutableSpace.hpp" #include "gc/parallel/objectStartArray.hpp" @@ -67,5 +66,3 @@ // Debugging support virtual const char* short_name() const { return "ASPSOldGen"; } }; - -#endif // SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP diff --git a/src/hotspot/share/gc/parallel/asPSYoungGen.hpp b/src/hotspot/share/gc/parallel/asPSYoungGen.hpp --- a/src/hotspot/share/gc/parallel/asPSYoungGen.hpp +++ b/src/hotspot/share/gc/parallel/asPSYoungGen.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP -#define SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP +#pragma once #include "gc/parallel/mutableSpace.hpp" #include "gc/parallel/objectStartArray.hpp" @@ -73,5 +72,3 @@ // Printing support virtual const char* short_name() const { return "ASPSYoungGen"; } }; - -#endif // SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP diff --git a/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp b/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp --- a/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp +++ b/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP -#define SHARE_VM_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP +#pragma once #include "gc/shared/adaptiveSizePolicy.hpp" #include "gc/shared/gcPolicyCounters.hpp" @@ -229,5 +228,3 @@ return GCPolicyCounters::GCAdaptivePolicyCountersKind; } }; - -#endif // SHARE_VM_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP diff --git a/src/hotspot/share/gc/parallel/gcTaskManager.hpp b/src/hotspot/share/gc/parallel/gcTaskManager.hpp --- a/src/hotspot/share/gc/parallel/gcTaskManager.hpp +++ b/src/hotspot/share/gc/parallel/gcTaskManager.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_GCTASKMANAGER_HPP -#define SHARE_VM_GC_PARALLEL_GCTASKMANAGER_HPP +#pragma once #include "runtime/mutex.hpp" #include "utilities/growableArray.hpp" @@ -664,5 +663,3 @@ return _freelist; } }; - -#endif // SHARE_VM_GC_PARALLEL_GCTASKMANAGER_HPP diff --git a/src/hotspot/share/gc/parallel/gcTaskThread.hpp b/src/hotspot/share/gc/parallel/gcTaskThread.hpp --- a/src/hotspot/share/gc/parallel/gcTaskThread.hpp +++ b/src/hotspot/share/gc/parallel/gcTaskThread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP -#define SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP +#pragma once #include "runtime/thread.hpp" @@ -104,5 +103,3 @@ void set_exit_time(jlong time) { _exit_time = time; } void set_name(const char* name) { _name = name; } }; - -#endif // SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP diff --git a/src/hotspot/share/gc/parallel/generationSizer.hpp b/src/hotspot/share/gc/parallel/generationSizer.hpp --- a/src/hotspot/share/gc/parallel/generationSizer.hpp +++ b/src/hotspot/share/gc/parallel/generationSizer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_GENERATIONSIZER_HPP -#define SHARE_VM_GC_PARALLEL_GENERATIONSIZER_HPP +#pragma once #include "gc/shared/collectorPolicy.hpp" @@ -45,4 +44,3 @@ virtual size_t heap_reserved_size_bytes() const; virtual bool is_hetero_heap() const; }; -#endif // SHARE_VM_GC_PARALLEL_GENERATIONSIZER_HPP diff --git a/src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp b/src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp --- a/src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp +++ b/src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP -#define SHARE_VM_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP +#pragma once #include "gc/parallel/generationSizer.hpp" @@ -43,4 +42,3 @@ virtual size_t heap_reserved_size_bytes() const; virtual bool is_hetero_heap() const; }; -#endif // SHARE_VM_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP diff --git a/src/hotspot/share/gc/parallel/immutableSpace.hpp b/src/hotspot/share/gc/parallel/immutableSpace.hpp --- a/src/hotspot/share/gc/parallel/immutableSpace.hpp +++ b/src/hotspot/share/gc/parallel/immutableSpace.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_IMMUTABLESPACE_HPP -#define SHARE_VM_GC_PARALLEL_IMMUTABLESPACE_HPP +#pragma once #include "memory/iterator.hpp" @@ -67,5 +66,3 @@ virtual void print_short() const PRODUCT_RETURN; virtual void verify(); }; - -#endif // SHARE_VM_GC_PARALLEL_IMMUTABLESPACE_HPP diff --git a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp --- a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp +++ b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_PARALLEL_COMMANDLINEFLAGCONSTRAINTSPARALLEL_HPP -#define SHARE_GC_PARALLEL_COMMANDLINEFLAGCONSTRAINTSPARALLEL_HPP +#pragma once #include "runtime/globals.hpp" #include "utilities/globalDefinitions.hpp" @@ -32,5 +31,3 @@ JVMFlag::Error ParallelGCThreadsConstraintFuncParallel(uint value, bool verbose); JVMFlag::Error InitialTenuringThresholdConstraintFuncParallel(uintx value, bool verbose); JVMFlag::Error MaxTenuringThresholdConstraintFuncParallel(uintx value, bool verbose); - -#endif // SHARE_GC_PARALLEL_COMMANDLINEFLAGCONSTRAINTSPARALLEL_HPP diff --git a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp --- a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp +++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_MUTABLENUMASPACE_HPP -#define SHARE_VM_GC_PARALLEL_MUTABLENUMASPACE_HPP +#pragma once #include "gc/parallel/mutableSpace.hpp" #include "gc/shared/gcUtil.hpp" @@ -231,5 +230,3 @@ virtual void set_top(HeapWord* value); }; - -#endif // SHARE_VM_GC_PARALLEL_MUTABLENUMASPACE_HPP diff --git a/src/hotspot/share/gc/parallel/mutableSpace.hpp b/src/hotspot/share/gc/parallel/mutableSpace.hpp --- a/src/hotspot/share/gc/parallel/mutableSpace.hpp +++ b/src/hotspot/share/gc/parallel/mutableSpace.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_MUTABLESPACE_HPP -#define SHARE_VM_GC_PARALLEL_MUTABLESPACE_HPP +#pragma once #include "gc/parallel/immutableSpace.hpp" #include "memory/memRegion.hpp" @@ -144,5 +143,3 @@ virtual void print_short_on(outputStream* st) const; virtual void verify(); }; - -#endif // SHARE_VM_GC_PARALLEL_MUTABLESPACE_HPP diff --git a/src/hotspot/share/gc/parallel/objectStartArray.hpp b/src/hotspot/share/gc/parallel/objectStartArray.hpp --- a/src/hotspot/share/gc/parallel/objectStartArray.hpp +++ b/src/hotspot/share/gc/parallel/objectStartArray.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_HPP -#define SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_HPP +#pragma once #include "gc/parallel/psVirtualspace.hpp" #include "memory/allocation.hpp" @@ -155,5 +154,3 @@ // "start", the method will return true. bool object_starts_in_range(HeapWord* start_addr, HeapWord* end_addr) const; }; - -#endif // SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_HPP diff --git a/src/hotspot/share/gc/parallel/objectStartArray.inline.hpp b/src/hotspot/share/gc/parallel/objectStartArray.inline.hpp --- a/src/hotspot/share/gc/parallel/objectStartArray.inline.hpp +++ b/src/hotspot/share/gc/parallel/objectStartArray.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP -#define SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP +#pragma once #include "gc/parallel/objectStartArray.hpp" @@ -48,6 +47,3 @@ assert(addr <= next, "wrong order for arg and next"); return scroll_forward; } - - -#endif // SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp --- a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp +++ b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PARMARKBITMAP_HPP -#define SHARE_VM_GC_PARALLEL_PARMARKBITMAP_HPP +#pragma once #include "memory/memRegion.hpp" #include "oops/oop.hpp" @@ -187,5 +186,3 @@ PSVirtualSpace* _virtual_space; size_t _reserved_byte_size; }; - -#endif // SHARE_VM_GC_PARALLEL_PARMARKBITMAP_HPP diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp b/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp --- a/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp +++ b/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP -#define SHARE_VM_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP +#pragma once #include "gc/parallel/parMarkBitMap.hpp" #include "utilities/bitMap.inline.hpp" @@ -194,5 +193,3 @@ "addr too big, addr: " PTR_FORMAT " region end: " PTR_FORMAT, p2i(addr), p2i(region_end())); } #endif // #ifdef ASSERT - -#endif /* SHARE_VM_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP */ diff --git a/src/hotspot/share/gc/parallel/parallelArguments.hpp b/src/hotspot/share/gc/parallel/parallelArguments.hpp --- a/src/hotspot/share/gc/parallel/parallelArguments.hpp +++ b/src/hotspot/share/gc/parallel/parallelArguments.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_PARALLEL_PARALLELARGUMENTS_HPP -#define SHARE_GC_PARALLEL_PARALLELARGUMENTS_HPP +#pragma once #include "gc/shared/gcArguments.hpp" @@ -35,5 +34,3 @@ virtual size_t conservative_max_heap_alignment(); virtual CollectedHeap* create_heap(); }; - -#endif // SHARE_GC_CMS_PARALLELARGUMENTS_HPP diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp --- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp +++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP -#define SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP +#pragma once #include "gc/parallel/generationSizer.hpp" #include "gc/parallel/objectStartArray.hpp" @@ -310,5 +309,3 @@ } } }; - -#endif // SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp --- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp +++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP -#define SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP +#pragma once #include "gc/parallel/parallelScavengeHeap.hpp" #include "gc/parallel/psMarkSweepProxy.hpp" @@ -51,4 +50,3 @@ "incorrect test - result=%d, p=" PTR_FORMAT, result, p2i((void*)p)); return result; } -#endif // SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP diff --git a/src/hotspot/share/gc/parallel/parallel_globals.hpp b/src/hotspot/share/gc/parallel/parallel_globals.hpp --- a/src/hotspot/share/gc/parallel/parallel_globals.hpp +++ b/src/hotspot/share/gc/parallel/parallel_globals.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_PARALLEL_PARALLEL_GLOBALS_HPP -#define SHARE_GC_PARALLEL_PARALLEL_GLOBALS_HPP +#pragma once #define GC_PARALLEL_FLAGS(develop, \ develop_pd, \ @@ -79,5 +78,3 @@ \ product(bool, PSChunkLargeArrays, true, \ "Process large arrays in chunks") - -#endif // SHARE_GC_PARALLEL_PARALLEL_GLOBALS_HPP diff --git a/src/hotspot/share/gc/parallel/pcTasks.hpp b/src/hotspot/share/gc/parallel/pcTasks.hpp --- a/src/hotspot/share/gc/parallel/pcTasks.hpp +++ b/src/hotspot/share/gc/parallel/pcTasks.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PCTASKS_HPP -#define SHARE_VM_GC_PARALLEL_PCTASKS_HPP +#pragma once #include "gc/parallel/gcTaskManager.hpp" #include "gc/parallel/psParallelCompact.hpp" @@ -205,4 +204,3 @@ virtual void do_it(GCTaskManager* manager, uint which); }; -#endif // SHARE_VM_GC_PARALLEL_PCTASKS_HPP diff --git a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp --- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp +++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP -#define SHARE_VM_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP +#pragma once #include "gc/shared/adaptiveSizePolicy.hpp" #include "gc/shared/gcCause.hpp" @@ -401,5 +400,3 @@ // Decay the supplemental growth additive. void decay_supplemental_growth(bool is_full_gc); }; - -#endif // SHARE_VM_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP diff --git a/src/hotspot/share/gc/parallel/psCardTable.hpp b/src/hotspot/share/gc/parallel/psCardTable.hpp --- a/src/hotspot/share/gc/parallel/psCardTable.hpp +++ b/src/hotspot/share/gc/parallel/psCardTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSCARDTABLE_HPP -#define SHARE_VM_GC_PARALLEL_PSCARDTABLE_HPP +#pragma once #include "gc/shared/cardTable.hpp" #include "oops/oop.hpp" @@ -108,5 +107,3 @@ void verify_all_young_refs_imprecise(); void verify_all_young_refs_precise(); }; - -#endif // SHARE_VM_GC_PARALLEL_PSCARDTABLE diff --git a/src/hotspot/share/gc/parallel/psClosure.inline.hpp b/src/hotspot/share/gc/parallel/psClosure.inline.hpp --- a/src/hotspot/share/gc/parallel/psClosure.inline.hpp +++ b/src/hotspot/share/gc/parallel/psClosure.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSCLOSURE_INLINE_HPP -#define SHARE_VM_GC_PARALLEL_PSCLOSURE_INLINE_HPP +#pragma once #include "gc/parallel/psPromotionManager.inline.hpp" #include "gc/parallel/psScavenge.inline.hpp" @@ -117,5 +116,3 @@ } } }; - -#endif diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.hpp --- a/src/hotspot/share/gc/parallel/psCompactionManager.hpp +++ b/src/hotspot/share/gc/parallel/psCompactionManager.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP -#define SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP +#pragma once #include "gc/shared/taskqueue.hpp" #include "memory/allocation.hpp" @@ -193,5 +192,3 @@ bool ParCompactionManager::marking_stacks_empty() const { return _marking_stack.is_empty() && _objarray_stack.is_empty(); } - -#endif // SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp --- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp +++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP -#define SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP +#pragma once #include "classfile/javaClasses.inline.hpp" #include "gc/parallel/parMarkBitMap.hpp" @@ -176,5 +175,3 @@ obj->oop_iterate(&cl); } } - -#endif // SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP diff --git a/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp b/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp --- a/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp +++ b/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP -#define SHARE_VM_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP +#pragma once #include "gc/parallel/psVirtualspace.hpp" @@ -42,5 +41,3 @@ size_t expand_into(PSVirtualSpace* space, size_t bytes); void release(); }; -#endif // SHARE_VM_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP - diff --git a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp --- a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp +++ b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP -#define SHARE_VM_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP +#pragma once #include "gc/parallel/gcAdaptivePolicyCounters.hpp" #include "gc/parallel/psAdaptiveSizePolicy.hpp" @@ -207,5 +206,3 @@ return GCPolicyCounters::PSGCAdaptivePolicyCountersKind; } }; - -#endif // SHARE_VM_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP diff --git a/src/hotspot/share/gc/parallel/psGenerationCounters.hpp b/src/hotspot/share/gc/parallel/psGenerationCounters.hpp --- a/src/hotspot/share/gc/parallel/psGenerationCounters.hpp +++ b/src/hotspot/share/gc/parallel/psGenerationCounters.hpp @@ -23,8 +23,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP -#define SHARE_VM_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP +#pragma once #include "gc/parallel/psVirtualspace.hpp" #include "gc/shared/generationCounters.hpp" @@ -48,5 +47,3 @@ _current_size->set_value(_ps_virtual_space->committed_size()); } }; - -#endif // SHARE_VM_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP diff --git a/src/hotspot/share/gc/parallel/psMarkSweep.hpp b/src/hotspot/share/gc/parallel/psMarkSweep.hpp --- a/src/hotspot/share/gc/parallel/psMarkSweep.hpp +++ b/src/hotspot/share/gc/parallel/psMarkSweep.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSMARKSWEEP_HPP -#define SHARE_VM_GC_PARALLEL_PSMARKSWEEP_HPP +#pragma once #include "gc/serial/markSweep.hpp" #include "gc/shared/collectorCounters.hpp" @@ -85,5 +84,3 @@ // Time since last full gc (in milliseconds) static jlong millis_since_last_gc(); }; - -#endif // SHARE_VM_GC_PARALLEL_PSMARKSWEEP_HPP diff --git a/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp b/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp --- a/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp +++ b/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP -#define SHARE_VM_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP +#pragma once #include "gc/parallel/mutableSpace.hpp" @@ -77,5 +76,3 @@ void precompact(); void compact(bool mangle_free_space); }; - -#endif // SHARE_VM_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP diff --git a/src/hotspot/share/gc/parallel/psMarkSweepProxy.hpp b/src/hotspot/share/gc/parallel/psMarkSweepProxy.hpp --- a/src/hotspot/share/gc/parallel/psMarkSweepProxy.hpp +++ b/src/hotspot/share/gc/parallel/psMarkSweepProxy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_PARALLEL_PSMARKSWEEPPROXY_HPP -#define SHARE_GC_PARALLEL_PSMARKSWEEPPROXY_HPP +#pragma once #include "utilities/macros.hpp" #if INCLUDE_SERIALGC @@ -49,5 +48,3 @@ inline uint total_invocations() { fatal("Serial GC excluded from build"); return 0u; } }; #endif - -#endif // SHARE_GC_PARALLEL_PSMARKSWEEPPROXY_HPP diff --git a/src/hotspot/share/gc/parallel/psMemoryPool.hpp b/src/hotspot/share/gc/parallel/psMemoryPool.hpp --- a/src/hotspot/share/gc/parallel/psMemoryPool.hpp +++ b/src/hotspot/share/gc/parallel/psMemoryPool.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_PSMEMORYPOOL_HPP -#define SHARE_VM_SERVICES_PSMEMORYPOOL_HPP +#pragma once #include "gc/parallel/mutableSpace.hpp" #include "gc/parallel/psOldGen.hpp" @@ -85,5 +84,3 @@ return _young_gen->from_space()->capacity_in_bytes(); } }; - -#endif // SHARE_VM_SERVICES_PSMEMORYPOOL_HPP diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp --- a/src/hotspot/share/gc/parallel/psOldGen.hpp +++ b/src/hotspot/share/gc/parallel/psOldGen.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSOLDGEN_HPP -#define SHARE_VM_GC_PARALLEL_PSOLDGEN_HPP +#pragma once #include "gc/parallel/mutableSpace.hpp" #include "gc/parallel/objectStartArray.hpp" @@ -222,5 +221,3 @@ // Save the tops of all spaces for later use during mangling. void record_spaces_top() PRODUCT_RETURN; }; - -#endif // SHARE_VM_GC_PARALLEL_PSOLDGEN_HPP diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp --- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_HPP -#define SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_HPP +#pragma once #include "gc/parallel/mutableSpace.hpp" #include "gc/parallel/objectStartArray.hpp" @@ -1300,5 +1299,3 @@ private: ObjectStartArray* const _start_array; }; - -#endif // SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_HPP diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp --- a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP -#define SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP +#pragma once #include "gc/parallel/parallelScavengeHeap.hpp" #include "gc/parallel/parMarkBitMap.inline.hpp" @@ -140,5 +139,3 @@ private: ParCompactionManager* _cm; }; - -#endif // SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP diff --git a/src/hotspot/share/gc/parallel/psPromotionLAB.hpp b/src/hotspot/share/gc/parallel/psPromotionLAB.hpp --- a/src/hotspot/share/gc/parallel/psPromotionLAB.hpp +++ b/src/hotspot/share/gc/parallel/psPromotionLAB.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_HPP -#define SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_HPP +#pragma once #include "gc/parallel/objectStartArray.hpp" #include "gc/shared/collectedHeap.hpp" @@ -133,5 +132,3 @@ debug_only(virtual bool lab_is_valid(MemRegion lab)); }; - -#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_HPP diff --git a/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp --- a/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp +++ b/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP -#define SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP +#pragma once #include "gc/parallel/psPromotionLAB.hpp" #include "gc/shared/collectedHeap.inline.hpp" @@ -49,5 +48,3 @@ return NULL; } } - -#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.hpp --- a/src/hotspot/share/gc/parallel/psPromotionManager.hpp +++ b/src/hotspot/share/gc/parallel/psPromotionManager.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_HPP -#define SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_HPP +#pragma once #include "gc/parallel/psPromotionLAB.hpp" #include "gc/shared/copyFailedInfo.hpp" @@ -211,5 +210,3 @@ void push_contents(oop obj); }; - -#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_HPP diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp --- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp +++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP -#define SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP +#pragma once #include "gc/parallel/parallelScavengeHeap.hpp" #include "gc/parallel/parMarkBitMap.inline.hpp" @@ -374,5 +373,3 @@ } } #endif // TASKQUEUE_STATS - -#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP diff --git a/src/hotspot/share/gc/parallel/psScavenge.hpp b/src/hotspot/share/gc/parallel/psScavenge.hpp --- a/src/hotspot/share/gc/parallel/psScavenge.hpp +++ b/src/hotspot/share/gc/parallel/psScavenge.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSSCAVENGE_HPP -#define SHARE_VM_GC_PARALLEL_PSSCAVENGE_HPP +#pragma once #include "gc/parallel/psCardTable.hpp" #include "gc/parallel/psVirtualspace.hpp" @@ -156,5 +155,3 @@ return o >= _young_generation_boundary; } }; - -#endif // SHARE_VM_GC_PARALLEL_PSSCAVENGE_HPP diff --git a/src/hotspot/share/gc/parallel/psScavenge.inline.hpp b/src/hotspot/share/gc/parallel/psScavenge.inline.hpp --- a/src/hotspot/share/gc/parallel/psScavenge.inline.hpp +++ b/src/hotspot/share/gc/parallel/psScavenge.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP -#define SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP +#pragma once #include "gc/parallel/parallelScavengeHeap.hpp" #include "gc/parallel/psScavenge.hpp" @@ -63,5 +62,3 @@ } return should_scavenge(p); } - -#endif // SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP diff --git a/src/hotspot/share/gc/parallel/psTasks.hpp b/src/hotspot/share/gc/parallel/psTasks.hpp --- a/src/hotspot/share/gc/parallel/psTasks.hpp +++ b/src/hotspot/share/gc/parallel/psTasks.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSTASKS_HPP -#define SHARE_VM_GC_PARALLEL_PSTASKS_HPP +#pragma once #include "utilities/growableArray.hpp" @@ -176,5 +175,3 @@ virtual void do_it(GCTaskManager* manager, uint which); }; - -#endif // SHARE_VM_GC_PARALLEL_PSTASKS_HPP diff --git a/src/hotspot/share/gc/parallel/psVMOperations.hpp b/src/hotspot/share/gc/parallel/psVMOperations.hpp --- a/src/hotspot/share/gc/parallel/psVMOperations.hpp +++ b/src/hotspot/share/gc/parallel/psVMOperations.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSVMOPERATIONS_HPP -#define SHARE_VM_GC_PARALLEL_PSVMOPERATIONS_HPP +#pragma once #include "gc/parallel/parallelScavengeHeap.hpp" #include "gc/shared/gcCause.hpp" @@ -45,5 +44,3 @@ virtual VMOp_Type type() const { return VMOp_ParallelGCSystemGC; } virtual void doit(); }; - -#endif // SHARE_VM_GC_PARALLEL_PSVMOPERATIONS_HPP diff --git a/src/hotspot/share/gc/parallel/psVirtualspace.hpp b/src/hotspot/share/gc/parallel/psVirtualspace.hpp --- a/src/hotspot/share/gc/parallel/psVirtualspace.hpp +++ b/src/hotspot/share/gc/parallel/psVirtualspace.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP -#define SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/virtualspace.hpp" @@ -178,5 +177,3 @@ _committed_low_addr = low_addr; _committed_high_addr = high_addr; } - -#endif // SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP diff --git a/src/hotspot/share/gc/parallel/psYoungGen.hpp b/src/hotspot/share/gc/parallel/psYoungGen.hpp --- a/src/hotspot/share/gc/parallel/psYoungGen.hpp +++ b/src/hotspot/share/gc/parallel/psYoungGen.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_PSYOUNGGEN_HPP -#define SHARE_VM_GC_PARALLEL_PSYOUNGGEN_HPP +#pragma once #include "gc/parallel/mutableSpace.hpp" #include "gc/parallel/objectStartArray.hpp" @@ -196,5 +195,3 @@ void record_spaces_top() PRODUCT_RETURN; }; - -#endif // SHARE_VM_GC_PARALLEL_PSYOUNGGEN_HPP diff --git a/src/hotspot/share/gc/parallel/spaceCounters.hpp b/src/hotspot/share/gc/parallel/spaceCounters.hpp --- a/src/hotspot/share/gc/parallel/spaceCounters.hpp +++ b/src/hotspot/share/gc/parallel/spaceCounters.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_SPACECOUNTERS_HPP -#define SHARE_VM_GC_PARALLEL_SPACECOUNTERS_HPP +#pragma once #include "gc/parallel/immutableSpace.hpp" #include "gc/parallel/mutableSpace.hpp" @@ -82,5 +81,3 @@ return _m->used_in_bytes(); } }; - -#endif // SHARE_VM_GC_PARALLEL_SPACECOUNTERS_HPP diff --git a/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp b/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp --- a/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp +++ b/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP -#define SHARE_VM_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP +#pragma once #include "gc/parallel/asPSOldGen.hpp" #include "gc/parallel/asPSYoungGen.hpp" @@ -107,5 +106,3 @@ #define VM_INT_CONSTANTS_PARALLELGC(declare_constant, \ declare_constant_with_value) - -#endif // SHARE_VM_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP diff --git a/src/hotspot/share/gc/serial/cSpaceCounters.hpp b/src/hotspot/share/gc/serial/cSpaceCounters.hpp --- a/src/hotspot/share/gc/serial/cSpaceCounters.hpp +++ b/src/hotspot/share/gc/serial/cSpaceCounters.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SERIAL_CSPACECOUNTERS_HPP -#define SHARE_VM_GC_SERIAL_CSPACECOUNTERS_HPP +#pragma once #include "gc/shared/generationCounters.hpp" #include "gc/shared/space.hpp" @@ -70,5 +69,3 @@ jlong take_sample(); }; - -#endif // SHARE_VM_GC_SERIAL_CSPACECOUNTERS_HPP diff --git a/src/hotspot/share/gc/serial/defNewGeneration.hpp b/src/hotspot/share/gc/serial/defNewGeneration.hpp --- a/src/hotspot/share/gc/serial/defNewGeneration.hpp +++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SERIAL_DEFNEWGENERATION_HPP -#define SHARE_VM_GC_SERIAL_DEFNEWGENERATION_HPP +#pragma once #include "gc/serial/cSpaceCounters.hpp" #include "gc/shared/ageTable.hpp" @@ -345,5 +344,3 @@ // Scavenge support void swap_spaces(); }; - -#endif // SHARE_VM_GC_SERIAL_DEFNEWGENERATION_HPP diff --git a/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp b/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp --- a/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp +++ b/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP -#define SHARE_VM_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP +#pragma once #include "gc/serial/defNewGeneration.hpp" #include "gc/shared/cardTableRS.hpp" @@ -97,5 +96,3 @@ cl->reset_generation(); save_marks(); } - -#endif // SHARE_VM_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP diff --git a/src/hotspot/share/gc/serial/genMarkSweep.hpp b/src/hotspot/share/gc/serial/genMarkSweep.hpp --- a/src/hotspot/share/gc/serial/genMarkSweep.hpp +++ b/src/hotspot/share/gc/serial/genMarkSweep.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SERIAL_GENMARKSWEEP_HPP -#define SHARE_VM_GC_SERIAL_GENMARKSWEEP_HPP +#pragma once #include "gc/serial/markSweep.hpp" @@ -47,5 +46,3 @@ static void allocate_stacks(); static void deallocate_stacks(); }; - -#endif // SHARE_VM_GC_SERIAL_GENMARKSWEEP_HPP diff --git a/src/hotspot/share/gc/serial/markSweep.hpp b/src/hotspot/share/gc/serial/markSweep.hpp --- a/src/hotspot/share/gc/serial/markSweep.hpp +++ b/src/hotspot/share/gc/serial/markSweep.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SERIAL_MARKSWEEP_HPP -#define SHARE_VM_GC_SERIAL_MARKSWEEP_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "gc/shared/genOopClosures.hpp" @@ -210,5 +209,3 @@ void adjust_pointer(); void restore(); }; - -#endif // SHARE_VM_GC_SERIAL_MARKSWEEP_HPP diff --git a/src/hotspot/share/gc/serial/markSweep.inline.hpp b/src/hotspot/share/gc/serial/markSweep.inline.hpp --- a/src/hotspot/share/gc/serial/markSweep.inline.hpp +++ b/src/hotspot/share/gc/serial/markSweep.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP -#define SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP +#pragma once #include "classfile/classLoaderData.inline.hpp" #include "gc/serial/markSweep.hpp" @@ -103,5 +102,3 @@ inline int MarkSweep::adjust_pointers(oop obj) { return obj->oop_iterate_size(&MarkSweep::adjust_pointer_closure); } - -#endif // SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP diff --git a/src/hotspot/share/gc/serial/serialArguments.hpp b/src/hotspot/share/gc/serial/serialArguments.hpp --- a/src/hotspot/share/gc/serial/serialArguments.hpp +++ b/src/hotspot/share/gc/serial/serialArguments.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SERIAL_SERIALARGUMENTS_HPP -#define SHARE_GC_SERIAL_SERIALARGUMENTS_HPP +#pragma once #include "gc/shared/gcArguments.hpp" @@ -34,5 +33,3 @@ virtual size_t conservative_max_heap_alignment(); virtual CollectedHeap* create_heap(); }; - -#endif // SHARE_GC_SERIAL_SERIALARGUMENTS_HPP diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp --- a/src/hotspot/share/gc/serial/serialHeap.hpp +++ b/src/hotspot/share/gc/serial/serialHeap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SERIAL_SERIALHEAP_HPP -#define SHARE_VM_GC_SERIAL_SERIALHEAP_HPP +#pragma once #include "gc/serial/defNewGeneration.hpp" #include "gc/serial/tenuredGeneration.hpp" @@ -82,5 +81,3 @@ void oop_since_save_marks_iterate(OopClosureType1* cur, OopClosureType2* older); }; - -#endif // SHARE_VM_GC_CMS_CMSHEAP_HPP diff --git a/src/hotspot/share/gc/serial/serialHeap.inline.hpp b/src/hotspot/share/gc/serial/serialHeap.inline.hpp --- a/src/hotspot/share/gc/serial/serialHeap.inline.hpp +++ b/src/hotspot/share/gc/serial/serialHeap.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SERIAL_SERIALHEAP_INLINE_HPP -#define SHARE_GC_SERIAL_SERIALHEAP_INLINE_HPP +#pragma once #include "gc/serial/defNewGeneration.inline.hpp" #include "gc/serial/serialHeap.hpp" @@ -35,5 +34,3 @@ young_gen()->oop_since_save_marks_iterate(cur); old_gen()->oop_since_save_marks_iterate(older); } - -#endif // SHARE_GC_SERIAL_SERIALHEAP_INLINE_HPP diff --git a/src/hotspot/share/gc/serial/serial_globals.hpp b/src/hotspot/share/gc/serial/serial_globals.hpp --- a/src/hotspot/share/gc/serial/serial_globals.hpp +++ b/src/hotspot/share/gc/serial/serial_globals.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SERIAL_SERIAL_GLOBALS_HPP -#define SHARE_GC_SERIAL_SERIAL_GLOBALS_HPP +#pragma once #define GC_SERIAL_FLAGS(develop, \ develop_pd, \ @@ -39,5 +38,3 @@ range, \ constraint, \ writeable) - -#endif // SHARE_GC_SERIAL_SERIAL_GLOBALS_HPP diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp --- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp +++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SERIAL_TENUREDGENERATION_HPP -#define SHARE_VM_GC_SERIAL_TENUREDGENERATION_HPP +#pragma once #include "gc/serial/cSpaceCounters.hpp" #include "gc/shared/cardGeneration.hpp" @@ -120,5 +119,3 @@ virtual void verify(); virtual void print_on(outputStream* st) const; }; - -#endif // SHARE_VM_GC_SERIAL_TENUREDGENERATION_HPP diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp --- a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp +++ b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SERIAL_TENUREDGENERATION_INLINE_HPP -#define SHARE_VM_GC_SERIAL_TENUREDGENERATION_INLINE_HPP +#pragma once #include "gc/serial/tenuredGeneration.hpp" #include "gc/shared/space.inline.hpp" @@ -60,5 +59,3 @@ blk->reset_generation(); save_marks(); } - -#endif // SHARE_VM_GC_SERIAL_TENUREDGENERATION_INLINE_HPP diff --git a/src/hotspot/share/gc/serial/vmStructs_serial.hpp b/src/hotspot/share/gc/serial/vmStructs_serial.hpp --- a/src/hotspot/share/gc/serial/vmStructs_serial.hpp +++ b/src/hotspot/share/gc/serial/vmStructs_serial.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SERIAL_VMSTRUCTS_HPP -#define SHARE_GC_SERIAL_VMSTRUCTS_HPP +#pragma once #include "gc/serial/serialHeap.hpp" #include "gc/serial/tenuredGeneration.hpp" @@ -54,5 +53,3 @@ #define VM_INT_CONSTANTS_SERIALGC(declare_constant, \ declare_constant_with_value) - -#endif // SHARE_GC_SERIAL_VMSTRUCTS_SERIAL_HPP diff --git a/src/hotspot/share/gc/shared/accessBarrierSupport.hpp b/src/hotspot/share/gc/shared/accessBarrierSupport.hpp --- a/src/hotspot/share/gc/shared/accessBarrierSupport.hpp +++ b/src/hotspot/share/gc/shared/accessBarrierSupport.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_HPP -#define SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/access.hpp" @@ -40,5 +39,3 @@ template static DecoratorSet resolve_possibly_unknown_oop_ref_strength(oop base, ptrdiff_t offset); }; - -#endif // SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_HPP diff --git a/src/hotspot/share/gc/shared/accessBarrierSupport.inline.hpp b/src/hotspot/share/gc/shared/accessBarrierSupport.inline.hpp --- a/src/hotspot/share/gc/shared/accessBarrierSupport.inline.hpp +++ b/src/hotspot/share/gc/shared/accessBarrierSupport.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP -#define SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP +#pragma once #include "gc/shared/accessBarrierSupport.hpp" @@ -35,5 +34,3 @@ return resolve_unknown_oop_ref_strength(decorators, base, offset); } } - -#endif // SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp b/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp --- a/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp +++ b/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_ADAPTIVESIZEPOLICY_HPP -#define SHARE_VM_GC_SHARED_ADAPTIVESIZEPOLICY_HPP +#pragma once #include "gc/shared/gcCause.hpp" #include "gc/shared/gcUtil.hpp" @@ -472,5 +471,3 @@ virtual bool print() const; void print_tenuring_threshold(uint new_tenuring_threshold) const; }; - -#endif // SHARE_VM_GC_SHARED_ADAPTIVESIZEPOLICY_HPP diff --git a/src/hotspot/share/gc/shared/ageTable.hpp b/src/hotspot/share/gc/shared/ageTable.hpp --- a/src/hotspot/share/gc/shared/ageTable.hpp +++ b/src/hotspot/share/gc/shared/ageTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_AGETABLE_HPP -#define SHARE_VM_GC_SHARED_AGETABLE_HPP +#pragma once #include "oops/markOop.hpp" #include "oops/oop.hpp" @@ -73,5 +72,3 @@ PerfVariable* _perf_sizes[table_size]; }; - -#endif // SHARE_VM_GC_SHARED_AGETABLE_HPP diff --git a/src/hotspot/share/gc/shared/ageTable.inline.hpp b/src/hotspot/share/gc/shared/ageTable.inline.hpp --- a/src/hotspot/share/gc/shared/ageTable.inline.hpp +++ b/src/hotspot/share/gc/shared/ageTable.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_AGETABLE_INLINE_HPP -#define SHARE_VM_GC_SHARED_AGETABLE_INLINE_HPP +#pragma once #include "gc/shared/ageTable.hpp" #include "oops/oop.inline.hpp" @@ -32,5 +31,3 @@ void AgeTable::add(oop p, size_t oop_size) { add(p->age(), oop_size); } - -#endif // SHARE_VM_GC_SHARED_AGETABLE_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/ageTableTracer.hpp b/src/hotspot/share/gc/shared/ageTableTracer.hpp --- a/src/hotspot/share/gc/shared/ageTableTracer.hpp +++ b/src/hotspot/share/gc/shared/ageTableTracer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_AGETABLETRACER_HPP -#define SHARE_VM_GC_SHARED_AGETABLETRACER_HPP +#pragma once #include "memory/allocation.hpp" @@ -32,5 +31,3 @@ static void send_tenuring_distribution_event(uint age, size_t size); static bool is_tenuring_distribution_event_enabled(); }; - -#endif // SHARE_VM_GC_SHARED_AGETABLETRACER_HPP diff --git a/src/hotspot/share/gc/shared/allocTracer.hpp b/src/hotspot/share/gc/shared/allocTracer.hpp --- a/src/hotspot/share/gc/shared/allocTracer.hpp +++ b/src/hotspot/share/gc/shared/allocTracer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_ALLOCTRACER_HPP -#define SHARE_VM_GC_SHARED_ALLOCTRACER_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/handles.hpp" @@ -34,5 +33,3 @@ static void send_allocation_in_new_tlab(Klass* klass, HeapWord* obj, size_t tlab_size, size_t alloc_size, Thread* thread); static void send_allocation_requiring_gc_event(size_t size, uint gcId); }; - -#endif // SHARE_VM_GC_SHARED_ALLOCTRACER_HPP diff --git a/src/hotspot/share/gc/shared/barrierSet.hpp b/src/hotspot/share/gc/shared/barrierSet.hpp --- a/src/hotspot/share/gc/shared/barrierSet.hpp +++ b/src/hotspot/share/gc/shared/barrierSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_BARRIERSET_HPP -#define SHARE_VM_GC_SHARED_BARRIERSET_HPP +#pragma once #include "gc/shared/barrierSetConfig.hpp" #include "memory/memRegion.hpp" @@ -324,5 +323,3 @@ assert(bs->is_a(BarrierSet::GetName::value), "wrong type of barrier set"); return static_cast(bs); } - -#endif // SHARE_VM_GC_SHARED_BARRIERSET_HPP diff --git a/src/hotspot/share/gc/shared/barrierSetAssembler.hpp b/src/hotspot/share/gc/shared/barrierSetAssembler.hpp --- a/src/hotspot/share/gc/shared/barrierSetAssembler.hpp +++ b/src/hotspot/share/gc/shared/barrierSetAssembler.hpp @@ -22,11 +22,8 @@ * */ -#ifndef SHARE_GC_SHARED_BARRIERSETASSEMBLER_HPP -#define SHARE_GC_SHARED_BARRIERSETASSEMBLER_HPP +#pragma once #include "utilities/macros.hpp" #include CPU_HEADER(gc/shared/barrierSetAssembler) - -#endif // SHARE_GC_SHARED_BARRIERSETASSEMBLER_HPP diff --git a/src/hotspot/share/gc/shared/barrierSetConfig.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.hpp --- a/src/hotspot/share/gc/shared/barrierSetConfig.hpp +++ b/src/hotspot/share/gc/shared/barrierSetConfig.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP -#define SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP +#pragma once #include "utilities/macros.hpp" @@ -58,5 +57,3 @@ #endif #define BT_BUILDTIME_DECORATORS (ACCESS_PRIMITIVE_SUPPORT | ACCESS_TO_SPACE_INVARIANT_SUPPORT) - -#endif // SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP diff --git a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp --- a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp +++ b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP -#define SHARE_VM_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP +#pragma once #include "gc/shared/barrierSetConfig.hpp" @@ -42,5 +41,3 @@ #if INCLUDE_ZGC #include "gc/z/zBarrierSet.inline.hpp" #endif - -#endif // SHARE_VM_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/barrierSetNMethod.hpp b/src/hotspot/share/gc/shared/barrierSetNMethod.hpp --- a/src/hotspot/share/gc/shared/barrierSetNMethod.hpp +++ b/src/hotspot/share/gc/shared/barrierSetNMethod.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_CODE_NMETHOD_BARRIER_HPP -#define SHARE_CODE_NMETHOD_BARRIER_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -47,6 +46,3 @@ bool is_armed(nmethod* nm); void disarm(nmethod* nm); }; - - -#endif // SHARE_CODE_NMETHOD_BARRIER_HPP diff --git a/src/hotspot/share/gc/shared/blockOffsetTable.hpp b/src/hotspot/share/gc/shared/blockOffsetTable.hpp --- a/src/hotspot/share/gc/shared/blockOffsetTable.hpp +++ b/src/hotspot/share/gc/shared/blockOffsetTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_HPP -#define SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_HPP +#pragma once #include "gc/shared/memset_with_concurrent_readers.hpp" #include "memory/allocation.hpp" @@ -544,5 +543,3 @@ // Debugging support virtual size_t last_active_index() const; }; - -#endif // SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_HPP diff --git a/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp b/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp --- a/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp +++ b/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP -#define SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP +#pragma once #include "gc/shared/blockOffsetTable.hpp" #include "gc/shared/space.hpp" @@ -95,5 +94,3 @@ } } } - -#endif // SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp b/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp --- a/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp +++ b/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_C1_BARRIERSETC1_HPP -#define SHARE_GC_SHARED_C1_BARRIERSETC1_HPP +#pragma once #include "c1/c1_Decorators.hpp" #include "c1/c1_LIRGenerator.hpp" @@ -138,5 +137,3 @@ virtual void generate_c1_runtime_stubs(BufferBlob* buffer_blob) {} }; - -#endif // SHARE_GC_SHARED_C1_BARRIERSETC1_HPP diff --git a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.hpp b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.hpp --- a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.hpp +++ b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_C1_CARDTABLEBARRIERSETC1_HPP -#define SHARE_GC_SHARED_C1_CARDTABLEBARRIERSETC1_HPP +#pragma once #include "gc/shared/c1/modRefBarrierSetC1.hpp" @@ -31,5 +30,3 @@ protected: virtual void post_barrier(LIRAccess& access, LIR_OprDesc* addr, LIR_OprDesc* new_val); }; - -#endif // SHARE_GC_SHARED_C1_CARDTABLEBARRIERSETC1_HPP diff --git a/src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.hpp b/src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.hpp --- a/src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.hpp +++ b/src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_C1_MODREFBARRIERSETC1_HPP -#define SHARE_GC_SHARED_C1_MODREFBARRIERSETC1_HPP +#pragma once #include "gc/shared/c1/barrierSetC1.hpp" @@ -46,5 +45,3 @@ virtual LIR_Opr atomic_xchg_at_resolved(LIRAccess& access, LIRItem& value); }; - -#endif // SHARE_GC_SHARED_C1_MODREFBARRIERSETC1_HPP diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp --- a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp +++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_C2_BARRIERSETC2_HPP -#define SHARE_GC_SHARED_C2_BARRIERSETC2_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/accessDecorators.hpp" @@ -317,5 +316,3 @@ virtual bool build_loop_late_post(PhaseIdealLoop* phase, Node* n) const { return false; } virtual bool sink_node(PhaseIdealLoop* phase, Node* n, Node* x, Node* x_ctrl, Node* n_ctrl) const { return false; } }; - -#endif // SHARE_GC_SHARED_C2_BARRIERSETC2_HPP diff --git a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp --- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp +++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_C2_CARDTABLEBARRIERSETC2_HPP -#define SHARE_GC_SHARED_C2_CARDTABLEBARRIERSETC2_HPP +#pragma once #include "gc/shared/c2/modRefBarrierSetC2.hpp" @@ -49,5 +48,3 @@ bool use_ReduceInitialCardMarks() const; }; - -#endif // SHARE_GC_SHARED_C2_CARDTABLEBARRIERSETC2_HPP diff --git a/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.hpp --- a/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.hpp +++ b/src/hotspot/share/gc/shared/c2/modRefBarrierSetC2.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_C2_MODREFBARRIERSETC2_HPP -#define SHARE_GC_SHARED_C2_MODREFBARRIERSETC2_HPP +#pragma once #include "gc/shared/c2/barrierSetC2.hpp" @@ -60,5 +59,3 @@ Node* new_val, const Type* value_type) const; virtual Node* atomic_xchg_at_resolved(C2AtomicParseAccess& access, Node* new_val, const Type* value_type) const; }; - -#endif // SHARE_GC_SHARED_C2_MODREFBARRIERSETC2_HPP diff --git a/src/hotspot/share/gc/shared/cardGeneration.hpp b/src/hotspot/share/gc/shared/cardGeneration.hpp --- a/src/hotspot/share/gc/shared/cardGeneration.hpp +++ b/src/hotspot/share/gc/shared/cardGeneration.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_CARDGENERATION_HPP -#define SHARE_VM_GC_SHARED_CARDGENERATION_HPP +#pragma once // Class CardGeneration is a generation that is covered by a card table, // and uses a card-size block-offset array to implement block_start. @@ -95,5 +94,3 @@ CompactibleSpace* first_compaction_space() const; }; - -#endif // SHARE_VM_GC_SHARED_CARDGENERATION_HPP diff --git a/src/hotspot/share/gc/shared/cardGeneration.inline.hpp b/src/hotspot/share/gc/shared/cardGeneration.inline.hpp --- a/src/hotspot/share/gc/shared/cardGeneration.inline.hpp +++ b/src/hotspot/share/gc/shared/cardGeneration.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_CARDGENERATION_INLINE_HPP -#define SHARE_VM_GC_SHARED_CARDGENERATION_INLINE_HPP +#pragma once #include "gc/shared/cardGeneration.hpp" #include "gc/shared/space.hpp" @@ -51,5 +50,3 @@ inline CompactibleSpace* CardGeneration::first_compaction_space() const { return space(); } - -#endif // SHARE_VM_GC_SHARED_CARDGENERATION_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/cardTable.hpp b/src/hotspot/share/gc/shared/cardTable.hpp --- a/src/hotspot/share/gc/shared/cardTable.hpp +++ b/src/hotspot/share/gc/shared/cardTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_CARDTABLE_HPP -#define SHARE_VM_GC_SHARED_CARDTABLE_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/memRegion.hpp" @@ -262,5 +261,3 @@ void verify_not_dirty_region(MemRegion mr) PRODUCT_RETURN; void verify_dirty_region(MemRegion mr) PRODUCT_RETURN; }; - -#endif // SHARE_VM_GC_SHARED_CARDTABLE_HPP diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp --- a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp +++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_HPP -#define SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_HPP +#pragma once #include "gc/shared/modRefBarrierSet.hpp" #include "utilities/align.hpp" @@ -121,5 +120,3 @@ struct BarrierSet::GetType { typedef ::CardTableBarrierSet type; }; - -#endif // SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_HPP diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp --- a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP -#define SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP +#pragma once #include "gc/shared/cardTableBarrierSet.hpp" #include "gc/shared/cardTable.hpp" @@ -39,5 +38,3 @@ *byte = CardTable::dirty_card_val(); } } - -#endif // SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSetAssembler.hpp b/src/hotspot/share/gc/shared/cardTableBarrierSetAssembler.hpp --- a/src/hotspot/share/gc/shared/cardTableBarrierSetAssembler.hpp +++ b/src/hotspot/share/gc/shared/cardTableBarrierSetAssembler.hpp @@ -22,11 +22,8 @@ * */ -#ifndef SHARE_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_HPP -#define SHARE_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_HPP +#pragma once #include "utilities/macros.hpp" #include CPU_HEADER(gc/shared/cardTableBarrierSetAssembler) - -#endif // SHARE_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_HPP diff --git a/src/hotspot/share/gc/shared/cardTableRS.hpp b/src/hotspot/share/gc/shared/cardTableRS.hpp --- a/src/hotspot/share/gc/shared/cardTableRS.hpp +++ b/src/hotspot/share/gc/shared/cardTableRS.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_CARDTABLERS_HPP -#define SHARE_VM_GC_SHARED_CARDTABLERS_HPP +#pragma once #include "gc/shared/cardTable.hpp" #include "memory/memRegion.hpp" @@ -213,5 +212,3 @@ ClearNoncleanCardWrapper(DirtyCardToOopClosure* dirty_card_closure, CardTableRS* ct, bool is_par); void do_MemRegion(MemRegion mr); }; - -#endif // SHARE_VM_GC_SHARED_CARDTABLERS_HPP diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp --- a/src/hotspot/share/gc/shared/collectedHeap.hpp +++ b/src/hotspot/share/gc/shared/collectedHeap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_COLLECTEDHEAP_HPP -#define SHARE_VM_GC_SHARED_COLLECTEDHEAP_HPP +#pragma once #include "gc/shared/gcCause.hpp" #include "gc/shared/gcWhen.hpp" @@ -624,5 +623,3 @@ _heap->set_gc_cause(_previous_cause); } }; - -#endif // SHARE_VM_GC_SHARED_COLLECTEDHEAP_HPP diff --git a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp --- a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp +++ b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP -#define SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "oops/oop.inline.hpp" @@ -65,5 +64,3 @@ return NULL; } } - -#endif // SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/collectorCounters.hpp b/src/hotspot/share/gc/shared/collectorCounters.hpp --- a/src/hotspot/share/gc/shared/collectorCounters.hpp +++ b/src/hotspot/share/gc/shared/collectorCounters.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_COLLECTORCOUNTERS_HPP -#define SHARE_VM_GC_SHARED_COLLECTORCOUNTERS_HPP +#pragma once #include "runtime/perfData.hpp" @@ -72,5 +71,3 @@ ~TraceCollectorStats(); }; - -#endif // SHARE_VM_GC_SHARED_COLLECTORCOUNTERS_HPP diff --git a/src/hotspot/share/gc/shared/collectorPolicy.hpp b/src/hotspot/share/gc/shared/collectorPolicy.hpp --- a/src/hotspot/share/gc/shared/collectorPolicy.hpp +++ b/src/hotspot/share/gc/shared/collectorPolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_COLLECTORPOLICY_HPP -#define SHARE_VM_GC_SHARED_COLLECTORPOLICY_HPP +#pragma once #include "gc/shared/barrierSet.hpp" #include "gc/shared/cardTableRS.hpp" @@ -145,5 +144,3 @@ public: MarkSweepPolicy() {} }; - -#endif // SHARE_VM_GC_SHARED_COLLECTORPOLICY_HPP diff --git a/src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp b/src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp --- a/src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp +++ b/src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_CONCURRENTGCPHASEMANAGER_HPP -#define SHARE_VM_GC_CONCURRENTGCPHASEMANAGER_HPP +#pragma once #include "memory/allocation.hpp" @@ -133,5 +132,3 @@ bool wait_when_requested_impl() const; }; - -#endif // include guard diff --git a/src/hotspot/share/gc/shared/concurrentGCThread.hpp b/src/hotspot/share/gc/shared/concurrentGCThread.hpp --- a/src/hotspot/share/gc/shared/concurrentGCThread.hpp +++ b/src/hotspot/share/gc/shared/concurrentGCThread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_CONCURRENTGCTHREAD_HPP -#define SHARE_VM_GC_SHARED_CONCURRENTGCTHREAD_HPP +#pragma once #include "runtime/thread.hpp" #include "utilities/macros.hpp" @@ -69,5 +68,3 @@ bool should_terminate() { return _should_terminate; } bool has_terminated() { return _has_terminated; } }; - -#endif // SHARE_VM_GC_SHARED_CONCURRENTGCTHREAD_HPP diff --git a/src/hotspot/share/gc/shared/copyFailedInfo.hpp b/src/hotspot/share/gc/shared/copyFailedInfo.hpp --- a/src/hotspot/share/gc/shared/copyFailedInfo.hpp +++ b/src/hotspot/share/gc/shared/copyFailedInfo.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP -#define SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP +#pragma once #include "jfr/support/jfrThreadId.hpp" #include "runtime/thread.hpp" @@ -89,5 +88,3 @@ }; class EvacuationFailedInfo : public CopyFailedInfo {}; - -#endif // SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP diff --git a/src/hotspot/share/gc/shared/gcArguments.hpp b/src/hotspot/share/gc/shared/gcArguments.hpp --- a/src/hotspot/share/gc/shared/gcArguments.hpp +++ b/src/hotspot/share/gc/shared/gcArguments.hpp @@ -23,8 +23,7 @@ * */ -#ifndef SHARE_GC_SHARED_GCARGUMENTS_HPP -#define SHARE_GC_SHARED_GCARGUMENTS_HPP +#pragma once #include "memory/allocation.hpp" @@ -41,5 +40,3 @@ virtual CollectedHeap* create_heap() = 0; static bool check_args_consistency(); }; - -#endif // SHARE_GC_SHARED_GCARGUMENTS_HPP diff --git a/src/hotspot/share/gc/shared/gcBehaviours.hpp b/src/hotspot/share/gc/shared/gcBehaviours.hpp --- a/src/hotspot/share/gc/shared/gcBehaviours.hpp +++ b/src/hotspot/share/gc/shared/gcBehaviours.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_BEHAVIOURS_HPP -#define SHARE_GC_SHARED_BEHAVIOURS_HPP +#pragma once #include "memory/iterator.hpp" #include "oops/oopsHierarchy.hpp" @@ -49,5 +48,3 @@ virtual bool is_unloading(CompiledMethod* cm) const; }; - -#endif // SHARE_GC_SHARED_BEHAVIOURS_HPP diff --git a/src/hotspot/share/gc/shared/gcCause.hpp b/src/hotspot/share/gc/shared/gcCause.hpp --- a/src/hotspot/share/gc/shared/gcCause.hpp +++ b/src/hotspot/share/gc/shared/gcCause.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCCAUSE_HPP -#define SHARE_VM_GC_SHARED_GCCAUSE_HPP +#pragma once #include "memory/allocation.hpp" @@ -136,5 +135,3 @@ // Return a string describing the GCCause. static const char* to_string(GCCause::Cause cause); }; - -#endif // SHARE_VM_GC_SHARED_GCCAUSE_HPP diff --git a/src/hotspot/share/gc/shared/gcConfig.hpp b/src/hotspot/share/gc/shared/gcConfig.hpp --- a/src/hotspot/share/gc/shared/gcConfig.hpp +++ b/src/hotspot/share/gc/shared/gcConfig.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_GCCONFIG_HPP -#define SHARE_GC_SHARED_GCCONFIG_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "memory/allocation.hpp" @@ -54,5 +53,3 @@ static GCArguments* arguments(); }; - -#endif // SHARE_GC_SHARED_GCCONFIG_HPP diff --git a/src/hotspot/share/gc/shared/gcConfiguration.hpp b/src/hotspot/share/gc/shared/gcConfiguration.hpp --- a/src/hotspot/share/gc/shared/gcConfiguration.hpp +++ b/src/hotspot/share/gc/shared/gcConfiguration.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCCONFIGURATION_HPP -#define SHARE_VM_GC_SHARED_GCCONFIGURATION_HPP +#pragma once #include "gc/shared/gcName.hpp" #include "memory/universe.hpp" @@ -76,5 +75,3 @@ uintx min_size() const; intx new_ratio() const; }; - -#endif // SHARE_VM_GC_SHARED_GCCONFIGURATION_HPP diff --git a/src/hotspot/share/gc/shared/gcHeapSummary.hpp b/src/hotspot/share/gc/shared/gcHeapSummary.hpp --- a/src/hotspot/share/gc/shared/gcHeapSummary.hpp +++ b/src/hotspot/share/gc/shared/gcHeapSummary.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP -#define SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/metaspaceChunkFreeListSummary.hpp" @@ -230,5 +229,3 @@ size_t failure_used() const { return _failure_used; } size_t failure_waste() const { return _failure_waste; } }; - -#endif // SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP diff --git a/src/hotspot/share/gc/shared/gcId.hpp b/src/hotspot/share/gc/shared/gcId.hpp --- a/src/hotspot/share/gc/shared/gcId.hpp +++ b/src/hotspot/share/gc/shared/gcId.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCID_HPP -#define SHARE_VM_GC_SHARED_GCID_HPP +#pragma once #include "memory/allocation.hpp" @@ -55,5 +54,3 @@ GCIdMark(uint gc_id); ~GCIdMark(); }; - -#endif // SHARE_VM_GC_SHARED_GCID_HPP diff --git a/src/hotspot/share/gc/shared/gcLocker.hpp b/src/hotspot/share/gc/shared/gcLocker.hpp --- a/src/hotspot/share/gc/shared/gcLocker.hpp +++ b/src/hotspot/share/gc/shared/gcLocker.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCLOCKER_HPP -#define SHARE_VM_GC_SHARED_GCLOCKER_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -144,5 +143,3 @@ static address needs_gc_address() { return (address) &_needs_gc; } }; - -#endif // SHARE_VM_GC_SHARED_GCLOCKER_HPP diff --git a/src/hotspot/share/gc/shared/gcLocker.inline.hpp b/src/hotspot/share/gc/shared/gcLocker.inline.hpp --- a/src/hotspot/share/gc/shared/gcLocker.inline.hpp +++ b/src/hotspot/share/gc/shared/gcLocker.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP -#define SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP +#pragma once #include "gc/shared/gcLocker.hpp" #include "runtime/thread.hpp" @@ -53,5 +52,3 @@ } thread->exit_critical(); } - -#endif // SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/gcName.hpp b/src/hotspot/share/gc/shared/gcName.hpp --- a/src/hotspot/share/gc/shared/gcName.hpp +++ b/src/hotspot/share/gc/shared/gcName.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCNAME_HPP -#define SHARE_VM_GC_SHARED_GCNAME_HPP +#pragma once #include "utilities/debug.hpp" @@ -65,5 +64,3 @@ } } }; - -#endif // SHARE_VM_GC_SHARED_GCNAME_HPP diff --git a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp --- a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp +++ b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCPOLICYCOUNTERS_HPP -#define SHARE_VM_GC_SHARED_GCPOLICYCOUNTERS_HPP +#pragma once #include "runtime/perfData.hpp" @@ -74,5 +73,3 @@ return GCPolicyCounters::GCPolicyCountersKind; } }; - -#endif // SHARE_VM_GC_SHARED_GCPOLICYCOUNTERS_HPP diff --git a/src/hotspot/share/gc/shared/gcStats.hpp b/src/hotspot/share/gc/shared/gcStats.hpp --- a/src/hotspot/share/gc/shared/gcStats.hpp +++ b/src/hotspot/share/gc/shared/gcStats.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCSTATS_HPP -#define SHARE_VM_GC_SHARED_GCSTATS_HPP +#pragma once #include "gc/shared/gcUtil.hpp" @@ -57,5 +56,3 @@ return (size_t)_avg_promoted->padded_average(); } }; - -#endif // SHARE_VM_GC_SHARED_GCSTATS_HPP diff --git a/src/hotspot/share/gc/shared/gcThreadLocalData.hpp b/src/hotspot/share/gc/shared/gcThreadLocalData.hpp --- a/src/hotspot/share/gc/shared/gcThreadLocalData.hpp +++ b/src/hotspot/share/gc/shared/gcThreadLocalData.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_SHARED_GCTHREADLOCALDATA_HPP -#define SHARE_GC_SHARED_GCTHREADLOCALDATA_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -41,5 +40,3 @@ // T, so that field offsets relative to Thread are small, which // often allows for a more compact instruction encoding. typedef uint64_t GCThreadLocalData[18]; // 144 bytes - -#endif // SHARE_GC_SHARED_GCTHREADLOCALDATA_HPP diff --git a/src/hotspot/share/gc/shared/gcTimer.hpp b/src/hotspot/share/gc/shared/gcTimer.hpp --- a/src/hotspot/share/gc/shared/gcTimer.hpp +++ b/src/hotspot/share/gc/shared/gcTimer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCTIMER_HPP -#define SHARE_VM_GC_SHARED_GCTIMER_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/macros.hpp" @@ -182,5 +181,3 @@ virtual bool has_next(); virtual GCPhase* next(); }; - -#endif // SHARE_VM_GC_SHARED_GCTIMER_HPP diff --git a/src/hotspot/share/gc/shared/gcTrace.hpp b/src/hotspot/share/gc/shared/gcTrace.hpp --- a/src/hotspot/share/gc/shared/gcTrace.hpp +++ b/src/hotspot/share/gc/shared/gcTrace.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCTRACE_HPP -#define SHARE_VM_GC_SHARED_GCTRACE_HPP +#pragma once #include "gc/shared/copyFailedInfo.hpp" #include "gc/shared/gcCause.hpp" @@ -308,5 +307,3 @@ G1OldTracer() : OldGCTracer(G1Old) {} void set_gc_cause(GCCause::Cause cause); }; - -#endif // SHARE_VM_GC_SHARED_GCTRACE_HPP diff --git a/src/hotspot/share/gc/shared/gcTraceTime.hpp b/src/hotspot/share/gc/shared/gcTraceTime.hpp --- a/src/hotspot/share/gc/shared/gcTraceTime.hpp +++ b/src/hotspot/share/gc/shared/gcTraceTime.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCTRACETIME_HPP -#define SHARE_VM_GC_SHARED_GCTRACETIME_HPP +#pragma once #include "logging/log.hpp" #include "logging/logHandle.hpp" @@ -85,5 +84,3 @@ ~GCTraceConcTimeImpl(); jlong start_time() { return _start_time; } }; - -#endif // SHARE_VM_GC_SHARED_GCTRACETIME_HPP diff --git a/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp b/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp --- a/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp +++ b/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCTRACETIME_INLINE_HPP -#define SHARE_VM_GC_SHARED_GCTRACETIME_INLINE_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "gc/shared/gcTimer.hpp" @@ -157,5 +156,3 @@ #define GCTraceTime(Level, ...) GCTraceTimeImplWrapper #define GCTraceConcTime(Level, ...) GCTraceConcTimeImpl - -#endif // SHARE_VM_GC_SHARED_GCTRACETIME_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/gcUtil.hpp b/src/hotspot/share/gc/shared/gcUtil.hpp --- a/src/hotspot/share/gc/shared/gcUtil.hpp +++ b/src/hotspot/share/gc/shared/gcUtil.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCUTIL_HPP -#define SHARE_VM_GC_SHARED_GCUTIL_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/timer.hpp" @@ -215,5 +214,3 @@ bool decrement_will_decrease(); bool increment_will_decrease(); }; - -#endif // SHARE_VM_GC_SHARED_GCUTIL_HPP diff --git a/src/hotspot/share/gc/shared/gcUtil.inline.hpp b/src/hotspot/share/gc/shared/gcUtil.inline.hpp --- a/src/hotspot/share/gc/shared/gcUtil.inline.hpp +++ b/src/hotspot/share/gc/shared/gcUtil.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCUTIL_INLINE_HPP -#define SHARE_VM_GC_SHARED_GCUTIL_INLINE_HPP +#pragma once #include "gc/shared/gcUtil.hpp" #include "memory/allocation.inline.hpp" @@ -31,5 +30,3 @@ inline void* AdaptivePaddedAverage::operator new(size_t size) throw() { return CHeapObj::operator new(size); } - -#endif // SHARE_VM_GC_SHARED_GCUTIL_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/gcVMOperations.hpp b/src/hotspot/share/gc/shared/gcVMOperations.hpp --- a/src/hotspot/share/gc/shared/gcVMOperations.hpp +++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCVMOPERATIONS_HPP -#define SHARE_VM_GC_SHARED_GCVMOPERATIONS_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "gc/shared/genCollectedHeap.hpp" @@ -237,5 +236,3 @@ VM_GC_Operation::notify_gc_end(); } }; - -#endif // SHARE_VM_GC_SHARED_GCVMOPERATIONS_HPP diff --git a/src/hotspot/share/gc/shared/gcWhen.hpp b/src/hotspot/share/gc/shared/gcWhen.hpp --- a/src/hotspot/share/gc/shared/gcWhen.hpp +++ b/src/hotspot/share/gc/shared/gcWhen.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GCWHEN_HPP -#define SHARE_VM_GC_SHARED_GCWHEN_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -44,5 +43,3 @@ } } }; - -#endif // SHARE_VM_GC_SHARED_GCWHEN_HPP diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp --- a/src/hotspot/share/gc/shared/gc_globals.hpp +++ b/src/hotspot/share/gc/shared/gc_globals.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_GC_GLOBALS_HPP -#define SHARE_GC_SHARED_GC_GLOBALS_HPP +#pragma once #include "utilities/macros.hpp" #if INCLUDE_CMSGC @@ -843,5 +842,3 @@ "Number of entries we will try to leave on the stack " \ "during parallel gc") \ range(0, max_juint) - -#endif // SHARE_GC_SHARED_GC_GLOBALS_HPP diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.hpp b/src/hotspot/share/gc/shared/genCollectedHeap.hpp --- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp +++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP -#define SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "gc/shared/collectorPolicy.hpp" @@ -504,5 +503,3 @@ // Save the tops of the spaces in all generations void record_gen_tops_before_GC() PRODUCT_RETURN; }; - -#endif // SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP diff --git a/src/hotspot/share/gc/shared/genMemoryPools.hpp b/src/hotspot/share/gc/shared/genMemoryPools.hpp --- a/src/hotspot/share/gc/shared/genMemoryPools.hpp +++ b/src/hotspot/share/gc/shared/genMemoryPools.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GENMEMORYPOOLS_HPP -#define SHARE_VM_GC_SHARED_GENMEMORYPOOLS_HPP +#pragma once #include "services/memoryPool.hpp" @@ -71,5 +70,3 @@ MemoryUsage get_memory_usage(); size_t used_in_bytes(); }; - -#endif // SHARE_VM_GC_SHARED_GENMEMORYPOOLS_HPP diff --git a/src/hotspot/share/gc/shared/genOopClosures.hpp b/src/hotspot/share/gc/shared/genOopClosures.hpp --- a/src/hotspot/share/gc/shared/genOopClosures.hpp +++ b/src/hotspot/share/gc/shared/genOopClosures.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GENOOPCLOSURES_HPP -#define SHARE_VM_GC_SHARED_GENOOPCLOSURES_HPP +#pragma once #include "memory/iterator.hpp" #include "oops/oop.hpp" @@ -187,5 +186,3 @@ }; #endif // INCLUDE_SERIALGC - -#endif // SHARE_VM_GC_SHARED_GENOOPCLOSURES_HPP diff --git a/src/hotspot/share/gc/shared/genOopClosures.inline.hpp b/src/hotspot/share/gc/shared/genOopClosures.inline.hpp --- a/src/hotspot/share/gc/shared/genOopClosures.inline.hpp +++ b/src/hotspot/share/gc/shared/genOopClosures.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GENOOPCLOSURES_INLINE_HPP -#define SHARE_VM_GC_SHARED_GENOOPCLOSURES_INLINE_HPP +#pragma once #include "gc/shared/cardTableRS.hpp" #include "gc/shared/genCollectedHeap.hpp" @@ -170,5 +169,3 @@ inline void ScanWeakRefClosure::do_oop(narrowOop* p) { ScanWeakRefClosure::do_oop_work(p); } #endif // INCLUDE_SERIALGC - -#endif // SHARE_VM_GC_SHARED_GENOOPCLOSURES_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/generation.hpp b/src/hotspot/share/gc/shared/generation.hpp --- a/src/hotspot/share/gc/shared/generation.hpp +++ b/src/hotspot/share/gc/shared/generation.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GENERATION_HPP -#define SHARE_VM_GC_SHARED_GENERATION_HPP +#pragma once #include "gc/shared/collectorCounters.hpp" #include "gc/shared/referenceProcessor.hpp" @@ -552,5 +551,3 @@ } }; - -#endif // SHARE_VM_GC_SHARED_GENERATION_HPP diff --git a/src/hotspot/share/gc/shared/generationCounters.hpp b/src/hotspot/share/gc/shared/generationCounters.hpp --- a/src/hotspot/share/gc/shared/generationCounters.hpp +++ b/src/hotspot/share/gc/shared/generationCounters.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GENERATIONCOUNTERS_HPP -#define SHARE_VM_GC_SHARED_GENERATIONCOUNTERS_HPP +#pragma once #include "memory/virtualspace.hpp" #include "runtime/perfData.hpp" @@ -75,4 +74,3 @@ const char* name_space() const { return _name_space; } }; -#endif // SHARE_VM_GC_SHARED_GENERATIONCOUNTERS_HPP diff --git a/src/hotspot/share/gc/shared/generationSpec.hpp b/src/hotspot/share/gc/shared/generationSpec.hpp --- a/src/hotspot/share/gc/shared/generationSpec.hpp +++ b/src/hotspot/share/gc/shared/generationSpec.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP -#define SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP +#pragma once #include "gc/shared/generation.hpp" #include "utilities/align.hpp" @@ -57,5 +56,3 @@ }; typedef GenerationSpec* GenerationSpecPtr; - -#endif // SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP diff --git a/src/hotspot/share/gc/shared/hSpaceCounters.hpp b/src/hotspot/share/gc/shared/hSpaceCounters.hpp --- a/src/hotspot/share/gc/shared/hSpaceCounters.hpp +++ b/src/hotspot/share/gc/shared/hSpaceCounters.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_HSPACECOUNTERS_HPP -#define SHARE_VM_GC_SHARED_HSPACECOUNTERS_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/perfData.hpp" @@ -65,4 +64,3 @@ const char* name_space() const { return _name_space; } }; -#endif // SHARE_VM_GC_SHARED_HSPACECOUNTERS_HPP diff --git a/src/hotspot/share/gc/shared/isGCActiveMark.hpp b/src/hotspot/share/gc/shared/isGCActiveMark.hpp --- a/src/hotspot/share/gc/shared/isGCActiveMark.hpp +++ b/src/hotspot/share/gc/shared/isGCActiveMark.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP -#define SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "memory/allocation.hpp" @@ -47,5 +46,3 @@ heap->_is_gc_active = false; } }; - -#endif // SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp --- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp +++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_COMMANDLINEFLAGCONSTRAINTSGC_HPP -#define SHARE_GC_SHARED_COMMANDLINEFLAGCONSTRAINTSGC_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -73,5 +72,3 @@ // Internal JVMFlag::Error MaxPLABSizeBounds(const char* name, size_t value, bool verbose); - -#endif // SHARE_GC_SHARED_COMMANDLINEFLAGCONSTRAINTSGC_HPP diff --git a/src/hotspot/share/gc/shared/markBitMap.hpp b/src/hotspot/share/gc/shared/markBitMap.hpp --- a/src/hotspot/share/gc/shared/markBitMap.hpp +++ b/src/hotspot/share/gc/shared/markBitMap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_MARKBITMAP_HPP -#define SHARE_VM_GC_SHARED_MARKBITMAP_HPP +#pragma once #include "memory/memRegion.hpp" #include "oops/oopsHierarchy.hpp" @@ -97,5 +96,3 @@ void clear_range(MemRegion mr) { do_clear(mr, false); } void clear_range_large(MemRegion mr) { do_clear(mr, true); } }; - -#endif // SHARE_VM_GC_SHARED_MARKBITMAP_HPP diff --git a/src/hotspot/share/gc/shared/markBitMap.inline.hpp b/src/hotspot/share/gc/shared/markBitMap.inline.hpp --- a/src/hotspot/share/gc/shared/markBitMap.inline.hpp +++ b/src/hotspot/share/gc/shared/markBitMap.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_MARKBITMAP_INLINE_HPP -#define SHARE_VM_GC_SHARED_MARKBITMAP_INLINE_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "gc/shared/markBitMap.hpp" @@ -68,5 +67,3 @@ inline void MarkBitMap::clear(oop obj) { clear((HeapWord*) obj); } - -#endif // SHARE_VM_GC_SHARED_MARKBITMAP_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/memAllocator.hpp b/src/hotspot/share/gc/shared/memAllocator.hpp --- a/src/hotspot/share/gc/shared/memAllocator.hpp +++ b/src/hotspot/share/gc/shared/memAllocator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_MEM_ALLOCATOR_HPP -#define SHARE_GC_SHARED_MEM_ALLOCATOR_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "memory/memRegion.hpp" @@ -106,5 +105,3 @@ : MemAllocator(klass, word_size, thread) {} virtual oop initialize(HeapWord* mem) const; }; - -#endif // SHARE_GC_SHARED_MEM_ALLOCATOR_HPP diff --git a/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp b/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp --- a/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp +++ b/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SRC_SHARE_VM_GC_SHARED_MEMSETWITHCONCURRENTREADERS_HPP -#define SRC_SHARE_VM_GC_SHARED_MEMSETWITHCONCURRENTREADERS_HPP +#pragma once #include "utilities/macros.hpp" @@ -46,5 +45,3 @@ } #endif // End of target dispatch. - -#endif // SRC_SHARE_VM_GC_SHARED_MEMSETWITHCONCURRENTREADERS_HPP diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp --- a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp +++ b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_MODREFBARRIERSET_HPP -#define SHARE_VM_GC_SHARED_MODREFBARRIERSET_HPP +#pragma once #include "gc/shared/barrierSet.hpp" #include "memory/memRegion.hpp" @@ -108,5 +107,3 @@ struct BarrierSet::GetName { static const BarrierSet::Name value = BarrierSet::ModRef; }; - -#endif // SHARE_VM_GC_SHARED_MODREFBARRIERSET_HPP diff --git a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp --- a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_MODREFBARRIERSET_INLINE_HPP -#define SHARE_VM_GC_SHARED_MODREFBARRIERSET_INLINE_HPP +#pragma once #include "gc/shared/barrierSet.hpp" #include "gc/shared/modRefBarrierSet.hpp" @@ -137,5 +136,3 @@ BarrierSetT *bs = barrier_set_cast(barrier_set()); bs->write_region(MemRegion((HeapWord*)(void*)dst, size)); } - -#endif // SHARE_VM_GC_SHARED_MODREFBARRIERSET_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/modRefBarrierSetAssembler.hpp b/src/hotspot/share/gc/shared/modRefBarrierSetAssembler.hpp --- a/src/hotspot/share/gc/shared/modRefBarrierSetAssembler.hpp +++ b/src/hotspot/share/gc/shared/modRefBarrierSetAssembler.hpp @@ -22,11 +22,8 @@ * */ -#ifndef SHARE_GC_SHARED_MODREFBARRIERSETASSEMBLER_HPP -#define SHARE_GC_SHARED_MODREFBARRIERSETASSEMBLER_HPP +#pragma once #include "utilities/macros.hpp" #include CPU_HEADER(gc/shared/modRefBarrierSetAssembler) - -#endif // SHARE_GC_SHARED_MODREFBARRIERSETASSEMBLER_HPP diff --git a/src/hotspot/share/gc/shared/objectCountEventSender.hpp b/src/hotspot/share/gc/shared/objectCountEventSender.hpp --- a/src/hotspot/share/gc/shared/objectCountEventSender.hpp +++ b/src/hotspot/share/gc/shared/objectCountEventSender.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP -#define SHARE_VM_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP +#pragma once #include "gc/shared/gcTrace.hpp" #include "memory/allocation.hpp" @@ -51,5 +50,3 @@ }; #endif // INCLUDE_SERVICES - -#endif // SHARE_VM_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP diff --git a/src/hotspot/share/gc/shared/oopStorage.hpp b/src/hotspot/share/gc/shared/oopStorage.hpp --- a/src/hotspot/share/gc/shared/oopStorage.hpp +++ b/src/hotspot/share/gc/shared/oopStorage.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_OOPSTORAGE_HPP -#define SHARE_GC_SHARED_OOPSTORAGE_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oop.hpp" @@ -274,5 +273,3 @@ template class SkipNullFn; template static SkipNullFn skip_null_fn(F f); }; - -#endif // include guard diff --git a/src/hotspot/share/gc/shared/oopStorage.inline.hpp b/src/hotspot/share/gc/shared/oopStorage.inline.hpp --- a/src/hotspot/share/gc/shared/oopStorage.inline.hpp +++ b/src/hotspot/share/gc/shared/oopStorage.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_OOPSTORAGE_INLINE_HPP -#define SHARE_GC_SHARED_OOPSTORAGE_INLINE_HPP +#pragma once #include "gc/shared/oopStorage.hpp" #include "metaprogramming/conditional.hpp" @@ -402,5 +401,3 @@ inline void OopStorage::weak_oops_do(IsAliveClosure* is_alive, Closure* cl) { iterate_safepoint(if_alive_fn(is_alive, oop_fn(cl))); } - -#endif // include guard diff --git a/src/hotspot/share/gc/shared/oopStorageParState.hpp b/src/hotspot/share/gc/shared/oopStorageParState.hpp --- a/src/hotspot/share/gc/shared/oopStorageParState.hpp +++ b/src/hotspot/share/gc/shared/oopStorageParState.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_OOPSTORAGEPARSTATE_HPP -#define SHARE_GC_SHARED_OOPSTORAGEPARSTATE_HPP +#pragma once #include "gc/shared/oopStorage.hpp" #include "utilities/macros.hpp" @@ -192,5 +191,3 @@ template void weak_oops_do(IsAliveClosure* is_alive, Closure* cl); }; - -#endif // SHARE_GC_SHARED_OOPSTORAGEPARSTATE_HPP diff --git a/src/hotspot/share/gc/shared/oopStorageParState.inline.hpp b/src/hotspot/share/gc/shared/oopStorageParState.inline.hpp --- a/src/hotspot/share/gc/shared/oopStorageParState.inline.hpp +++ b/src/hotspot/share/gc/shared/oopStorageParState.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_OOPSTORAGEPARSTATE_INLINE_HPP -#define SHARE_GC_SHARED_OOPSTORAGEPARSTATE_INLINE_HPP +#pragma once #include "gc/shared/oopStorage.inline.hpp" #include "gc/shared/oopStorageParState.hpp" @@ -95,5 +94,3 @@ inline void OopStorage::ParState::weak_oops_do(IsAliveClosure* is_alive, Closure* cl) { this->iterate(if_alive_fn(is_alive, oop_fn(cl))); } - -#endif // SHARE_GC_SHARED_OOPSTORAGEPARSTATE_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/owstTaskTerminator.hpp b/src/hotspot/share/gc/shared/owstTaskTerminator.hpp --- a/src/hotspot/share/gc/shared/owstTaskTerminator.hpp +++ b/src/hotspot/share/gc/shared/owstTaskTerminator.hpp @@ -20,8 +20,7 @@ * questions. * */ -#ifndef SHARE_VM_GC_SHARED_OWSTTASKTERMINATOR_HPP -#define SHARE_VM_GC_SHARED_OWSTTASKTERMINATOR_HPP +#pragma once #include "gc/shared/taskqueue.hpp" #include "runtime/mutex.hpp" @@ -74,6 +73,3 @@ */ bool do_spin_master_work(TerminatorTerminator* terminator); }; - - -#endif // SHARE_VM_GC_SHARED_OWSTTASKTERMINATOR_HPP diff --git a/src/hotspot/share/gc/shared/parallelCleaning.hpp b/src/hotspot/share/gc/shared/parallelCleaning.hpp --- a/src/hotspot/share/gc/shared/parallelCleaning.hpp +++ b/src/hotspot/share/gc/shared/parallelCleaning.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_PARALLELCLEANING_HPP -#define SHARE_VM_GC_SHARED_PARALLELCLEANING_HPP +#pragma once #include "classfile/classLoaderDataGraph.inline.hpp" #include "gc/shared/oopStorageParState.hpp" @@ -114,5 +113,3 @@ void work(uint worker_id); }; - -#endif // SHARE_VM_GC_SHARED_PARALLELCLEANING_HPP diff --git a/src/hotspot/share/gc/shared/plab.hpp b/src/hotspot/share/gc/shared/plab.hpp --- a/src/hotspot/share/gc/shared/plab.hpp +++ b/src/hotspot/share/gc/shared/plab.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_PLAB_HPP -#define SHARE_VM_GC_SHARED_PLAB_HPP +#pragma once #include "gc/shared/gcUtil.hpp" #include "memory/allocation.hpp" @@ -210,5 +209,3 @@ inline void add_undo_wasted(size_t v); }; - -#endif // SHARE_VM_GC_SHARED_PLAB_HPP diff --git a/src/hotspot/share/gc/shared/plab.inline.hpp b/src/hotspot/share/gc/shared/plab.inline.hpp --- a/src/hotspot/share/gc/shared/plab.inline.hpp +++ b/src/hotspot/share/gc/shared/plab.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_PLAB_INLINE_HPP -#define SHARE_VM_GC_SHARED_PLAB_INLINE_HPP +#pragma once #include "gc/shared/collectedHeap.inline.hpp" #include "gc/shared/plab.hpp" @@ -57,5 +56,3 @@ void PLABStats::add_undo_wasted(size_t v) { Atomic::add(v, &_undo_wasted); } - -#endif // SHARE_VM_GC_SHARED_PLAB_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/preservedMarks.hpp b/src/hotspot/share/gc/shared/preservedMarks.hpp --- a/src/hotspot/share/gc/shared/preservedMarks.hpp +++ b/src/hotspot/share/gc/shared/preservedMarks.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_PRESERVEDMARKS_HPP -#define SHARE_VM_GC_SHARED_PRESERVEDMARKS_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/padded.hpp" @@ -145,5 +144,3 @@ assert(_stacks == NULL && _num == 0, "stacks should have been reclaimed"); } }; - -#endif // SHARE_VM_GC_SHARED_PRESERVEDMARKS_HPP diff --git a/src/hotspot/share/gc/shared/preservedMarks.inline.hpp b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp --- a/src/hotspot/share/gc/shared/preservedMarks.inline.hpp +++ b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP -#define SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP +#pragma once #include "gc/shared/preservedMarks.hpp" #include "logging/log.hpp" @@ -82,5 +81,3 @@ void PreservedMarks::OopAndMarkOop::set_mark() const { _o->set_mark_raw(_m); } - -#endif // SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/ptrQueue.hpp b/src/hotspot/share/gc/shared/ptrQueue.hpp --- a/src/hotspot/share/gc/shared/ptrQueue.hpp +++ b/src/hotspot/share/gc/shared/ptrQueue.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_PTRQUEUE_HPP -#define SHARE_GC_SHARED_PTRQUEUE_HPP +#pragma once #include "utilities/align.hpp" #include "utilities/sizes.hpp" @@ -386,5 +385,3 @@ // Notify the consumer if the number of buffers crossed the threshold void notify_if_necessary(); }; - -#endif // SHARE_GC_SHARED_PTRQUEUE_HPP diff --git a/src/hotspot/share/gc/shared/referenceDiscoverer.hpp b/src/hotspot/share/gc/shared/referenceDiscoverer.hpp --- a/src/hotspot/share/gc/shared/referenceDiscoverer.hpp +++ b/src/hotspot/share/gc/shared/referenceDiscoverer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_REFERENCEDISCOVERER_HPP -#define SHARE_GC_SHARED_REFERENCEDISCOVERER_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/referenceType.hpp" @@ -33,5 +32,3 @@ public: virtual bool discover_reference(oop obj, ReferenceType type) = 0; }; - -#endif // SHARE_GC_SHARED_REFERENCEDISCOVERER_HPP diff --git a/src/hotspot/share/gc/shared/referencePolicy.hpp b/src/hotspot/share/gc/shared/referencePolicy.hpp --- a/src/hotspot/share/gc/shared/referencePolicy.hpp +++ b/src/hotspot/share/gc/shared/referencePolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP -#define SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP +#pragma once #include "oops/oopsHierarchy.hpp" @@ -79,5 +78,3 @@ void setup(); virtual bool should_clear_reference(oop p, jlong timestamp_clock); }; - -#endif // SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP diff --git a/src/hotspot/share/gc/shared/referenceProcessor.hpp b/src/hotspot/share/gc/shared/referenceProcessor.hpp --- a/src/hotspot/share/gc/shared/referenceProcessor.hpp +++ b/src/hotspot/share/gc/shared/referenceProcessor.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP -#define SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP +#pragma once #include "gc/shared/referenceDiscoverer.hpp" #include "gc/shared/referencePolicy.hpp" @@ -694,5 +693,3 @@ size_t ref_count); ~RefProcMTDegreeAdjuster(); }; - -#endif // SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP diff --git a/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp b/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp --- a/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp +++ b/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP -#define SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP +#pragma once #include "gc/shared/referenceProcessor.hpp" #include "oops/compressedOops.inline.hpp" @@ -71,5 +70,3 @@ _processed(0), _removed(0) { } - -#endif // SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp --- a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp +++ b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP -#define SHARE_VM_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP +#pragma once #include "gc/shared/referenceProcessor.hpp" #include "gc/shared/referenceProcessorStats.hpp" @@ -167,5 +166,3 @@ ReferenceProcessor* rp); ~RefProcTotalPhaseTimesTracker(); }; - -#endif // SHARE_VM_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP diff --git a/src/hotspot/share/gc/shared/referenceProcessorStats.hpp b/src/hotspot/share/gc/shared/referenceProcessorStats.hpp --- a/src/hotspot/share/gc/shared/referenceProcessorStats.hpp +++ b/src/hotspot/share/gc/shared/referenceProcessorStats.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSORSTATS_HPP -#define SHARE_VM_GC_SHARED_REFERENCEPROCESSORSTATS_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -70,4 +69,3 @@ return _phantom_count; } }; -#endif diff --git a/src/hotspot/share/gc/shared/satbMarkQueue.hpp b/src/hotspot/share/gc/shared/satbMarkQueue.hpp --- a/src/hotspot/share/gc/shared/satbMarkQueue.hpp +++ b/src/hotspot/share/gc/shared/satbMarkQueue.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_SATBMARKQUEUE_HPP -#define SHARE_GC_SHARED_SATBMARKQUEUE_HPP +#pragma once #include "gc/shared/ptrQueue.hpp" #include "memory/allocation.hpp" @@ -187,5 +186,3 @@ // if all the entries were filtered out. this->set_index(dst - buf); } - -#endif // SHARE_GC_SHARED_SATBMARKQUEUE_HPP diff --git a/src/hotspot/share/gc/shared/softRefGenPolicy.hpp b/src/hotspot/share/gc/shared/softRefGenPolicy.hpp --- a/src/hotspot/share/gc/shared/softRefGenPolicy.hpp +++ b/src/hotspot/share/gc/shared/softRefGenPolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_SOFTREFGENPOLICY_HPP -#define SHARE_VM_GC_SHARED_SOFTREFGENPOLICY_HPP +#pragma once #include "gc/shared/softRefPolicy.hpp" #include "utilities/globalDefinitions.hpp" @@ -34,5 +33,3 @@ public: virtual void cleared_all_soft_refs(); }; - -#endif // SHARE_VM_GC_SHARED_SOFTREFGENPOLICY_HPP diff --git a/src/hotspot/share/gc/shared/softRefPolicy.hpp b/src/hotspot/share/gc/shared/softRefPolicy.hpp --- a/src/hotspot/share/gc/shared/softRefPolicy.hpp +++ b/src/hotspot/share/gc/shared/softRefPolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_SOFTREFPOLICY_HPP -#define SHARE_VM_GC_SHARED_SOFTREFPOLICY_HPP +#pragma once #include "memory/allocation.hpp" @@ -72,5 +71,3 @@ bool should_clear() { return _clear_all_soft_refs; } }; - -#endif // SHARE_VM_GC_SHARED_SOFTREFPOLICY_HPP diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp --- a/src/hotspot/share/gc/shared/space.hpp +++ b/src/hotspot/share/gc/shared/space.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_SPACE_HPP -#define SHARE_VM_GC_SHARED_SPACE_HPP +#pragma once #include "gc/shared/blockOffsetTable.hpp" #include "gc/shared/cardTable.hpp" @@ -782,4 +781,3 @@ MemRegion mr) : OffsetTableContigSpace(sharedOffsetArray, mr) {} }; -#endif // SHARE_VM_GC_SHARED_SPACE_HPP diff --git a/src/hotspot/share/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp --- a/src/hotspot/share/gc/shared/space.inline.hpp +++ b/src/hotspot/share/gc/shared/space.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_SPACE_INLINE_HPP -#define SHARE_VM_GC_SHARED_SPACE_INLINE_HPP +#pragma once #include "gc/shared/blockOffsetTable.inline.hpp" #include "gc/shared/collectedHeap.hpp" @@ -387,5 +386,3 @@ obj_addr += oop(obj_addr)->oop_iterate_size(blk); } } - -#endif // SHARE_VM_GC_SHARED_SPACE_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/spaceDecorator.hpp b/src/hotspot/share/gc/shared/spaceDecorator.hpp --- a/src/hotspot/share/gc/shared/spaceDecorator.hpp +++ b/src/hotspot/share/gc/shared/spaceDecorator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_SPACEDECORATOR_HPP -#define SHARE_VM_GC_SHARED_SPACEDECORATOR_HPP +#pragma once #include "gc/parallel/mutableSpace.hpp" #include "gc/shared/space.hpp" @@ -146,5 +145,3 @@ public: MutableSpaceMangler(MutableSpace* sp) : SpaceMangler(), _sp(sp) {} }; - -#endif // SHARE_VM_GC_SHARED_SPACEDECORATOR_HPP diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp --- a/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp +++ b/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP -#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP +#pragma once // // String Deduplication @@ -138,5 +137,3 @@ } } }; - -#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedup.inline.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedup.inline.hpp --- a/src/hotspot/share/gc/shared/stringdedup/stringDedup.inline.hpp +++ b/src/hotspot/share/gc/shared/stringdedup/stringDedup.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP -#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP +#pragma once #include "gc/shared/stringdedup/stringDedup.hpp" #include "gc/shared/stringdedup/stringDedupThread.inline.hpp" @@ -37,5 +36,3 @@ StringDedupThreadImpl::create(); } } - -#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.hpp --- a/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.hpp +++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP -#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oop.hpp" @@ -108,5 +107,3 @@ static size_t claim(); }; - -#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.inline.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.inline.hpp --- a/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.inline.hpp +++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP -#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP +#pragma once #include "gc/shared/stringdedup/stringDedup.hpp" #include "gc/shared/stringdedup/stringDedupQueue.hpp" @@ -50,5 +49,3 @@ oop StringDedupQueue::pop() { return queue()->pop_impl(); } - -#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp --- a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp +++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP -#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/os.hpp" @@ -134,6 +133,3 @@ static void print_start(const StringDedupStat* last_stat); static void print_end(const StringDedupStat* last_stat, const StringDedupStat* total_stat); }; - -#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP - diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp --- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp +++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP -#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP +#pragma once #include "gc/shared/stringdedup/stringDedupStat.hpp" #include "runtime/mutexLocker.hpp" @@ -251,5 +250,3 @@ static void gc_prologue(bool resize_and_rehash_table); static void gc_epilogue(); }; - -#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp --- a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp +++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP -#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP +#pragma once #include "gc/shared/concurrentGCThread.hpp" #include "gc/shared/stringdedup/stringDedupStat.hpp" @@ -68,5 +67,3 @@ public: static void create(); }; - -#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP diff --git a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.inline.hpp b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.inline.hpp --- a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.inline.hpp +++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP -#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP +#pragma once #include "gc/shared/suspendibleThreadSet.hpp" #include "gc/shared/stringdedup/stringDedupQueue.inline.hpp" @@ -87,5 +86,3 @@ assert(_thread == NULL, "One string deduplication thread allowed"); _thread = new StringDedupThreadImpl(); } - -#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/strongRootsScope.hpp b/src/hotspot/share/gc/shared/strongRootsScope.hpp --- a/src/hotspot/share/gc/shared/strongRootsScope.hpp +++ b/src/hotspot/share/gc/shared/strongRootsScope.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_STRONGROOTSSCOPE_HPP -#define SHARE_VM_GC_SHARED_STRONGROOTSSCOPE_HPP +#pragma once #include "memory/allocation.hpp" @@ -45,5 +44,3 @@ uint n_threads() const { return _n_threads; } }; - -#endif // SHARE_VM_GC_SHARED_STRONGROOTSSCOPE_HPP diff --git a/src/hotspot/share/gc/shared/suspendibleThreadSet.hpp b/src/hotspot/share/gc/shared/suspendibleThreadSet.hpp --- a/src/hotspot/share/gc/shared/suspendibleThreadSet.hpp +++ b/src/hotspot/share/gc/shared/suspendibleThreadSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_SUSPENDIBLETHREADSET_HPP -#define SHARE_GC_SHARED_SUSPENDIBLETHREADSET_HPP +#pragma once #include "memory/allocation.hpp" @@ -115,5 +114,3 @@ } } }; - -#endif // SHARE_GC_SHARED_SUSPENDIBLETHREADSET_HPP diff --git a/src/hotspot/share/gc/shared/taskqueue.hpp b/src/hotspot/share/gc/shared/taskqueue.hpp --- a/src/hotspot/share/gc/shared/taskqueue.hpp +++ b/src/hotspot/share/gc/shared/taskqueue.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_TASKQUEUE_HPP -#define SHARE_VM_GC_SHARED_TASKQUEUE_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/padded.hpp" @@ -618,5 +617,3 @@ typedef OverflowTaskQueue RegionTaskQueue; typedef GenericTaskQueueSet RegionTaskQueueSet; - -#endif // SHARE_VM_GC_SHARED_TASKQUEUE_HPP diff --git a/src/hotspot/share/gc/shared/taskqueue.inline.hpp b/src/hotspot/share/gc/shared/taskqueue.inline.hpp --- a/src/hotspot/share/gc/shared/taskqueue.inline.hpp +++ b/src/hotspot/share/gc/shared/taskqueue.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_TASKQUEUE_INLINE_HPP -#define SHARE_VM_GC_SHARED_TASKQUEUE_INLINE_HPP +#pragma once #include "gc/shared/taskqueue.hpp" #include "memory/allocation.inline.hpp" @@ -329,6 +328,3 @@ fn(const_cast(_elems[index])); // cast away volatility } } - - -#endif // SHARE_VM_GC_SHARED_TASKQUEUE_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp --- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp +++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP -#define SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP +#pragma once #include "gc/shared/gcUtil.hpp" #include "runtime/perfData.hpp" @@ -237,5 +236,3 @@ void reset(); void publish(); }; - -#endif // SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP diff --git a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp --- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp +++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP -#define SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "gc/shared/threadLocalAllocBuffer.hpp" @@ -94,5 +93,3 @@ "slow", p2i(thread()), thread()->osthread()->thread_id(), obj_size, free(), refill_waste_limit()); } - -#endif // SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/vmStructs_gc.hpp b/src/hotspot/share/gc/shared/vmStructs_gc.hpp --- a/src/hotspot/share/gc/shared/vmStructs_gc.hpp +++ b/src/hotspot/share/gc/shared/vmStructs_gc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_VMSTRUCTS_GC_HPP -#define SHARE_GC_SHARED_VMSTRUCTS_GC_HPP +#pragma once #include "gc/shared/ageTable.hpp" #include "gc/shared/cardGeneration.hpp" @@ -311,5 +310,3 @@ #define VM_LONG_CONSTANTS_GC(declare_constant) \ ZGC_ONLY(VM_LONG_CONSTANTS_ZGC(declare_constant)) - -#endif // SHARE_GC_SHARED_VMSTRUCTS_GC_HPP diff --git a/src/hotspot/share/gc/shared/weakProcessor.hpp b/src/hotspot/share/gc/shared/weakProcessor.hpp --- a/src/hotspot/share/gc/shared/weakProcessor.hpp +++ b/src/hotspot/share/gc/shared/weakProcessor.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_WEAKPROCESSOR_HPP -#define SHARE_VM_GC_SHARED_WEAKPROCESSOR_HPP +#pragma once #include "gc/shared/oopStorageParState.hpp" #include "gc/shared/workgroup.hpp" @@ -91,5 +90,3 @@ template void work(uint worker_id, IsAlive* is_alive, KeepAlive* keep_alive); }; - -#endif // SHARE_VM_GC_SHARED_WEAKPROCESSOR_HPP diff --git a/src/hotspot/share/gc/shared/weakProcessor.inline.hpp b/src/hotspot/share/gc/shared/weakProcessor.inline.hpp --- a/src/hotspot/share/gc/shared/weakProcessor.inline.hpp +++ b/src/hotspot/share/gc/shared/weakProcessor.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_WEAKPROCESSOR_INLINE_HPP -#define SHARE_VM_GC_SHARED_WEAKPROCESSOR_INLINE_HPP +#pragma once #include "gc/shared/oopStorage.inline.hpp" #include "gc/shared/oopStorageParState.inline.hpp" @@ -115,5 +114,3 @@ weak_oops_do(workers, is_alive, keep_alive, &pt); pt.log_print_phases(indent_log); } - -#endif // SHARE_VM_GC_SHARED_WEAKPROCESSOR_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/weakProcessorPhaseTimes.hpp b/src/hotspot/share/gc/shared/weakProcessorPhaseTimes.hpp --- a/src/hotspot/share/gc/shared/weakProcessorPhaseTimes.hpp +++ b/src/hotspot/share/gc/shared/weakProcessorPhaseTimes.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_WEAKPROCESSORPHASETIMES_HPP -#define SHARE_GC_SHARED_WEAKPROCESSORPHASETIMES_HPP +#pragma once #include "gc/shared/weakProcessorPhases.hpp" #include "memory/allocation.hpp" @@ -111,5 +110,3 @@ ~WeakProcessorPhaseTimeTracker(); }; - -#endif // SHARE_GC_SHARED_WEAKPROCESSORPHASETIMES_HPP diff --git a/src/hotspot/share/gc/shared/weakProcessorPhases.hpp b/src/hotspot/share/gc/shared/weakProcessorPhases.hpp --- a/src/hotspot/share/gc/shared/weakProcessorPhases.hpp +++ b/src/hotspot/share/gc/shared/weakProcessorPhases.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHARED_WEAKPROCESSORPHASES_HPP -#define SHARE_GC_SHARED_WEAKPROCESSORPHASES_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -79,5 +78,3 @@ static_cast(P) < (WeakProcessorPhases::oop_storage_phase_start + \ WeakProcessorPhases::oop_storage_phase_count); \ P = static_cast(static_cast(P) + 1)) - -#endif // SHARE_GC_SHARED_WEAKPROCESSORPHASES_HPP diff --git a/src/hotspot/share/gc/shared/workerDataArray.hpp b/src/hotspot/share/gc/shared/workerDataArray.hpp --- a/src/hotspot/share/gc/shared/workerDataArray.hpp +++ b/src/hotspot/share/gc/shared/workerDataArray.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_WORKERDATAARRAY_HPP -#define SHARE_VM_GC_SHARED_WORKERDATAARRAY_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -89,5 +88,3 @@ void print_summary_on(outputStream* out, bool print_sum = true) const; void print_details_on(outputStream* out) const; }; - -#endif // SHARE_VM_GC_SHARED_WORKERDATAARRAY_HPP diff --git a/src/hotspot/share/gc/shared/workerDataArray.inline.hpp b/src/hotspot/share/gc/shared/workerDataArray.inline.hpp --- a/src/hotspot/share/gc/shared/workerDataArray.inline.hpp +++ b/src/hotspot/share/gc/shared/workerDataArray.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_WORKERDATAARRAY_INLINE_HPP -#define SHARE_VM_GC_SHARED_WORKERDATAARRAY_INLINE_HPP +#pragma once #include "gc/shared/workerDataArray.hpp" #include "memory/allocation.inline.hpp" @@ -176,5 +175,3 @@ } } } - -#endif // SHARE_VM_GC_SHARED_WORKERDATAARRAY_INLINE_HPP diff --git a/src/hotspot/share/gc/shared/workerManager.hpp b/src/hotspot/share/gc/shared/workerManager.hpp --- a/src/hotspot/share/gc/shared/workerManager.hpp +++ b/src/hotspot/share/gc/shared/workerManager.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_WORKERMANAGER_HPP -#define SHARE_VM_GC_SHARED_WORKERMANAGER_HPP +#pragma once #include "logging/log.hpp" #include "memory/allocation.hpp" @@ -114,5 +113,3 @@ initializing_msg, holder->group_name(), previous_created_workers, active_workers, created_workers); } } - -#endif // SHARE_VM_GC_SHARED_WORKERMANAGER_HPP diff --git a/src/hotspot/share/gc/shared/workerPolicy.hpp b/src/hotspot/share/gc/shared/workerPolicy.hpp --- a/src/hotspot/share/gc/shared/workerPolicy.hpp +++ b/src/hotspot/share/gc/shared/workerPolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_WORKERPOLICY_HPP -#define SHARE_VM_GC_SHARED_WORKERPOLICY_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -77,5 +76,3 @@ uintx application_workers); }; - -#endif // SHARE_VM_GC_SHARED_WORKERPOLICY_HPP diff --git a/src/hotspot/share/gc/shared/workgroup.hpp b/src/hotspot/share/gc/shared/workgroup.hpp --- a/src/hotspot/share/gc/shared/workgroup.hpp +++ b/src/hotspot/share/gc/shared/workgroup.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_GC_SHARED_WORKGROUP_HPP -#define SHARE_VM_GC_SHARED_WORKGROUP_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/globals.hpp" @@ -405,5 +404,3 @@ // cleanup if necessary. bool all_tasks_completed(); }; - -#endif // SHARE_VM_GC_SHARED_WORKGROUP_HPP diff --git a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp --- a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp +++ b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP -#define SHARE_VM_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP +#pragma once #include "c1/c1_CodeStubs.hpp" #include "gc/shared/c1/barrierSetC1.hpp" @@ -209,5 +208,3 @@ virtual void generate_c1_runtime_stubs(BufferBlob* buffer_blob); }; - -#endif // SHARE_VM_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp --- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp +++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP -#define SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP +#pragma once #include "gc/shared/c2/barrierSetC2.hpp" #include "gc/shenandoah/c2/shenandoahSupport.hpp" @@ -170,5 +169,3 @@ virtual bool build_loop_late_post(PhaseIdealLoop* phase, Node* n) const; virtual bool sink_node(PhaseIdealLoop* phase, Node* n, Node* x, Node* x_ctrl, Node* n_ctrl) const; }; - -#endif // SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp --- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp +++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAH_SUPPORT_HPP -#define SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAH_SUPPORT_HPP +#pragma once #include "gc/shenandoah/shenandoahBrooksPointer.hpp" #include "memory/allocation.hpp" @@ -381,5 +380,3 @@ virtual int Opcode() const; }; - -#endif // SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAH_SUPPORT_HPP diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP -#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP +#pragma once #include "gc/shenandoah/shenandoahHeuristics.hpp" #include "gc/shenandoah/shenandoahPhaseTimings.hpp" @@ -57,5 +56,3 @@ virtual bool is_experimental(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP -#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP +#pragma once #include "gc/shenandoah/shenandoahHeuristics.hpp" @@ -46,5 +45,3 @@ virtual bool is_experimental(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP -#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP +#pragma once #include "gc/shenandoah/shenandoahHeuristics.hpp" @@ -42,5 +41,3 @@ virtual bool is_experimental(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP -#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP +#pragma once #include "gc/shenandoah/shenandoahHeuristics.hpp" @@ -48,5 +47,3 @@ virtual bool is_experimental(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP -#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP +#pragma once #include "gc/shenandoah/shenandoahHeuristics.hpp" @@ -44,5 +43,3 @@ virtual bool is_experimental(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp --- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp +++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP -#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP +#pragma once #include "gc/shenandoah/shenandoahHeuristics.hpp" @@ -52,5 +51,3 @@ virtual bool should_start_traversal_gc(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp b/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP +#pragma once #include "memory/allocation.hpp" @@ -154,5 +153,3 @@ } } }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp b/src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP +#pragma once #include "gc/shenandoah/shenandoahAllocRequest.hpp" #include "gc/shenandoah/shenandoahNumberSeq.hpp" @@ -44,5 +43,3 @@ void print_on(outputStream* out) const; }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahArguments.hpp b/src/hotspot/share/gc/shenandoah/shenandoahArguments.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHARGUMENTS_HPP -#define SHARE_GC_SHENANDOAH_SHENANDOAHARGUMENTS_HPP +#pragma once #include "gc/shared/gcArguments.hpp" @@ -37,5 +36,3 @@ virtual CollectedHeap* create_heap(); }; - -#endif // SHARE_GC_SHENANDOAH_SHENANDOAHARGUMENTS_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP +#pragma once #include "memory/iterator.hpp" #include "utilities/formatBuffer.hpp" @@ -166,5 +165,3 @@ { fatal("Deliberately not implemented."); return v; } }; - -#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP +#pragma once #include "gc/shared/accessBarrierSupport.hpp" #include "gc/shared/barrierSet.hpp" @@ -292,5 +291,3 @@ struct BarrierSet::GetType { typedef ::ShenandoahBarrierSet type; }; - -#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP +#pragma once #include "gc/shared/barrierSet.hpp" #include "gc/shenandoah/shenandoahBarrierSet.hpp" @@ -278,5 +277,3 @@ ShenandoahBarrierSet* bs = ShenandoahBarrierSet::barrier_set(); return bs->arraycopy_loop_1(src_raw, dst_raw, length, bound, checkcast, satb, disjoint, storeval_mode); } - -#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetAssembler.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetAssembler.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetAssembler.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetAssembler.hpp @@ -21,12 +21,9 @@ * */ -#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_HPP -#define SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_HPP +#pragma once #include "utilities/macros.hpp" #include "gc/shenandoah/shenandoahBrooksPointer.hpp" #include CPU_HEADER(gc/shenandoah/shenandoahBarrierSetAssembler) - -#endif // SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP +#pragma once #include "oops/oop.hpp" #include "utilities/globalDefinitions.hpp" @@ -102,5 +101,3 @@ private: static inline HeapWord** brooks_ptr_addr(oop obj); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP +#pragma once #include "gc/shenandoah/shenandoahAsserts.hpp" #include "gc/shenandoah/shenandoahBrooksPointer.hpp" @@ -61,5 +60,3 @@ shenandoah_assert_correct_except(NULL, obj, !oopDesc::equals_raw(result, obj)); return result; } - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP +#pragma once #include "code/codeCache.hpp" #include "gc/shenandoah/shenandoahSharedVariables.hpp" @@ -196,5 +195,3 @@ ShenandoahCodeRoots::release_lock(_write); } }; - -#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP +#pragma once #include "memory/allocation.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" @@ -92,5 +91,3 @@ return _biased_cset_map; } }; - -#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP +#pragma once #include "gc/shenandoah/shenandoahCollectionSet.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" @@ -45,5 +44,3 @@ // _biased_cset_map is biased return _biased_cset_map[index] == 1; } - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP +#pragma once #include "gc/shared/collectorPolicy.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" @@ -78,5 +77,3 @@ void print_gc_stats(outputStream* out) const; }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP +#pragma once #include "gc/shared/taskqueue.hpp" #include "gc/shenandoah/shenandoahOopClosures.hpp" @@ -107,5 +106,3 @@ ShenandoahObjToScanQueueSet* task_queues() { return _task_queues; } }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP +#pragma once #include "gc/shenandoah/shenandoahAsserts.hpp" #include "gc/shenandoah/shenandoahBrooksPointer.hpp" @@ -274,5 +273,3 @@ } } } - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSCHEDULERTHREAD_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSCHEDULERTHREAD_HPP +#pragma once #include "gc/shared/gcCause.hpp" #include "gc/shared/concurrentGCThread.hpp" @@ -139,5 +138,3 @@ void print_on(outputStream* st) const; void print() const; }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSCHEDULERTHREAD_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -124,5 +123,3 @@ ShenandoahEvacOOMScopeLeaver(); ~ShenandoahEvacOOMScopeLeaver(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHFREESET_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHFREESET_HPP +#pragma once #include "gc/shenandoah/shenandoahHeapRegionSet.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" @@ -93,5 +92,3 @@ void print_on(outputStream* out) const; }; - -#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHFREESET_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_HPP +#pragma once #include "gc/shared/markBitMap.hpp" #include "gc/shared/softRefPolicy.hpp" @@ -753,5 +752,3 @@ void try_inject_alloc_failure(); bool should_inject_alloc_failure(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP +#pragma once #include "classfile/javaClasses.inline.hpp" #include "gc/shared/markBitMap.inline.hpp" @@ -548,5 +547,3 @@ inline ShenandoahMarkingContext* ShenandoahHeap::marking_context() const { return _marking_context; } - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapLock.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapLock.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapLock.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapLock.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/thread.hpp" @@ -89,5 +88,3 @@ _lock->unlock(); } }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP +#pragma once #include "gc/shared/space.hpp" #include "gc/shenandoah/shenandoahAllocRequest.hpp" @@ -427,5 +426,3 @@ inline void internal_increase_live_data(size_t s); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP +#pragma once #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahHeapRegion.hpp" @@ -107,5 +106,3 @@ "can't have more live data than used: " SIZE_FORMAT ", " SIZE_FORMAT, live_bytes, used_bytes); #endif } - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP +#pragma once #include "memory/allocation.hpp" @@ -81,5 +80,3 @@ ~ShenandoahHeapRegionCounters(); void update(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP +#pragma once #include "memory/allocation.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" @@ -94,5 +93,3 @@ return _biased_set_map; } }; - -#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP +#pragma once #include "gc/shenandoah/shenandoahHeapRegionSet.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" @@ -45,5 +44,3 @@ // _biased_set_map is biased return _biased_set_map[index] == 1; } - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP +#pragma once #include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahPhaseTimings.hpp" @@ -163,5 +162,3 @@ double time_since_last_gc() const; }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP +#pragma once #include "gc/shared/gcTimer.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" @@ -67,5 +66,3 @@ void compact_humongous_objects(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP +#pragma once #include "gc/shared/markBitMap.hpp" #include "memory/allocation.hpp" @@ -76,5 +75,3 @@ void mark_incomplete(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP +#pragma once #include "gc/shenandoah/shenandoahMarkingContext.hpp" @@ -47,5 +46,3 @@ bool alloc_after_mark_start = addr >= top_at_mark_start; return alloc_after_mark_start; } - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_SERVICES_SHENANDOAHMEMORYPOOL_HPP -#define SHARE_VM_SERVICES_SHENANDOAHMEMORYPOOL_HPP +#pragma once #ifndef SERIALGC #include "gc/shenandoah/shenandoahHeap.hpp" @@ -40,5 +39,3 @@ size_t used_in_bytes() { return _heap->used(); } size_t max_size() const { return _heap->max_capacity(); } }; - -#endif //SHARE_VM_SERVICES_SHENANDOAHMEMORYPOOL_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP +#pragma once #include "gc/shenandoah/shenandoahHeap.hpp" @@ -51,5 +50,3 @@ bool is_good_progress(const char *label); }; - -#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP +#pragma once #include "memory/allocation.hpp" @@ -52,5 +51,3 @@ CollectorCounters* partial_collection_counters(); void update_counters(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.hpp b/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP +#pragma once #include "utilities/numberSeq.hpp" @@ -70,5 +69,3 @@ int min_level() const; int max_level() const; }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP +#pragma once #include "gc/shared/referenceProcessor.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" @@ -346,5 +345,3 @@ virtual bool do_metadata() { return true; } }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP +#pragma once #include "gc/shenandoah/shenandoahHeap.inline.hpp" #include "gc/shenandoah/shenandoahConcurrentMark.inline.hpp" @@ -42,5 +41,3 @@ inline void ShenandoahTraversalSuperClosure::work(T* p) { _traversal_gc->process_oop(p, _thread, _queue, _mark_context); } - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPacer.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPacer.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahPacer.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahPacer.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_HPP +#pragma once #include "gc/shenandoah/shenandoahNumberSeq.hpp" #include "memory/allocation.hpp" @@ -95,5 +94,3 @@ size_t update_and_get_progress_history(); }; - -#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP +#pragma once #include "gc/shenandoah/shenandoahPacer.hpp" #include "runtime/atomic.hpp" @@ -55,5 +54,3 @@ STATIC_ASSERT(sizeof(size_t) <= sizeof(intptr_t)); Atomic::add((intptr_t)words, &_progress); } - -#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHPHASETIMEINGS_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHPHASETIMEINGS_HPP +#pragma once #include "gc/shenandoah/shenandoahNumberSeq.hpp" #include "gc/shared/workerDataArray.hpp" @@ -394,5 +393,3 @@ void print() const; }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHGCPHASETIMEINGS_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP +#pragma once #include "code/codeCache.hpp" #include "gc/shared/oopStorageParState.hpp" @@ -123,4 +122,3 @@ // Number of worker threads used by the root processor. uint n_workers() const; }; -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oopsHierarchy.hpp" @@ -42,5 +41,3 @@ static void shenandoah_clone_barrier(oopDesc* obj); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP +#pragma once #include "gc/shared/satbMarkQueue.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" @@ -51,5 +50,3 @@ virtual SATBMarkQueue& satb_queue_for_thread(JavaThread* const t) const; virtual void filter(SATBMarkQueue* queue); }; - -#endif diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSHAREDFLAG_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSHAREDFLAG_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/orderAccess.hpp" @@ -242,5 +241,3 @@ bool operator<=(ShenandoahSharedEnumFlag& other) { fatal("Use get() instead"); return false; } }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSHAREDFLAG_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.hpp b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_HPP +#pragma once #include "gc/shared/stringdedup/stringDedup.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" @@ -109,5 +108,3 @@ void verify(ShenandoahQueueBuffer* head); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_INLINE_HPP +#pragma once #include "gc/shenandoah/shenandoahStrDedupQueue.hpp" @@ -94,5 +93,3 @@ cl->do_oop(&_buf[index]); } } - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP +#pragma once #include "classfile/javaClasses.inline.hpp" #include "gc/shared/stringdedup/stringDedup.hpp" @@ -55,5 +54,3 @@ bool allow_resize_and_rehash); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP +#pragma once #include "gc/shared/owstTaskTerminator.hpp" #include "gc/shared/taskqueue.hpp" #include "gc/shared/taskqueue.inline.hpp" @@ -328,5 +327,3 @@ void reset_for_reuse() { _terminator->reset_for_reuse(); } bool offer_termination() { return offer_termination((ShenandoahTerminatorTerminator*)NULL); } }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP +#pragma once #include "gc/shenandoah/shenandoahTaskqueue.hpp" @@ -55,5 +54,3 @@ } return true; } - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp b/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTHREADLOCALDATA_HPP -#define SHARE_GC_SHENANDOAH_SHENANDOAHTHREADLOCALDATA_HPP +#pragma once #include "gc/shared/plab.hpp" #include "gc/shenandoah/shenandoahBarrierSet.hpp" @@ -170,5 +169,3 @@ } }; - -#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTHREADLOCALDATA_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP +#pragma once #include "jfr/jfrEvents.hpp" #include "gc/shenandoah/shenandoahPhaseTimings.hpp" @@ -64,6 +63,3 @@ static ShenandoahPhaseTimings::Phase current_termination_phase() { return _current_termination_phase; } }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP - diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTracer.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTracer.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahTracer.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTracer.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRACER_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRACER_HPP +#pragma once #include "gc/shared/gcTrace.hpp" @@ -30,5 +29,3 @@ public: ShenandoahTracer() : GCTracer(Shenandoah) {} }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRACER_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP +#pragma once #include "memory/allocation.hpp" #include "gc/shenandoah/shenandoahHeap.hpp" @@ -69,5 +68,3 @@ void fixup_roots(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP +#pragma once #include "gc/shenandoah/shenandoahAsserts.hpp" #include "gc/shenandoah/shenandoahBarrierSet.inline.hpp" @@ -73,5 +72,3 @@ } } } - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp b/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAHUTILS_HPP -#define SHARE_VM_GC_SHENANDOAHUTILS_HPP +#pragma once #include "jfr/jfrEvents.hpp" @@ -174,5 +173,3 @@ assert(!ShenandoahThreadLocalData::is_evac_allowed(Thread::current()), "STS should be joined before evac scope"); } }; - -#endif // SHARE_VM_GC_SHENANDOAHUTILS_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_VM_OPERATIONS_SHENANDOAH_HPP -#define SHARE_VM_GC_SHENANDOAH_VM_OPERATIONS_SHENANDOAH_HPP +#pragma once #include "gc/shared/gcVMOperations.hpp" @@ -130,5 +129,3 @@ const char* name() const { return "Shenandoah Final Update References"; } virtual void doit(); }; - -#endif //SHARE_VM_GC_SHENANDOAH_VM_OPERATIONS_SHENANDOAH_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP +#pragma once #include "gc/shared/markBitMap.hpp" #include "memory/allocation.hpp" @@ -183,5 +182,3 @@ void verify_after_degenerated(); void verify_generic(VerifyOption option); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.hpp b/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP +#pragma once #include "gc/shared/workgroup.hpp" #include "gc/shenandoah/shenandoahTaskqueue.hpp" @@ -86,5 +85,3 @@ void set_initialize_gclab() { assert(!_initialize_gclab, "Can only enable once"); _initialize_gclab = true; } }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP +#pragma once #include "memory/allocation.hpp" @@ -80,5 +79,3 @@ // Calculate workers for concurrent reset static uint calc_workers_for_conc_reset(); }; - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP diff --git a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp --- a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP -#define SHARE_VM_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP +#pragma once #define GC_SHENANDOAH_FLAGS(develop, \ develop_pd, \ @@ -412,6 +411,4 @@ "if the resulting WriteBarrier isn't executed more frequently") \ \ experimental(bool, ShenandoahLoopOptsAfterExpansion, true, \ - "Attempt more loop opts after write barrier expansion") \ - -#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP + "Attempt more loop opts after write barrier expansion") diff --git a/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp b/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp --- a/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp +++ b/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp @@ -20,8 +20,7 @@ * questions. * */ -#ifndef SHARE_VM_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP -#define SHARE_VM_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP +#pragma once #include "gc/shenandoah/shenandoahHeap.hpp" #include "gc/shenandoah/shenandoahHeapRegion.hpp" @@ -41,6 +40,4 @@ declare_type(ShenandoahHeap, CollectedHeap) \ declare_type(ShenandoahHeapRegion, ContiguousSpace) \ declare_toplevel_type(ShenandoahHeap*) \ - declare_toplevel_type(ShenandoahHeapRegion*) \ - -#endif // SHARE_VM_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP + declare_toplevel_type(ShenandoahHeapRegion*) diff --git a/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp b/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp --- a/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp +++ b/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_C1_ZBARRIERSETC1_HPP -#define SHARE_GC_Z_C1_ZBARRIERSETC1_HPP +#pragma once #include "c1/c1_CodeStubs.hpp" #include "c1/c1_IR.hpp" @@ -76,5 +75,3 @@ virtual void generate_c1_runtime_stubs(BufferBlob* blob); }; - -#endif // SHARE_GC_Z_C1_ZBARRIERSETC1_HPP diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp --- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp +++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_C2_ZBARRIERSETC2_HPP -#define SHARE_GC_Z_C2_ZBARRIERSETC2_HPP +#pragma once #include "gc/shared/c2/barrierSetC2.hpp" #include "memory/allocation.hpp" @@ -219,5 +218,3 @@ virtual bool escape_add_final_edges(ConnectionGraph* conn_graph, PhaseGVN* gvn, Node* n, uint opcode) const; }; - -#endif // SHARE_GC_Z_C2_ZBARRIERSETC2_HPP diff --git a/src/hotspot/share/gc/z/vmStructs_z.hpp b/src/hotspot/share/gc/z/vmStructs_z.hpp --- a/src/hotspot/share/gc/z/vmStructs_z.hpp +++ b/src/hotspot/share/gc/z/vmStructs_z.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_GC_Z_VMSTRUCTS_Z_HPP -#define SHARE_VM_GC_Z_VMSTRUCTS_Z_HPP +#pragma once #include "gc/z/zAddressRangeMap.hpp" #include "gc/z/zCollectedHeap.hpp" @@ -116,5 +115,3 @@ declare_toplevel_type(ZForwardingTable) \ declare_toplevel_type(ZForwardingTableEntry) \ declare_toplevel_type(ZPhysicalMemoryManager) - -#endif // SHARE_VM_GC_Z_VMSTRUCTS_Z_HPP diff --git a/src/hotspot/share/gc/z/zAddress.hpp b/src/hotspot/share/gc/z/zAddress.hpp --- a/src/hotspot/share/gc/z/zAddress.hpp +++ b/src/hotspot/share/gc/z/zAddress.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZADDRESS_HPP -#define SHARE_GC_Z_ZADDRESS_HPP +#pragma once #include "memory/allocation.hpp" @@ -63,5 +62,3 @@ static void flip_to_marked(); static void flip_to_remapped(); }; - -#endif // SHARE_GC_Z_ZADDRESS_HPP diff --git a/src/hotspot/share/gc/z/zAddress.inline.hpp b/src/hotspot/share/gc/z/zAddress.inline.hpp --- a/src/hotspot/share/gc/z/zAddress.inline.hpp +++ b/src/hotspot/share/gc/z/zAddress.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZADDRESS_INLINE_HPP -#define SHARE_GC_Z_ZADDRESS_INLINE_HPP +#pragma once #include "gc/z/zAddress.hpp" #include "gc/z/zGlobals.hpp" @@ -117,5 +116,3 @@ inline uintptr_t ZAddress::remapped_or_null(uintptr_t value) { return is_null(value) ? 0 : remapped(value); } - -#endif // SHARE_GC_Z_ZADDRESS_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zAddressRangeMap.hpp b/src/hotspot/share/gc/z/zAddressRangeMap.hpp --- a/src/hotspot/share/gc/z/zAddressRangeMap.hpp +++ b/src/hotspot/share/gc/z/zAddressRangeMap.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZADDRESSRANGEMAP_HPP -#define SHARE_GC_Z_ZADDRESSRANGEMAP_HPP +#pragma once #include "memory/allocation.hpp" @@ -59,5 +58,3 @@ bool next(T* value); }; - -#endif // SHARE_GC_Z_ZADDRESSRANGEMAP_HPP diff --git a/src/hotspot/share/gc/z/zAddressRangeMap.inline.hpp b/src/hotspot/share/gc/z/zAddressRangeMap.inline.hpp --- a/src/hotspot/share/gc/z/zAddressRangeMap.inline.hpp +++ b/src/hotspot/share/gc/z/zAddressRangeMap.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZADDRESSRANGEMAP_INLINE_HPP -#define SHARE_GC_Z_ZADDRESSRANGEMAP_INLINE_HPP +#pragma once #include "gc/z/zAddress.inline.hpp" #include "gc/z/zAddressRangeMap.hpp" @@ -80,5 +79,3 @@ // End of map return false; } - -#endif // SHARE_GC_Z_ZADDRESSRANGEMAP_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zAllocationFlags.hpp b/src/hotspot/share/gc/z/zAllocationFlags.hpp --- a/src/hotspot/share/gc/z/zAllocationFlags.hpp +++ b/src/hotspot/share/gc/z/zAllocationFlags.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZALLOCATIONFLAGS_HPP -#define SHARE_GC_Z_ZALLOCATIONFLAGS_HPP +#pragma once #include "gc/z/zBitField.hpp" #include "memory/allocation.hpp" @@ -92,5 +91,3 @@ return field_no_reserve::decode(_flags); } }; - -#endif // SHARE_GC_Z_ZALLOCATIONFLAGS_HPP diff --git a/src/hotspot/share/gc/z/zArguments.hpp b/src/hotspot/share/gc/z/zArguments.hpp --- a/src/hotspot/share/gc/z/zArguments.hpp +++ b/src/hotspot/share/gc/z/zArguments.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZARGUMENTS_HPP -#define SHARE_GC_Z_ZARGUMENTS_HPP +#pragma once #include "gc/shared/gcArguments.hpp" @@ -37,5 +36,3 @@ virtual size_t conservative_max_heap_alignment(); virtual CollectedHeap* create_heap(); }; - -#endif // SHARE_GC_Z_ZARGUMENTS_HPP diff --git a/src/hotspot/share/gc/z/zArray.hpp b/src/hotspot/share/gc/z/zArray.hpp --- a/src/hotspot/share/gc/z/zArray.hpp +++ b/src/hotspot/share/gc/z/zArray.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZARRAY_HPP -#define SHARE_GC_Z_ZARRAY_HPP +#pragma once #include "memory/allocation.hpp" @@ -83,5 +82,3 @@ ZArrayParallelIterator(ZArray* array) : ZArrayIteratorImpl(array) {} }; - -#endif // SHARE_GC_Z_ZARRAY_HPP diff --git a/src/hotspot/share/gc/z/zArray.inline.hpp b/src/hotspot/share/gc/z/zArray.inline.hpp --- a/src/hotspot/share/gc/z/zArray.inline.hpp +++ b/src/hotspot/share/gc/z/zArray.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZARRAY_INLINE_HPP -#define SHARE_GC_Z_ZARRAY_INLINE_HPP +#pragma once #include "gc/z/zArray.hpp" #include "memory/allocation.inline.hpp" @@ -107,5 +106,3 @@ // No more elements return false; } - -#endif // SHARE_GC_Z_ZARRAY_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zBarrier.hpp b/src/hotspot/share/gc/z/zBarrier.hpp --- a/src/hotspot/share/gc/z/zBarrier.hpp +++ b/src/hotspot/share/gc/z/zBarrier.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZBARRIER_HPP -#define SHARE_GC_Z_ZBARRIER_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oop.hpp" @@ -120,5 +119,3 @@ static oop weak_load_barrier_on_weak_oop_field_preloaded(volatile narrowOop* p, oop o); static oop weak_load_barrier_on_phantom_oop_field_preloaded(volatile narrowOop* p, oop o); }; - -#endif // SHARE_GC_Z_ZBARRIER_HPP diff --git a/src/hotspot/share/gc/z/zBarrier.inline.hpp b/src/hotspot/share/gc/z/zBarrier.inline.hpp --- a/src/hotspot/share/gc/z/zBarrier.inline.hpp +++ b/src/hotspot/share/gc/z/zBarrier.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZBARRIER_INLINE_HPP -#define SHARE_GC_Z_ZBARRIER_INLINE_HPP +#pragma once #include "gc/z/zAddress.inline.hpp" #include "gc/z/zBarrier.hpp" @@ -315,5 +314,3 @@ const oop o = *p; root_barrier(p, o); } - -#endif // SHARE_GC_Z_ZBARRIER_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zBarrierSet.hpp b/src/hotspot/share/gc/z/zBarrierSet.hpp --- a/src/hotspot/share/gc/z/zBarrierSet.hpp +++ b/src/hotspot/share/gc/z/zBarrierSet.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZBARRIERSET_HPP -#define SHARE_GC_Z_ZBARRIERSET_HPP +#pragma once #include "gc/shared/barrierSet.hpp" @@ -105,5 +104,3 @@ template<> struct BarrierSet::GetType { typedef ::ZBarrierSet type; }; - -#endif // SHARE_GC_Z_ZBARRIERSET_HPP diff --git a/src/hotspot/share/gc/z/zBarrierSet.inline.hpp b/src/hotspot/share/gc/z/zBarrierSet.inline.hpp --- a/src/hotspot/share/gc/z/zBarrierSet.inline.hpp +++ b/src/hotspot/share/gc/z/zBarrierSet.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZBARRIERSET_INLINE_HPP -#define SHARE_GC_Z_ZBARRIERSET_INLINE_HPP +#pragma once #include "gc/shared/accessBarrierSupport.inline.hpp" #include "gc/z/zBarrier.inline.hpp" @@ -233,5 +232,3 @@ return Raw::oop_atomic_xchg_not_in_heap(new_value, addr); } - -#endif // SHARE_GC_Z_ZBARRIERSET_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zBarrierSetAssembler.hpp b/src/hotspot/share/gc/z/zBarrierSetAssembler.hpp --- a/src/hotspot/share/gc/z/zBarrierSetAssembler.hpp +++ b/src/hotspot/share/gc/z/zBarrierSetAssembler.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZBARRIERSETASSEMBLER_HPP -#define SHARE_GC_Z_ZBARRIERSETASSEMBLER_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "gc/shared/barrierSetAssembler.hpp" @@ -37,5 +36,3 @@ }; #include CPU_HEADER(gc/z/zBarrierSetAssembler) - -#endif // SHARE_GC_Z_ZBARRIERSETASSEMBLER_HPP diff --git a/src/hotspot/share/gc/z/zBarrierSetNMethod.hpp b/src/hotspot/share/gc/z/zBarrierSetNMethod.hpp --- a/src/hotspot/share/gc/z/zBarrierSetNMethod.hpp +++ b/src/hotspot/share/gc/z/zBarrierSetNMethod.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZBARRIERSETNMETHOD_HPP -#define SHARE_GC_Z_ZBARRIERSETNMETHOD_HPP +#pragma once #include "gc/shared/barrierSetNMethod.hpp" #include "memory/allocation.hpp" @@ -37,5 +36,3 @@ public: virtual ByteSize thread_disarmed_offset() const; }; - -#endif // SHARE_GC_Z_ZBARRIERSETNMETHOD_HPP diff --git a/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp b/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp --- a/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp +++ b/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZBARRIERSETRUNTIME_HPP -#define SHARE_GC_Z_ZBARRIERSETRUNTIME_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/accessDecorators.hpp" @@ -44,5 +43,3 @@ static address load_barrier_on_phantom_oop_field_preloaded_addr(); static address load_barrier_on_oop_array_addr(); }; - -#endif // SHARE_GC_Z_ZBARRIERSETRUNTIME_HPP diff --git a/src/hotspot/share/gc/z/zBitField.hpp b/src/hotspot/share/gc/z/zBitField.hpp --- a/src/hotspot/share/gc/z/zBitField.hpp +++ b/src/hotspot/share/gc/z/zBitField.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZBITFIELD_HPP -#define SHARE_GC_Z_ZBITFIELD_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -76,5 +75,3 @@ return ((ContainerType)value >> ValueShift) << FieldShift; } }; - -#endif // SHARE_GC_Z_ZBITFIELD_HPP diff --git a/src/hotspot/share/gc/z/zBitMap.hpp b/src/hotspot/share/gc/z/zBitMap.hpp --- a/src/hotspot/share/gc/z/zBitMap.hpp +++ b/src/hotspot/share/gc/z/zBitMap.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZBITMAP_HPP -#define SHARE_GC_Z_ZBITMAP_HPP +#pragma once #include "utilities/bitMap.hpp" @@ -38,5 +37,3 @@ bool par_set_bit_pair(idx_t bit, bool finalizable, bool& inc_live); }; - -#endif // SHARE_GC_Z_ZBITMAP_HPP diff --git a/src/hotspot/share/gc/z/zBitMap.inline.hpp b/src/hotspot/share/gc/z/zBitMap.inline.hpp --- a/src/hotspot/share/gc/z/zBitMap.inline.hpp +++ b/src/hotspot/share/gc/z/zBitMap.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZBITMAP_INLINE_HPP -#define SHARE_GC_Z_ZBITMAP_INLINE_HPP +#pragma once #include "gc/z/zBitMap.hpp" #include "runtime/atomic.hpp" @@ -75,5 +74,3 @@ return par_set_bit_pair_strong(bit, inc_live); } } - -#endif // SHARE_GC_Z_ZBITMAP_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zCPU.hpp b/src/hotspot/share/gc/z/zCPU.hpp --- a/src/hotspot/share/gc/z/zCPU.hpp +++ b/src/hotspot/share/gc/z/zCPU.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZCPU_HPP -#define SHARE_GC_Z_ZCPU_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/padded.hpp" @@ -45,5 +44,3 @@ static uint32_t count(); static uint32_t id(); }; - -#endif // SHARE_GC_Z_ZCPU_HPP diff --git a/src/hotspot/share/gc/z/zCollectedHeap.hpp b/src/hotspot/share/gc/z/zCollectedHeap.hpp --- a/src/hotspot/share/gc/z/zCollectedHeap.hpp +++ b/src/hotspot/share/gc/z/zCollectedHeap.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZCOLLECTEDHEAP_HPP -#define SHARE_GC_Z_ZCOLLECTEDHEAP_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "gc/shared/softRefPolicy.hpp" @@ -130,5 +129,3 @@ virtual void verify(VerifyOption option /* ignored */); virtual bool is_oop(oop object) const; }; - -#endif // SHARE_GC_Z_ZCOLLECTEDHEAP_HPP diff --git a/src/hotspot/share/gc/z/zCollectorPolicy.hpp b/src/hotspot/share/gc/z/zCollectorPolicy.hpp --- a/src/hotspot/share/gc/z/zCollectorPolicy.hpp +++ b/src/hotspot/share/gc/z/zCollectorPolicy.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZCOLLECTORPOLICY_HPP -#define SHARE_GC_Z_ZCOLLECTORPOLICY_HPP +#pragma once #include "gc/shared/collectorPolicy.hpp" @@ -30,5 +29,3 @@ public: virtual void initialize_alignments(); }; - -#endif // SHARE_GC_Z_ZCOLLECTORPOLICY_HPP diff --git a/src/hotspot/share/gc/z/zDirector.hpp b/src/hotspot/share/gc/z/zDirector.hpp --- a/src/hotspot/share/gc/z/zDirector.hpp +++ b/src/hotspot/share/gc/z/zDirector.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZDIRECTOR_HPP -#define SHARE_GC_Z_ZDIRECTOR_HPP +#pragma once #include "gc/shared/concurrentGCThread.hpp" #include "gc/shared/gcCause.hpp" @@ -52,5 +51,3 @@ public: ZDirector(); }; - -#endif // SHARE_GC_Z_ZDIRECTOR_HPP diff --git a/src/hotspot/share/gc/z/zDriver.hpp b/src/hotspot/share/gc/z/zDriver.hpp --- a/src/hotspot/share/gc/z/zDriver.hpp +++ b/src/hotspot/share/gc/z/zDriver.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZDRIVER_HPP -#define SHARE_GC_Z_ZDRIVER_HPP +#pragma once #include "gc/shared/concurrentGCThread.hpp" #include "gc/shared/gcCause.hpp" @@ -50,5 +49,3 @@ void collect(GCCause::Cause cause); }; - -#endif // SHARE_GC_Z_ZDRIVER_HPP diff --git a/src/hotspot/share/gc/z/zErrno.hpp b/src/hotspot/share/gc/z/zErrno.hpp --- a/src/hotspot/share/gc/z/zErrno.hpp +++ b/src/hotspot/share/gc/z/zErrno.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZERRNO_HPP -#define SHARE_GC_Z_ZERRNO_HPP +#pragma once #include "memory/allocation.hpp" @@ -39,5 +38,3 @@ bool operator!=(int error) const; const char* to_string() const; }; - -#endif // SHARE_GC_Z_ZERRNO_HPP diff --git a/src/hotspot/share/gc/z/zForwardingTable.hpp b/src/hotspot/share/gc/z/zForwardingTable.hpp --- a/src/hotspot/share/gc/z/zForwardingTable.hpp +++ b/src/hotspot/share/gc/z/zForwardingTable.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZFORWARDING_HPP -#define SHARE_GC_Z_ZFORWARDING_HPP +#pragma once #include "gc/z/zForwardingTableEntry.hpp" #include "memory/allocation.hpp" @@ -55,5 +54,3 @@ void verify(size_t object_max_count, size_t live_objects) const; }; - -#endif // SHARE_GC_Z_ZFORWARDING_HPP diff --git a/src/hotspot/share/gc/z/zForwardingTable.inline.hpp b/src/hotspot/share/gc/z/zForwardingTable.inline.hpp --- a/src/hotspot/share/gc/z/zForwardingTable.inline.hpp +++ b/src/hotspot/share/gc/z/zForwardingTable.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZFORWARDING_INLINE_HPP -#define SHARE_GC_Z_ZFORWARDING_INLINE_HPP +#pragma once #include "gc/z/zForwardingTable.hpp" #include "gc/z/zGlobals.hpp" @@ -105,5 +104,3 @@ } } } - -#endif // SHARE_GC_Z_ZFORWARDING_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zForwardingTableEntry.hpp b/src/hotspot/share/gc/z/zForwardingTableEntry.hpp --- a/src/hotspot/share/gc/z/zForwardingTableEntry.hpp +++ b/src/hotspot/share/gc/z/zForwardingTableEntry.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZFORWARDINGTABLEENTRY_HPP -#define SHARE_GC_Z_ZFORWARDINGTABLEENTRY_HPP +#pragma once #include "gc/z/zBitField.hpp" #include "memory/allocation.hpp" @@ -93,5 +92,3 @@ return entry; } }; - -#endif // SHARE_GC_Z_ZFORWARDINGTABLEENTRY_HPP diff --git a/src/hotspot/share/gc/z/zFuture.hpp b/src/hotspot/share/gc/z/zFuture.hpp --- a/src/hotspot/share/gc/z/zFuture.hpp +++ b/src/hotspot/share/gc/z/zFuture.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZFUTURE_HPP -#define SHARE_GC_Z_ZFUTURE_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/semaphore.hpp" @@ -37,5 +36,3 @@ void set(T value); T get(); }; - -#endif // SHARE_GC_Z_ZFUTURE_HPP diff --git a/src/hotspot/share/gc/z/zFuture.inline.hpp b/src/hotspot/share/gc/z/zFuture.inline.hpp --- a/src/hotspot/share/gc/z/zFuture.inline.hpp +++ b/src/hotspot/share/gc/z/zFuture.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZFUTURE_INLINE_HPP -#define SHARE_GC_Z_ZFUTURE_INLINE_HPP +#pragma once #include "gc/z/zFuture.hpp" #include "runtime/interfaceSupport.inline.hpp" @@ -51,5 +50,3 @@ // Return value return _value; } - -#endif // SHARE_GC_Z_ZFUTURE_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zGlobals.hpp b/src/hotspot/share/gc/z/zGlobals.hpp --- a/src/hotspot/share/gc/z/zGlobals.hpp +++ b/src/hotspot/share/gc/z/zGlobals.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZGLOBALS_HPP -#define SHARE_GC_Z_ZGLOBALS_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -151,5 +150,3 @@ // Try complete mark timeout const uint64_t ZMarkCompleteTimeout = 1; // ms - -#endif // SHARE_GC_Z_ZGLOBALS_HPP diff --git a/src/hotspot/share/gc/z/zHash.hpp b/src/hotspot/share/gc/z/zHash.hpp --- a/src/hotspot/share/gc/z/zHash.hpp +++ b/src/hotspot/share/gc/z/zHash.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZHASH_HPP -#define SHARE_GC_Z_ZHASH_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -32,5 +31,3 @@ static uint32_t uint32_to_uint32(uint32_t key); static uint32_t address_to_uint32(uintptr_t key); }; - -#endif // SHARE_GC_Z_ZHASH_HPP diff --git a/src/hotspot/share/gc/z/zHash.inline.hpp b/src/hotspot/share/gc/z/zHash.inline.hpp --- a/src/hotspot/share/gc/z/zHash.inline.hpp +++ b/src/hotspot/share/gc/z/zHash.inline.hpp @@ -53,8 +53,7 @@ * http://opensource.org/licenses/bsd-license.php */ -#ifndef SHARE_GC_Z_ZHASH_INLINE_HPP -#define SHARE_GC_Z_ZHASH_INLINE_HPP +#pragma once #include "gc/z/zHash.hpp" @@ -71,5 +70,3 @@ inline uint32_t ZHash::address_to_uint32(uintptr_t key) { return uint32_to_uint32((uint32_t)(key >> 3)); } - -#endif // SHARE_GC_Z_ZHASH_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zHeap.hpp b/src/hotspot/share/gc/z/zHeap.hpp --- a/src/hotspot/share/gc/z/zHeap.hpp +++ b/src/hotspot/share/gc/z/zHeap.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZHEAP_HPP -#define SHARE_GC_Z_ZHEAP_HPP +#pragma once #include "gc/shared/gcTimer.hpp" #include "gc/z/zAllocationFlags.hpp" @@ -171,5 +170,3 @@ bool is_oop(oop object) const; void verify(); }; - -#endif // SHARE_GC_Z_ZHEAP_HPP diff --git a/src/hotspot/share/gc/z/zHeap.inline.hpp b/src/hotspot/share/gc/z/zHeap.inline.hpp --- a/src/hotspot/share/gc/z/zHeap.inline.hpp +++ b/src/hotspot/share/gc/z/zHeap.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZHEAP_INLINE_HPP -#define SHARE_GC_Z_ZHEAP_INLINE_HPP +#pragma once #include "gc/z/zAddress.inline.hpp" #include "gc/z/zHeap.hpp" @@ -100,5 +99,3 @@ inline bool ZHeap::is_oop(oop object) const { return ZOop::is_good(object); } - -#endif // SHARE_GC_Z_ZHEAP_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zHeapIterator.hpp b/src/hotspot/share/gc/z/zHeapIterator.hpp --- a/src/hotspot/share/gc/z/zHeapIterator.hpp +++ b/src/hotspot/share/gc/z/zHeapIterator.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZHEAPITERATOR_HPP -#define SHARE_GC_Z_ZHEAPITERATOR_HPP +#pragma once #include "gc/z/zAddressRangeMap.hpp" #include "gc/z/zGlobals.hpp" @@ -53,5 +52,3 @@ void objects_do(ObjectClosure* cl); }; - -#endif // SHARE_GC_Z_ZHEAPITERATOR_HPP diff --git a/src/hotspot/share/gc/z/zInitialize.hpp b/src/hotspot/share/gc/z/zInitialize.hpp --- a/src/hotspot/share/gc/z/zInitialize.hpp +++ b/src/hotspot/share/gc/z/zInitialize.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZINITIALIZE_HPP -#define SHARE_GC_Z_ZINITIALIZE_HPP +#pragma once #include "memory/allocation.hpp" @@ -32,5 +31,3 @@ public: ZInitialize(ZBarrierSet* barrier_set); }; - -#endif // SHARE_GC_Z_ZINITIALIZE_HPP diff --git a/src/hotspot/share/gc/z/zLargePages.hpp b/src/hotspot/share/gc/z/zLargePages.hpp --- a/src/hotspot/share/gc/z/zLargePages.hpp +++ b/src/hotspot/share/gc/z/zLargePages.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZLARGEPAGES_HPP -#define SHARE_GC_Z_ZLARGEPAGES_HPP +#pragma once #include "memory/allocation.hpp" @@ -47,5 +46,3 @@ static const char* to_string(); }; - -#endif // SHARE_GC_Z_ZLARGEPAGES_HPP diff --git a/src/hotspot/share/gc/z/zLargePages.inline.hpp b/src/hotspot/share/gc/z/zLargePages.inline.hpp --- a/src/hotspot/share/gc/z/zLargePages.inline.hpp +++ b/src/hotspot/share/gc/z/zLargePages.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZLARGEPAGES_INLINE_HPP -#define SHARE_GC_Z_ZLARGEPAGES_INLINE_HPP +#pragma once #include "gc/z/zLargePages.hpp" @@ -37,5 +36,3 @@ inline bool ZLargePages::is_transparent() { return _state == Transparent; } - -#endif // SHARE_GC_Z_ZLARGEPAGES_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zList.hpp b/src/hotspot/share/gc/z/zList.hpp --- a/src/hotspot/share/gc/z/zList.hpp +++ b/src/hotspot/share/gc/z/zList.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZLIST_HPP -#define SHARE_GC_Z_ZLIST_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -236,5 +235,3 @@ ZListReverseIterator(ZList* list) : ZListIteratorImpl(list) {} }; - -#endif // SHARE_GC_Z_ZLIST_HPP diff --git a/src/hotspot/share/gc/z/zList.inline.hpp b/src/hotspot/share/gc/z/zList.inline.hpp --- a/src/hotspot/share/gc/z/zList.inline.hpp +++ b/src/hotspot/share/gc/z/zList.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZLIST_INLINE_HPP -#define SHARE_GC_Z_ZLIST_INLINE_HPP +#pragma once #include "gc/z/zList.hpp" @@ -42,5 +41,3 @@ // No more elements return false; } - -#endif // SHARE_GC_Z_ZLIST_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zLiveMap.hpp b/src/hotspot/share/gc/z/zLiveMap.hpp --- a/src/hotspot/share/gc/z/zLiveMap.hpp +++ b/src/hotspot/share/gc/z/zLiveMap.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZLIVEMAP_HPP -#define SHARE_GC_Z_ZLIVEMAP_HPP +#pragma once #include "gc/z/zBitMap.hpp" #include "memory/allocation.hpp" @@ -85,5 +84,3 @@ void iterate(ObjectClosure* cl, uintptr_t page_start, size_t page_object_alignment_shift); }; - -#endif // SHARE_GC_Z_ZLIVEMAP_HPP diff --git a/src/hotspot/share/gc/z/zLiveMap.inline.hpp b/src/hotspot/share/gc/z/zLiveMap.inline.hpp --- a/src/hotspot/share/gc/z/zLiveMap.inline.hpp +++ b/src/hotspot/share/gc/z/zLiveMap.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZLIVEMAP_INLINE_HPP -#define SHARE_GC_Z_ZLIVEMAP_INLINE_HPP +#pragma once #include "gc/z/zBitMap.inline.hpp" #include "gc/z/zLiveMap.hpp" @@ -167,5 +166,3 @@ } } } - -#endif // SHARE_GC_Z_ZLIVEMAP_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zLock.hpp b/src/hotspot/share/gc/z/zLock.hpp --- a/src/hotspot/share/gc/z/zLock.hpp +++ b/src/hotspot/share/gc/z/zLock.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZLOCK_HPP -#define SHARE_GC_Z_ZLOCK_HPP +#pragma once #include "memory/allocation.hpp" #include @@ -64,5 +63,3 @@ ZLocker(T* lock); ~ZLocker(); }; - -#endif // SHARE_GC_Z_ZLOCK_HPP diff --git a/src/hotspot/share/gc/z/zLock.inline.hpp b/src/hotspot/share/gc/z/zLock.inline.hpp --- a/src/hotspot/share/gc/z/zLock.inline.hpp +++ b/src/hotspot/share/gc/z/zLock.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZLOCK_INLINE_HPP -#define SHARE_GC_Z_ZLOCK_INLINE_HPP +#pragma once #include "gc/z/zLock.hpp" #include "runtime/atomic.hpp" @@ -94,5 +93,3 @@ inline ZLocker::~ZLocker() { _lock->unlock(); } - -#endif // SHARE_GC_Z_ZLOCK_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zMark.hpp b/src/hotspot/share/gc/z/zMark.hpp --- a/src/hotspot/share/gc/z/zMark.hpp +++ b/src/hotspot/share/gc/z/zMark.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMARK_HPP -#define SHARE_GC_Z_ZMARK_HPP +#pragma once #include "gc/z/zMarkStack.hpp" #include "gc/z/zMarkStackAllocator.hpp" @@ -114,5 +113,3 @@ void flush_and_free(); bool flush_and_free(Thread* thread); }; - -#endif // SHARE_GC_Z_ZMARK_HPP diff --git a/src/hotspot/share/gc/z/zMark.inline.hpp b/src/hotspot/share/gc/z/zMark.inline.hpp --- a/src/hotspot/share/gc/z/zMark.inline.hpp +++ b/src/hotspot/share/gc/z/zMark.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMARK_INLINE_HPP -#define SHARE_GC_Z_ZMARK_INLINE_HPP +#pragma once #include "gc/z/zAddress.inline.hpp" #include "gc/z/zMark.hpp" @@ -40,5 +39,3 @@ stacks->push(&_allocator, &_stripes, stripe, entry, publish); } - -#endif // SHARE_GC_Z_ZMARK_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zMarkCache.hpp b/src/hotspot/share/gc/z/zMarkCache.hpp --- a/src/hotspot/share/gc/z/zMarkCache.hpp +++ b/src/hotspot/share/gc/z/zMarkCache.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMARKCACHE_HPP -#define SHARE_GC_Z_ZMARKCACHE_HPP +#pragma once #include "gc/z/zGlobals.hpp" #include "memory/allocation.hpp" @@ -53,5 +52,3 @@ void inc_live(ZPage* page, size_t bytes); }; - -#endif // SHARE_GC_Z_ZMARKCACHE_HPP diff --git a/src/hotspot/share/gc/z/zMarkCache.inline.hpp b/src/hotspot/share/gc/z/zMarkCache.inline.hpp --- a/src/hotspot/share/gc/z/zMarkCache.inline.hpp +++ b/src/hotspot/share/gc/z/zMarkCache.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMARKCACHE_INLINE_HPP -#define SHARE_GC_Z_ZMARKCACHE_INLINE_HPP +#pragma once #include "gc/z/zMarkCache.hpp" #include "gc/z/zPage.inline.hpp" @@ -54,5 +53,3 @@ const size_t index = (page->start() >> _shift) & mask; _cache[index].inc_live(page, bytes); } - -#endif // SHARE_GC_Z_ZMARKCACHE_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zMarkStack.hpp b/src/hotspot/share/gc/z/zMarkStack.hpp --- a/src/hotspot/share/gc/z/zMarkStack.hpp +++ b/src/hotspot/share/gc/z/zMarkStack.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMARKSTACK_HPP -#define SHARE_GC_Z_ZMARKSTACK_HPP +#pragma once #include "gc/z/zGlobals.hpp" #include "gc/z/zMarkStackEntry.hpp" @@ -152,5 +151,3 @@ void free(ZMarkStackAllocator* allocator); }; - -#endif // SHARE_GC_Z_ZMARKSTACK_HPP diff --git a/src/hotspot/share/gc/z/zMarkStack.inline.hpp b/src/hotspot/share/gc/z/zMarkStack.inline.hpp --- a/src/hotspot/share/gc/z/zMarkStack.inline.hpp +++ b/src/hotspot/share/gc/z/zMarkStack.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMARKSTACK_INLINE_HPP -#define SHARE_GC_Z_ZMARKSTACK_INLINE_HPP +#pragma once #include "gc/z/zMarkStack.hpp" #include "utilities/debug.hpp" @@ -245,5 +244,3 @@ return pop_slow(allocator, stripe, stackp, entry); } - -#endif // SHARE_GC_Z_ZMARKSTACK_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zMarkStackAllocator.hpp b/src/hotspot/share/gc/z/zMarkStackAllocator.hpp --- a/src/hotspot/share/gc/z/zMarkStackAllocator.hpp +++ b/src/hotspot/share/gc/z/zMarkStackAllocator.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMARKSTACKALLOCATOR_HPP -#define SHARE_GC_Z_ZMARKSTACKALLOCATOR_HPP +#pragma once #include "gc/z/zGlobals.hpp" #include "gc/z/zLock.hpp" @@ -64,5 +63,3 @@ ZMarkStackMagazine* alloc_magazine(); void free_magazine(ZMarkStackMagazine* magazine); }; - -#endif // SHARE_GC_Z_ZMARKSTACKALLOCATOR_HPP diff --git a/src/hotspot/share/gc/z/zMarkStackEntry.hpp b/src/hotspot/share/gc/z/zMarkStackEntry.hpp --- a/src/hotspot/share/gc/z/zMarkStackEntry.hpp +++ b/src/hotspot/share/gc/z/zMarkStackEntry.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMARKSTACKENTRY_HPP -#define SHARE_GC_Z_ZMARKSTACKENTRY_HPP +#pragma once #include "gc/z/zBitField.hpp" #include "memory/allocation.hpp" @@ -114,5 +113,3 @@ return field_object_address::decode(_entry); } }; - -#endif // SHARE_GC_Z_ZMARKSTACKENTRY_HPP diff --git a/src/hotspot/share/gc/z/zMarkTerminate.hpp b/src/hotspot/share/gc/z/zMarkTerminate.hpp --- a/src/hotspot/share/gc/z/zMarkTerminate.hpp +++ b/src/hotspot/share/gc/z/zMarkTerminate.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMARKTERMINATE_HPP -#define SHARE_GC_Z_ZMARKTERMINATE_HPP +#pragma once #include "gc/z/zGlobals.hpp" #include "memory/allocation.hpp" @@ -50,5 +49,3 @@ bool enter_stage1(); bool try_exit_stage1(); }; - -#endif // SHARE_GC_Z_ZMARKTERMINATE_HPP diff --git a/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp b/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp --- a/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp +++ b/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMARKTERMINATE_INLINE_HPP -#define SHARE_GC_Z_ZMARKTERMINATE_INLINE_HPP +#pragma once #include "runtime/atomic.hpp" #include "runtime/orderAccess.hpp" @@ -83,5 +82,3 @@ inline bool ZMarkTerminate::try_exit_stage1() { return try_exit_stage(&_nworking_stage1); } - -#endif // SHARE_GC_Z_ZMARKTERMINATE_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zMemory.hpp b/src/hotspot/share/gc/z/zMemory.hpp --- a/src/hotspot/share/gc/z/zMemory.hpp +++ b/src/hotspot/share/gc/z/zMemory.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMEMORY_HPP -#define SHARE_GC_Z_ZMEMORY_HPP +#pragma once #include "gc/z/zList.hpp" #include "memory/allocation.hpp" @@ -57,5 +56,3 @@ uintptr_t alloc_from_back(size_t size); void free(uintptr_t start, size_t size); }; - -#endif // SHARE_GC_Z_ZMEMORY_HPP diff --git a/src/hotspot/share/gc/z/zMemory.inline.hpp b/src/hotspot/share/gc/z/zMemory.inline.hpp --- a/src/hotspot/share/gc/z/zMemory.inline.hpp +++ b/src/hotspot/share/gc/z/zMemory.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMEMORY_INLINE_HPP -#define SHARE_GC_Z_ZMEMORY_INLINE_HPP +#pragma once #include "gc/z/zMemory.hpp" #include "utilities/debug.hpp" @@ -61,5 +60,3 @@ inline void ZMemory::grow_from_back(size_t size) { _end += size; } - -#endif // SHARE_GC_Z_ZMEMORY_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zMessagePort.hpp b/src/hotspot/share/gc/z/zMessagePort.hpp --- a/src/hotspot/share/gc/z/zMessagePort.hpp +++ b/src/hotspot/share/gc/z/zMessagePort.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMESSAGEPORT_HPP -#define SHARE_GC_Z_ZMESSAGEPORT_HPP +#pragma once #include "gc/z/zFuture.hpp" #include "gc/z/zList.hpp" @@ -61,5 +60,3 @@ void wait(); void ack(); }; - -#endif // SHARE_GC_Z_ZMESSAGEPORT_HPP diff --git a/src/hotspot/share/gc/z/zMessagePort.inline.hpp b/src/hotspot/share/gc/z/zMessagePort.inline.hpp --- a/src/hotspot/share/gc/z/zMessagePort.inline.hpp +++ b/src/hotspot/share/gc/z/zMessagePort.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMESSAGEPORT_INLINE_HPP -#define SHARE_GC_Z_ZMESSAGEPORT_INLINE_HPP +#pragma once #include "gc/z/zMessagePort.hpp" #include "gc/z/zFuture.inline.hpp" @@ -173,5 +172,3 @@ inline void ZRendezvousPort::ack() { _port.ack(); } - -#endif // SHARE_GC_Z_ZMESSAGEPORT_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zMetronome.hpp b/src/hotspot/share/gc/z/zMetronome.hpp --- a/src/hotspot/share/gc/z/zMetronome.hpp +++ b/src/hotspot/share/gc/z/zMetronome.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZMETRONOME_HPP -#define SHARE_GC_Z_ZMETRONOME_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/mutex.hpp" @@ -42,5 +41,3 @@ bool wait_for_tick(); void stop(); }; - -#endif // SHARE_GC_Z_ZMETRONOME_HPP diff --git a/src/hotspot/share/gc/z/zNMethodTable.hpp b/src/hotspot/share/gc/z/zNMethodTable.hpp --- a/src/hotspot/share/gc/z/zNMethodTable.hpp +++ b/src/hotspot/share/gc/z/zNMethodTable.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZNMETHODTABLE_HPP -#define SHARE_GC_Z_ZNMETHODTABLE_HPP +#pragma once #include "gc/z/zArray.hpp" #include "gc/z/zGlobals.hpp" @@ -88,5 +87,3 @@ static void unlink(ZWorkers* workers, bool unloading_occurred); static void purge(ZWorkers* workers); }; - -#endif // SHARE_GC_Z_ZNMETHODTABLE_HPP diff --git a/src/hotspot/share/gc/z/zNMethodTableEntry.hpp b/src/hotspot/share/gc/z/zNMethodTableEntry.hpp --- a/src/hotspot/share/gc/z/zNMethodTableEntry.hpp +++ b/src/hotspot/share/gc/z/zNMethodTableEntry.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZNMETHODTABLEENTRY_HPP -#define SHARE_GC_Z_ZNMETHODTABLEENTRY_HPP +#pragma once #include "gc/z/zBitField.hpp" #include "memory/allocation.hpp" @@ -89,5 +88,3 @@ return field_method::decode(_entry); } }; - -#endif // SHARE_GC_Z_ZNMETHODTABLEENTRY_HPP diff --git a/src/hotspot/share/gc/z/zNUMA.hpp b/src/hotspot/share/gc/z/zNUMA.hpp --- a/src/hotspot/share/gc/z/zNUMA.hpp +++ b/src/hotspot/share/gc/z/zNUMA.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZNUMA_HPP -#define SHARE_GC_Z_ZNUMA_HPP +#pragma once #include "memory/allocation.hpp" @@ -44,5 +43,3 @@ static const char* to_string(); }; - -#endif // SHARE_GC_Z_ZNUMA_HPP diff --git a/src/hotspot/share/gc/z/zObjectAllocator.hpp b/src/hotspot/share/gc/z/zObjectAllocator.hpp --- a/src/hotspot/share/gc/z/zObjectAllocator.hpp +++ b/src/hotspot/share/gc/z/zObjectAllocator.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZOBJECTALLOCATOR_HPP -#define SHARE_GC_Z_ZOBJECTALLOCATOR_HPP +#pragma once #include "gc/z/zAllocationFlags.hpp" #include "gc/z/zPage.hpp" @@ -74,5 +73,3 @@ void retire_pages(); }; - -#endif // SHARE_GC_Z_ZOBJECTALLOCATOR_HPP diff --git a/src/hotspot/share/gc/z/zOop.hpp b/src/hotspot/share/gc/z/zOop.hpp --- a/src/hotspot/share/gc/z/zOop.hpp +++ b/src/hotspot/share/gc/z/zOop.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZOOP_HPP -#define SHARE_GC_Z_ZOOP_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oopsHierarchy.hpp" @@ -37,5 +36,3 @@ static oop good(oop); }; - -#endif // SHARE_GC_Z_ZOOP_HPP diff --git a/src/hotspot/share/gc/z/zOop.inline.hpp b/src/hotspot/share/gc/z/zOop.inline.hpp --- a/src/hotspot/share/gc/z/zOop.inline.hpp +++ b/src/hotspot/share/gc/z/zOop.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZOOP_INLINE_HPP -#define SHARE_GC_Z_ZOOP_INLINE_HPP +#pragma once #include "gc/z/zAddress.inline.hpp" #include "gc/z/zOop.hpp" @@ -47,5 +46,3 @@ inline oop ZOop::good(oop o) { return to_oop(ZAddress::good(to_address(o))); } - -#endif // SHARE_GC_Z_ZOOP_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zOopClosures.hpp b/src/hotspot/share/gc/z/zOopClosures.hpp --- a/src/hotspot/share/gc/z/zOopClosures.hpp +++ b/src/hotspot/share/gc/z/zOopClosures.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZOOPCLOSURES_HPP -#define SHARE_GC_Z_ZOOPCLOSURES_HPP +#pragma once #include "memory/iterator.hpp" #include "gc/z/zRootsIterator.hpp" @@ -101,5 +100,3 @@ public: virtual void do_object(oop o); }; - -#endif // SHARE_GC_Z_ZOOPCLOSURES_HPP diff --git a/src/hotspot/share/gc/z/zOopClosures.inline.hpp b/src/hotspot/share/gc/z/zOopClosures.inline.hpp --- a/src/hotspot/share/gc/z/zOopClosures.inline.hpp +++ b/src/hotspot/share/gc/z/zOopClosures.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZOOPCLOSURES_INLINE_HPP -#define SHARE_GC_Z_ZOOPCLOSURES_INLINE_HPP +#pragma once #include "classfile/classLoaderData.hpp" #include "gc/z/zBarrier.inline.hpp" @@ -110,5 +109,3 @@ inline void ZPhantomCleanOopClosure::do_oop(narrowOop* p) { ShouldNotReachHere(); } - -#endif // SHARE_GC_Z_ZOOPCLOSURES_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zPage.hpp b/src/hotspot/share/gc/z/zPage.hpp --- a/src/hotspot/share/gc/z/zPage.hpp +++ b/src/hotspot/share/gc/z/zPage.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZPAGE_HPP -#define SHARE_GC_Z_ZPAGE_HPP +#pragma once #include "gc/z/zForwardingTable.hpp" #include "gc/z/zList.hpp" @@ -126,5 +125,3 @@ void print_on(outputStream* out) const; void print() const; }; - -#endif // SHARE_GC_Z_ZPAGE_HPP diff --git a/src/hotspot/share/gc/z/zPage.inline.hpp b/src/hotspot/share/gc/z/zPage.inline.hpp --- a/src/hotspot/share/gc/z/zPage.inline.hpp +++ b/src/hotspot/share/gc/z/zPage.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZPAGE_INLINE_HPP -#define SHARE_GC_Z_ZPAGE_INLINE_HPP +#pragma once #include "gc/z/zAddress.inline.hpp" #include "gc/z/zForwardingTable.inline.hpp" @@ -355,5 +354,3 @@ old_top = prev_top; } } - -#endif // SHARE_GC_Z_ZPAGE_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zPageAllocator.hpp b/src/hotspot/share/gc/z/zPageAllocator.hpp --- a/src/hotspot/share/gc/z/zPageAllocator.hpp +++ b/src/hotspot/share/gc/z/zPageAllocator.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZPAGEALLOCATOR_HPP -#define SHARE_GC_Z_ZPAGEALLOCATOR_HPP +#pragma once #include "gc/z/zAllocationFlags.hpp" #include "gc/z/zList.hpp" @@ -108,5 +107,3 @@ bool is_alloc_stalled() const; void check_out_of_memory(); }; - -#endif // SHARE_GC_Z_ZPAGEALLOCATOR_HPP diff --git a/src/hotspot/share/gc/z/zPageCache.hpp b/src/hotspot/share/gc/z/zPageCache.hpp --- a/src/hotspot/share/gc/z/zPageCache.hpp +++ b/src/hotspot/share/gc/z/zPageCache.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZPAGECACHE_HPP -#define SHARE_GC_Z_ZPAGECACHE_HPP +#pragma once #include "gc/z/zList.hpp" #include "gc/z/zPage.hpp" @@ -54,5 +53,3 @@ void flush(ZList* to, size_t requested); }; - -#endif // SHARE_GC_Z_ZPAGECACHE_HPP diff --git a/src/hotspot/share/gc/z/zPageCache.inline.hpp b/src/hotspot/share/gc/z/zPageCache.inline.hpp --- a/src/hotspot/share/gc/z/zPageCache.inline.hpp +++ b/src/hotspot/share/gc/z/zPageCache.inline.hpp @@ -21,13 +21,10 @@ * questions. */ -#ifndef SHARE_GC_Z_ZPAGECACHE_INLINE_HPP -#define SHARE_GC_Z_ZPAGECACHE_INLINE_HPP +#pragma once #include "gc/z/zPageCache.hpp" inline size_t ZPageCache::available() const { return _available; } - -#endif // SHARE_GC_Z_ZPAGECACHE_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zPageTable.hpp b/src/hotspot/share/gc/z/zPageTable.hpp --- a/src/hotspot/share/gc/z/zPageTable.hpp +++ b/src/hotspot/share/gc/z/zPageTable.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZPAGETABLE_HPP -#define SHARE_GC_Z_ZPAGETABLE_HPP +#pragma once #include "gc/z/zAddressRangeMap.hpp" #include "gc/z/zGlobals.hpp" @@ -63,5 +62,3 @@ bool next(ZPage** page); }; - -#endif // SHARE_GC_Z_ZPAGETABLE_HPP diff --git a/src/hotspot/share/gc/z/zPageTable.inline.hpp b/src/hotspot/share/gc/z/zPageTable.inline.hpp --- a/src/hotspot/share/gc/z/zPageTable.inline.hpp +++ b/src/hotspot/share/gc/z/zPageTable.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZPAGETABLE_INLINE_HPP -#define SHARE_GC_Z_ZPAGETABLE_INLINE_HPP +#pragma once #include "gc/z/zAddress.inline.hpp" #include "gc/z/zAddressRangeMap.inline.hpp" @@ -55,5 +54,3 @@ // No more pages return false; } - -#endif // SHARE_GC_Z_ZPAGETABLE_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zPageTableEntry.hpp b/src/hotspot/share/gc/z/zPageTableEntry.hpp --- a/src/hotspot/share/gc/z/zPageTableEntry.hpp +++ b/src/hotspot/share/gc/z/zPageTableEntry.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZPAGETABLEENTRY_HPP -#define SHARE_GC_Z_ZPAGETABLEENTRY_HPP +#pragma once #include "gc/z/zBitField.hpp" #include "memory/allocation.hpp" @@ -69,5 +68,3 @@ return field_page::decode(_entry); } }; - -#endif // SHARE_GC_Z_ZPAGETABLEENTRY_HPP diff --git a/src/hotspot/share/gc/z/zPhysicalMemory.hpp b/src/hotspot/share/gc/z/zPhysicalMemory.hpp --- a/src/hotspot/share/gc/z/zPhysicalMemory.hpp +++ b/src/hotspot/share/gc/z/zPhysicalMemory.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZPHYSICALMEMORY_HPP -#define SHARE_GC_Z_ZPHYSICALMEMORY_HPP +#pragma once #include "memory/allocation.hpp" #include OS_CPU_HEADER(gc/z/zPhysicalMemoryBacking) @@ -96,5 +95,3 @@ void unmap(ZPhysicalMemory pmem, uintptr_t offset); void flip(ZPhysicalMemory pmem, uintptr_t offset); }; - -#endif // SHARE_GC_Z_ZPHYSICALMEMORY_HPP diff --git a/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp b/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp --- a/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp +++ b/src/hotspot/share/gc/z/zPhysicalMemory.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZPHYSICALMEMORY_INLINE_HPP -#define SHARE_GC_Z_ZPHYSICALMEMORY_INLINE_HPP +#pragma once #include "gc/z/zPhysicalMemory.hpp" #include "utilities/debug.hpp" @@ -82,5 +81,3 @@ inline size_t ZPhysicalMemoryManager::unused_capacity() const { return _capacity - _used; } - -#endif // SHARE_GC_Z_ZPHYSICALMEMORY_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zPreMappedMemory.hpp b/src/hotspot/share/gc/z/zPreMappedMemory.hpp --- a/src/hotspot/share/gc/z/zPreMappedMemory.hpp +++ b/src/hotspot/share/gc/z/zPreMappedMemory.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZPREMAPPEDMEMORY_HPP -#define SHARE_GC_Z_ZPREMAPPEDMEMORY_HPP +#pragma once #include "gc/z/zPhysicalMemory.hpp" #include "gc/z/zVirtualMemory.hpp" @@ -50,5 +49,3 @@ void clear(); }; - -#endif // SHARE_GC_Z_ZPREMAPPEDMEMORY_HPP diff --git a/src/hotspot/share/gc/z/zPreMappedMemory.inline.hpp b/src/hotspot/share/gc/z/zPreMappedMemory.inline.hpp --- a/src/hotspot/share/gc/z/zPreMappedMemory.inline.hpp +++ b/src/hotspot/share/gc/z/zPreMappedMemory.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZPREMAPPEDMEMORY_INLINE_HPP -#define SHARE_GC_Z_ZPREMAPPEDMEMORY_INLINE_HPP +#pragma once #include "gc/z/zPreMappedMemory.hpp" @@ -41,5 +40,3 @@ inline size_t ZPreMappedMemory::available() const { return _vmem.size(); } - -#endif // SHARE_GC_Z_ZPREMAPPEDMEMORY_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zReferenceProcessor.hpp b/src/hotspot/share/gc/z/zReferenceProcessor.hpp --- a/src/hotspot/share/gc/z/zReferenceProcessor.hpp +++ b/src/hotspot/share/gc/z/zReferenceProcessor.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZREFERENCEPROCESSOR_HPP -#define SHARE_GC_Z_ZREFERENCEPROCESSOR_HPP +#pragma once #include "gc/shared/referenceDiscoverer.hpp" #include "gc/z/zValue.hpp" @@ -79,5 +78,3 @@ void process_references(); void enqueue_references(); }; - -#endif // SHARE_GC_Z_ZREFERENCEPROCESSOR_HPP diff --git a/src/hotspot/share/gc/z/zRelocate.hpp b/src/hotspot/share/gc/z/zRelocate.hpp --- a/src/hotspot/share/gc/z/zRelocate.hpp +++ b/src/hotspot/share/gc/z/zRelocate.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZRELOCATE_HPP -#define SHARE_GC_Z_ZRELOCATE_HPP +#pragma once #include "gc/z/zRelocationSet.hpp" #include "gc/z/zWorkers.hpp" @@ -42,5 +41,3 @@ void start(); bool relocate(ZRelocationSet* relocation_set); }; - -#endif // SHARE_GC_Z_ZRELOCATE_HPP diff --git a/src/hotspot/share/gc/z/zRelocationSet.hpp b/src/hotspot/share/gc/z/zRelocationSet.hpp --- a/src/hotspot/share/gc/z/zRelocationSet.hpp +++ b/src/hotspot/share/gc/z/zRelocationSet.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZRELOCATIONSET_HPP -#define SHARE_GC_Z_ZRELOCATIONSET_HPP +#pragma once #include "memory/allocation.hpp" @@ -69,5 +68,3 @@ ZRelocationSetParallelIterator(ZRelocationSet* relocation_set) : ZRelocationSetIteratorImpl(relocation_set) {} }; - -#endif // SHARE_GC_Z_ZRELOCATIONSET_HPP diff --git a/src/hotspot/share/gc/z/zRelocationSet.inline.hpp b/src/hotspot/share/gc/z/zRelocationSet.inline.hpp --- a/src/hotspot/share/gc/z/zRelocationSet.inline.hpp +++ b/src/hotspot/share/gc/z/zRelocationSet.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZRELOCATIONSET_INLINE_HPP -#define SHARE_GC_Z_ZRELOCATIONSET_INLINE_HPP +#pragma once #include "gc/z/zRelocationSet.hpp" #include "runtime/atomic.hpp" @@ -53,5 +52,3 @@ return false; } - -#endif // SHARE_GC_Z_ZRELOCATIONSET_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zRelocationSetSelector.hpp b/src/hotspot/share/gc/z/zRelocationSetSelector.hpp --- a/src/hotspot/share/gc/z/zRelocationSetSelector.hpp +++ b/src/hotspot/share/gc/z/zRelocationSetSelector.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZRELOCATIONSETSELECTOR_HPP -#define SHARE_GC_Z_ZRELOCATIONSETSELECTOR_HPP +#pragma once #include "gc/z/zArray.hpp" #include "memory/allocation.hpp" @@ -80,5 +79,3 @@ size_t relocating() const; size_t fragmentation() const; }; - -#endif // SHARE_GC_Z_ZRELOCATIONSETSELECTOR_HPP diff --git a/src/hotspot/share/gc/z/zResurrection.hpp b/src/hotspot/share/gc/z/zResurrection.hpp --- a/src/hotspot/share/gc/z/zResurrection.hpp +++ b/src/hotspot/share/gc/z/zResurrection.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZRESURRECTION_HPP -#define SHARE_GC_Z_ZRESURRECTION_HPP +#pragma once #include "memory/allocation.hpp" @@ -35,5 +34,3 @@ static void block(); static void unblock(); }; - -#endif // SHARE_GC_Z_ZRESURRECTION_HPP diff --git a/src/hotspot/share/gc/z/zResurrection.inline.hpp b/src/hotspot/share/gc/z/zResurrection.inline.hpp --- a/src/hotspot/share/gc/z/zResurrection.inline.hpp +++ b/src/hotspot/share/gc/z/zResurrection.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZRESURRECTION_INLINE_HPP -#define SHARE_GC_Z_ZRESURRECTION_INLINE_HPP +#pragma once #include "gc/z/zResurrection.hpp" #include "runtime/orderAccess.hpp" @@ -34,5 +33,3 @@ OrderAccess::loadload(); return blocked; } - -#endif // SHARE_GC_Z_ZRESURRECTION_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zRootsIterator.hpp b/src/hotspot/share/gc/z/zRootsIterator.hpp --- a/src/hotspot/share/gc/z/zRootsIterator.hpp +++ b/src/hotspot/share/gc/z/zRootsIterator.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZROOTSITERATOR_HPP -#define SHARE_GC_Z_ZROOTSITERATOR_HPP +#pragma once #include "gc/shared/oopStorageParState.hpp" #include "gc/shared/suspendibleThreadSet.hpp" @@ -177,5 +176,3 @@ void oops_do(ZRootsIteratorClosure* cl); }; - -#endif // SHARE_GC_Z_ZROOTSITERATOR_HPP diff --git a/src/hotspot/share/gc/z/zRuntimeWorkers.hpp b/src/hotspot/share/gc/z/zRuntimeWorkers.hpp --- a/src/hotspot/share/gc/z/zRuntimeWorkers.hpp +++ b/src/hotspot/share/gc/z/zRuntimeWorkers.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZRUNTIMEWORKERS_HPP -#define SHARE_GC_Z_ZRUNTIMEWORKERS_HPP +#pragma once #include "gc/shared/workgroup.hpp" @@ -40,5 +39,3 @@ void threads_do(ThreadClosure* tc) const; void print_threads_on(outputStream* st) const; }; - -#endif // SHARE_GC_Z_ZRUNTIMEWORKERS_HPP diff --git a/src/hotspot/share/gc/z/zServiceability.hpp b/src/hotspot/share/gc/z/zServiceability.hpp --- a/src/hotspot/share/gc/z/zServiceability.hpp +++ b/src/hotspot/share/gc/z/zServiceability.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZSERVICEABILITY_HPP -#define SHARE_GC_Z_ZSERVICEABILITY_HPP +#pragma once #include "gc/shared/collectorCounters.hpp" #include "memory/allocation.hpp" @@ -102,5 +101,3 @@ typedef ZServiceabilityTracer ZServiceabilityMarkStartTracer; typedef ZServiceabilityTracer ZServiceabilityMarkEndTracer; typedef ZServiceabilityTracer ZServiceabilityRelocateStartTracer; - -#endif // SHARE_GC_Z_ZSERVICEABILITY_HPP diff --git a/src/hotspot/share/gc/z/zStat.hpp b/src/hotspot/share/gc/z/zStat.hpp --- a/src/hotspot/share/gc/z/zStat.hpp +++ b/src/hotspot/share/gc/z/zStat.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZSTAT_HPP -#define SHARE_GC_Z_ZSTAT_HPP +#pragma once #include "gc/shared/concurrentGCThread.hpp" #include "gc/shared/gcTimer.hpp" @@ -523,5 +522,3 @@ static void print(); }; - -#endif // SHARE_GC_Z_ZSTAT_HPP diff --git a/src/hotspot/share/gc/z/zStatTLAB.hpp b/src/hotspot/share/gc/z/zStatTLAB.hpp --- a/src/hotspot/share/gc/z/zStatTLAB.hpp +++ b/src/hotspot/share/gc/z/zStatTLAB.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZSTATTLAB_HPP -#define SHARE_GC_Z_ZSTATTLAB_HPP +#pragma once #include "gc/shared/threadLocalAllocBuffer.hpp" #include "gc/z/zValue.hpp" @@ -38,5 +37,3 @@ static ThreadLocalAllocStats* get(); static void publish(); }; - -#endif // SHARE_GC_Z_ZSTATTLAB_HPP diff --git a/src/hotspot/share/gc/z/zTask.hpp b/src/hotspot/share/gc/z/zTask.hpp --- a/src/hotspot/share/gc/z/zTask.hpp +++ b/src/hotspot/share/gc/z/zTask.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZTASK_HPP -#define SHARE_GC_Z_ZTASK_HPP +#pragma once #include "gc/shared/workgroup.hpp" #include "memory/allocation.hpp" @@ -49,5 +48,3 @@ virtual void work() = 0; }; - -#endif // SHARE_GC_Z_ZTASK_HPP diff --git a/src/hotspot/share/gc/z/zThread.hpp b/src/hotspot/share/gc/z/zThread.hpp --- a/src/hotspot/share/gc/z/zThread.hpp +++ b/src/hotspot/share/gc/z/zThread.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZTHREAD_HPP -#define SHARE_GC_Z_ZTHREAD_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -89,5 +88,3 @@ return _worker_id; } }; - -#endif // SHARE_GC_Z_ZTHREAD_HPP diff --git a/src/hotspot/share/gc/z/zThreadLocalData.hpp b/src/hotspot/share/gc/z/zThreadLocalData.hpp --- a/src/hotspot/share/gc/z/zThreadLocalData.hpp +++ b/src/hotspot/share/gc/z/zThreadLocalData.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZTHREADLOCALDATA_HPP -#define SHARE_GC_Z_ZTHREADLOCALDATA_HPP +#pragma once #include "gc/z/zMarkStack.hpp" #include "gc/z/zGlobals.hpp" @@ -68,5 +67,3 @@ return address_bad_mask_offset() + in_ByteSize(ZNMethodDisarmedOffset); } }; - -#endif // SHARE_GC_Z_ZTHREADLOCALDATA_HPP diff --git a/src/hotspot/share/gc/z/zTracer.hpp b/src/hotspot/share/gc/z/zTracer.hpp --- a/src/hotspot/share/gc/z/zTracer.hpp +++ b/src/hotspot/share/gc/z/zTracer.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZTRACER_HPP -#define SHARE_GC_Z_ZTRACER_HPP +#pragma once #include "gc/shared/gcTrace.hpp" #include "gc/z/zAllocationFlags.hpp" @@ -62,5 +61,3 @@ ZTraceThreadPhase(const char* name); ~ZTraceThreadPhase(); }; - -#endif // SHARE_GC_Z_ZTRACER_HPP diff --git a/src/hotspot/share/gc/z/zTracer.inline.hpp b/src/hotspot/share/gc/z/zTracer.inline.hpp --- a/src/hotspot/share/gc/z/zTracer.inline.hpp +++ b/src/hotspot/share/gc/z/zTracer.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZTRACER_INLINE_HPP -#define SHARE_GC_Z_ZTRACER_INLINE_HPP +#pragma once #include "gc/z/zTracer.hpp" @@ -37,5 +36,3 @@ inline ZTraceThreadPhase::~ZTraceThreadPhase() { ZTracer::tracer()->report_thread_phase(_name, _start, Ticks::now()); } - -#endif // SHARE_GC_Z_ZTRACER_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zUnload.hpp b/src/hotspot/share/gc/z/zUnload.hpp --- a/src/hotspot/share/gc/z/zUnload.hpp +++ b/src/hotspot/share/gc/z/zUnload.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZUNLOAD_HPP -#define SHARE_GC_Z_ZUNLOAD_HPP +#pragma once class ZWorkers; @@ -40,5 +39,3 @@ void unload(); void finish(); }; - -#endif // SHARE_GC_Z_ZUNLOAD_HPP diff --git a/src/hotspot/share/gc/z/zUtils.hpp b/src/hotspot/share/gc/z/zUtils.hpp --- a/src/hotspot/share/gc/z/zUtils.hpp +++ b/src/hotspot/share/gc/z/zUtils.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZUTILS_HPP -#define SHARE_GC_Z_ZUTILS_HPP +#pragma once #include "memory/allocation.hpp" @@ -43,5 +42,3 @@ static size_t object_size(uintptr_t addr); static void object_copy(uintptr_t from, uintptr_t to, size_t size); }; - -#endif // SHARE_GC_Z_ZUTILS_HPP diff --git a/src/hotspot/share/gc/z/zUtils.inline.hpp b/src/hotspot/share/gc/z/zUtils.inline.hpp --- a/src/hotspot/share/gc/z/zUtils.inline.hpp +++ b/src/hotspot/share/gc/z/zUtils.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZUTILS_INLINE_HPP -#define SHARE_GC_Z_ZUTILS_INLINE_HPP +#pragma once #include "gc/z/zOop.inline.hpp" #include "gc/z/zUtils.hpp" @@ -63,5 +62,3 @@ inline void ZUtils::object_copy(uintptr_t from, uintptr_t to, size_t size) { Copy::aligned_disjoint_words((HeapWord*)from, (HeapWord*)to, bytes_to_words(size)); } - -#endif // SHARE_GC_Z_ZUTILS_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zValue.hpp b/src/hotspot/share/gc/z/zValue.hpp --- a/src/hotspot/share/gc/z/zValue.hpp +++ b/src/hotspot/share/gc/z/zValue.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZVALUE_HPP -#define SHARE_GC_Z_ZVALUE_HPP +#pragma once #include "memory/allocation.hpp" #include "gc/z/zCPU.hpp" @@ -319,5 +318,3 @@ ZPerWorkerConstIterator(const ZPerWorker* value) : ZValueConstIterator(value) {} }; - -#endif // SHARE_GC_Z_ZVALUE_HPP diff --git a/src/hotspot/share/gc/z/zVirtualMemory.hpp b/src/hotspot/share/gc/z/zVirtualMemory.hpp --- a/src/hotspot/share/gc/z/zVirtualMemory.hpp +++ b/src/hotspot/share/gc/z/zVirtualMemory.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZVIRTUALMEMORY_HPP -#define SHARE_GC_Z_ZVIRTUALMEMORY_HPP +#pragma once #include "gc/z/zMemory.hpp" #include "memory/allocation.hpp" @@ -62,5 +61,3 @@ ZVirtualMemory alloc(size_t size, bool alloc_from_front = false); void free(ZVirtualMemory vmem); }; - -#endif // SHARE_GC_Z_ZVIRTUALMEMORY_HPP diff --git a/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp b/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp --- a/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp +++ b/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZVIRTUALMEMORY_INLINE_HPP -#define SHARE_GC_Z_ZVIRTUALMEMORY_INLINE_HPP +#pragma once #include "gc/z/zMemory.inline.hpp" #include "gc/z/zVirtualMemory.hpp" @@ -62,5 +61,3 @@ _start = UINTPTR_MAX; _end = UINTPTR_MAX; } - -#endif // SHARE_GC_Z_ZVIRTUALMEMORY_INLINE_HPP diff --git a/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp b/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp --- a/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp +++ b/src/hotspot/share/gc/z/zWeakRootsProcessor.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZWEAKROOTSPROCESSOR_HPP -#define SHARE_GC_Z_ZWEAKROOTSPROCESSOR_HPP +#pragma once #include "gc/z/zValue.hpp" @@ -38,5 +37,3 @@ void process_weak_roots(); void process_concurrent_weak_roots(); }; - -#endif // SHARE_GC_Z_ZWEAKROOTSPROCESSOR_HPP diff --git a/src/hotspot/share/gc/z/zWorkers.hpp b/src/hotspot/share/gc/z/zWorkers.hpp --- a/src/hotspot/share/gc/z/zWorkers.hpp +++ b/src/hotspot/share/gc/z/zWorkers.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZWORKERS_HPP -#define SHARE_GC_Z_ZWORKERS_HPP +#pragma once #include "gc/shared/workgroup.hpp" #include "memory/allocation.hpp" @@ -56,5 +55,3 @@ void threads_do(ThreadClosure* tc) const; void print_threads_on(outputStream* st) const; }; - -#endif // SHARE_GC_Z_ZWORKERS_HPP diff --git a/src/hotspot/share/gc/z/zWorkers.inline.hpp b/src/hotspot/share/gc/z/zWorkers.inline.hpp --- a/src/hotspot/share/gc/z/zWorkers.inline.hpp +++ b/src/hotspot/share/gc/z/zWorkers.inline.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_ZWORKERS_INLINE_HPP -#define SHARE_GC_Z_ZWORKERS_INLINE_HPP +#pragma once #include "gc/z/zWorkers.hpp" #include "utilities/globalDefinitions.hpp" @@ -46,5 +45,3 @@ inline uint ZWorkers::nworkers() const { return MAX2(ParallelGCThreads, ConcGCThreads); } - -#endif // SHARE_GC_Z_ZWORKERS_INLINE_HPP diff --git a/src/hotspot/share/gc/z/z_globals.hpp b/src/hotspot/share/gc/z/z_globals.hpp --- a/src/hotspot/share/gc/z/z_globals.hpp +++ b/src/hotspot/share/gc/z/z_globals.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_GC_Z_Z_GLOBALS_HPP -#define SHARE_GC_Z_Z_GLOBALS_HPP +#pragma once #define GC_Z_FLAGS(develop, \ develop_pd, \ @@ -84,5 +83,3 @@ \ develop(bool, ZVerifyLoadBarriers, false, \ "Verify that reference loads are followed by barriers") - -#endif // SHARE_GC_Z_Z_GLOBALS_HPP diff --git a/src/hotspot/share/interpreter/abstractInterpreter.hpp b/src/hotspot/share/interpreter/abstractInterpreter.hpp --- a/src/hotspot/share/interpreter/abstractInterpreter.hpp +++ b/src/hotspot/share/interpreter/abstractInterpreter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP -#define SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "code/stubs.hpp" @@ -332,5 +331,3 @@ public: AbstractInterpreterGenerator(StubQueue* _code); }; - -#endif // SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP diff --git a/src/hotspot/share/interpreter/bytecode.hpp b/src/hotspot/share/interpreter/bytecode.hpp --- a/src/hotspot/share/interpreter/bytecode.hpp +++ b/src/hotspot/share/interpreter/bytecode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_BYTECODE_HPP -#define SHARE_VM_INTERPRETER_BYTECODE_HPP +#pragma once #include "interpreter/bytecodes.hpp" #include "memory/allocation.hpp" @@ -341,5 +340,3 @@ oop resolve_constant(TRAPS) const; }; - -#endif // SHARE_VM_INTERPRETER_BYTECODE_HPP diff --git a/src/hotspot/share/interpreter/bytecode.inline.hpp b/src/hotspot/share/interpreter/bytecode.inline.hpp --- a/src/hotspot/share/interpreter/bytecode.inline.hpp +++ b/src/hotspot/share/interpreter/bytecode.inline.hpp @@ -22,12 +22,9 @@ * */ -#ifndef SHARE_VM_INTERPRETER_BYTECODE_INLINE_HPP -#define SHARE_VM_INTERPRETER_BYTECODE_INLINE_HPP +#pragma once #include "interpreter/bytecode.hpp" #include "oops/cpCache.inline.hpp" inline bool Bytecode_invoke::has_appendix() { return cpcache_entry()->has_appendix(); } - -#endif // SHARE_VM_INTERPRETER_BYTECODE_INLINE_HPP diff --git a/src/hotspot/share/interpreter/bytecodeHistogram.hpp b/src/hotspot/share/interpreter/bytecodeHistogram.hpp --- a/src/hotspot/share/interpreter/bytecodeHistogram.hpp +++ b/src/hotspot/share/interpreter/bytecodeHistogram.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_BYTECODEHISTOGRAM_HPP -#define SHARE_VM_INTERPRETER_BYTECODEHISTOGRAM_HPP +#pragma once #include "interpreter/bytecodes.hpp" #include "memory/allocation.hpp" @@ -94,5 +93,3 @@ // Profile printing static void print(float cutoff = 0.01F) PRODUCT_RETURN; // cutoff in percent }; - -#endif // SHARE_VM_INTERPRETER_BYTECODEHISTOGRAM_HPP diff --git a/src/hotspot/share/interpreter/bytecodeInterpreter.hpp b/src/hotspot/share/interpreter/bytecodeInterpreter.hpp --- a/src/hotspot/share/interpreter/bytecodeInterpreter.hpp +++ b/src/hotspot/share/interpreter/bytecodeInterpreter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_HPP -#define SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/methodData.hpp" @@ -583,5 +582,3 @@ }; // BytecodeInterpreter #endif // CC_INTERP - -#endif // SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_HPP diff --git a/src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp b/src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp --- a/src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp +++ b/src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP -#define SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP +#pragma once #include "interpreter/bytecodeInterpreter.hpp" #include "runtime/stubRoutines.hpp" @@ -50,5 +49,3 @@ #endif #endif // CC_INTERP - -#endif // SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP diff --git a/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp b/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp --- a/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp +++ b/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp @@ -27,8 +27,7 @@ // for updating a method's methodData object. -#ifndef SHARE_VM_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP -#define SHARE_VM_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP +#pragma once #ifdef CC_INTERP @@ -55,5 +54,3 @@ #define BI_PROFILE_UPDATE_SWITCH(switch_index) #endif // CC_INTERP - -#endif // SHARE_VM_INTERPRETER_BYTECODECINTERPRETERPROFILING_HPP diff --git a/src/hotspot/share/interpreter/bytecodeStream.hpp b/src/hotspot/share/interpreter/bytecodeStream.hpp --- a/src/hotspot/share/interpreter/bytecodeStream.hpp +++ b/src/hotspot/share/interpreter/bytecodeStream.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_BYTECODESTREAM_HPP -#define SHARE_VM_INTERPRETER_BYTECODESTREAM_HPP +#pragma once #include "interpreter/bytecode.hpp" #include "memory/allocation.hpp" @@ -226,5 +225,3 @@ return bytecode().get_index_u4(raw_code()); } bool has_index_u4() const { return bytecode().has_index_u4(raw_code()); } }; - -#endif // SHARE_VM_INTERPRETER_BYTECODESTREAM_HPP diff --git a/src/hotspot/share/interpreter/bytecodeTracer.hpp b/src/hotspot/share/interpreter/bytecodeTracer.hpp --- a/src/hotspot/share/interpreter/bytecodeTracer.hpp +++ b/src/hotspot/share/interpreter/bytecodeTracer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_BYTECODETRACER_HPP -#define SHARE_VM_INTERPRETER_BYTECODETRACER_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/ostream.hpp" @@ -61,5 +60,3 @@ virtual void trace(const methodHandle& method, address bcp, uintptr_t tos, uintptr_t tos2, outputStream* st) = 0; virtual void trace(const methodHandle& method, address bcp, outputStream* st) = 0; }; - -#endif // SHARE_VM_INTERPRETER_BYTECODETRACER_HPP diff --git a/src/hotspot/share/interpreter/bytecodes.hpp b/src/hotspot/share/interpreter/bytecodes.hpp --- a/src/hotspot/share/interpreter/bytecodes.hpp +++ b/src/hotspot/share/interpreter/bytecodes.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_BYTECODES_HPP -#define SHARE_VM_INTERPRETER_BYTECODES_HPP +#pragma once #include "memory/allocation.hpp" @@ -441,5 +440,3 @@ // Initialization static void initialize (); }; - -#endif // SHARE_VM_INTERPRETER_BYTECODES_HPP diff --git a/src/hotspot/share/interpreter/cppInterpreter.hpp b/src/hotspot/share/interpreter/cppInterpreter.hpp --- a/src/hotspot/share/interpreter/cppInterpreter.hpp +++ b/src/hotspot/share/interpreter/cppInterpreter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_CPPINTERPRETER_HPP -#define SHARE_VM_INTERPRETER_CPPINTERPRETER_HPP +#pragma once #include "interpreter/abstractInterpreter.hpp" #include "utilities/macros.hpp" @@ -69,5 +68,3 @@ }; #endif // CC_INTERP - -#endif // SHARE_VM_INTERPRETER_CPPINTERPRETER_HPP diff --git a/src/hotspot/share/interpreter/cppInterpreterGenerator.hpp b/src/hotspot/share/interpreter/cppInterpreterGenerator.hpp --- a/src/hotspot/share/interpreter/cppInterpreterGenerator.hpp +++ b/src/hotspot/share/interpreter/cppInterpreterGenerator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_CPPINTERPRETERGENERATOR_HPP -#define SHARE_VM_INTERPRETER_CPPINTERPRETERGENERATOR_HPP +#pragma once // This file contains the platform-independent parts // of the template interpreter generator. @@ -75,4 +74,3 @@ }; #endif // CC_INTERP -#endif // SHARE_VM_INTERPRETER_CPPINTERPRETERGENERATOR_HPP diff --git a/src/hotspot/share/interpreter/interp_masm.hpp b/src/hotspot/share/interpreter/interp_masm.hpp --- a/src/hotspot/share/interpreter/interp_masm.hpp +++ b/src/hotspot/share/interpreter/interp_masm.hpp @@ -22,12 +22,9 @@ * */ -#ifndef SHARE_VM_INTERPRETER_INTERP_MASM_HPP -#define SHARE_VM_INTERPRETER_INTERP_MASM_HPP +#pragma once #include "asm/macroAssembler.hpp" #include "utilities/macros.hpp" #include CPU_HEADER(interp_masm) - -#endif // SHARE_VM_INTERPRETER_INTERP_MASM_HPP diff --git a/src/hotspot/share/interpreter/interpreter.hpp b/src/hotspot/share/interpreter/interpreter.hpp --- a/src/hotspot/share/interpreter/interpreter.hpp +++ b/src/hotspot/share/interpreter/interpreter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_INTERPRETER_HPP -#define SHARE_VM_INTERPRETER_INTERPRETER_HPP +#pragma once #include "code/stubs.hpp" #include "interpreter/cppInterpreter.hpp" @@ -118,5 +117,3 @@ // the c++ interpreter or the template interpreter. typedef CC_INTERP_ONLY(CppInterpreter) NOT_CC_INTERP(TemplateInterpreter) Interpreter; - -#endif // SHARE_VM_INTERPRETER_INTERPRETER_HPP diff --git a/src/hotspot/share/interpreter/interpreterRuntime.hpp b/src/hotspot/share/interpreter/interpreterRuntime.hpp --- a/src/hotspot/share/interpreter/interpreterRuntime.hpp +++ b/src/hotspot/share/interpreter/interpreterRuntime.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_INTERPRETERRUNTIME_HPP -#define SHARE_VM_INTERPRETER_INTERPRETERRUNTIME_HPP +#pragma once #include "interpreter/bytecode.hpp" #include "interpreter/linkResolver.hpp" @@ -195,5 +194,3 @@ static void add(const methodHandle& method); static void add(uint64_t fingerprint, address handler); }; - -#endif // SHARE_VM_INTERPRETER_INTERPRETERRUNTIME_HPP diff --git a/src/hotspot/share/interpreter/invocationCounter.hpp b/src/hotspot/share/interpreter/invocationCounter.hpp --- a/src/hotspot/share/interpreter/invocationCounter.hpp +++ b/src/hotspot/share/interpreter/invocationCounter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_INVOCATIONCOUNTER_HPP -#define SHARE_VM_INTERPRETER_INVOCATIONCOUNTER_HPP +#pragma once #include "runtime/handles.hpp" #include "utilities/exceptions.hpp" @@ -151,6 +150,3 @@ if (c > 0 && new_count == 0) new_count = 1; set(state(), new_count); } - - -#endif // SHARE_VM_INTERPRETER_INVOCATIONCOUNTER_HPP diff --git a/src/hotspot/share/interpreter/linkResolver.hpp b/src/hotspot/share/interpreter/linkResolver.hpp --- a/src/hotspot/share/interpreter/linkResolver.hpp +++ b/src/hotspot/share/interpreter/linkResolver.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_LINKRESOLVER_HPP -#define SHARE_VM_INTERPRETER_LINKRESOLVER_HPP +#pragma once #include "oops/method.hpp" @@ -362,4 +361,3 @@ const methodHandle& selected_method, Klass *recv_klass, TRAPS); }; -#endif // SHARE_VM_INTERPRETER_LINKRESOLVER_HPP diff --git a/src/hotspot/share/interpreter/oopMapCache.hpp b/src/hotspot/share/interpreter/oopMapCache.hpp --- a/src/hotspot/share/interpreter/oopMapCache.hpp +++ b/src/hotspot/share/interpreter/oopMapCache.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_OOPMAPCACHE_HPP -#define SHARE_VM_INTERPRETER_OOPMAPCACHE_HPP +#pragma once #include "oops/generateOopMap.hpp" #include "runtime/mutex.hpp" @@ -176,5 +175,3 @@ static void compute_one_oop_map(const methodHandle& method, int bci, InterpreterOopMap* entry); static void cleanup_old_entries(); }; - -#endif // SHARE_VM_INTERPRETER_OOPMAPCACHE_HPP diff --git a/src/hotspot/share/interpreter/rewriter.hpp b/src/hotspot/share/interpreter/rewriter.hpp --- a/src/hotspot/share/interpreter/rewriter.hpp +++ b/src/hotspot/share/interpreter/rewriter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_REWRITER_HPP -#define SHARE_VM_INTERPRETER_REWRITER_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/growableArray.hpp" @@ -212,5 +211,3 @@ // Driver routine: static void rewrite(InstanceKlass* klass, TRAPS); }; - -#endif // SHARE_VM_INTERPRETER_REWRITER_HPP diff --git a/src/hotspot/share/interpreter/templateInterpreter.hpp b/src/hotspot/share/interpreter/templateInterpreter.hpp --- a/src/hotspot/share/interpreter/templateInterpreter.hpp +++ b/src/hotspot/share/interpreter/templateInterpreter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_TEMPLATEINTERPRETER_HPP -#define SHARE_VM_INTERPRETER_TEMPLATEINTERPRETER_HPP +#pragma once #include "interpreter/abstractInterpreter.hpp" #include "interpreter/templateTable.hpp" @@ -195,5 +194,3 @@ }; #endif // !CC_INTERP - -#endif // SHARE_VM_INTERPRETER_TEMPLATEINTERPRETER_HPP diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp --- a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp +++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP -#define SHARE_VM_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP +#pragma once // This file contains the platform-independent parts // of the template interpreter generator. @@ -128,5 +127,3 @@ }; #endif // !CC_INTERP - -#endif // SHARE_VM_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP diff --git a/src/hotspot/share/interpreter/templateTable.hpp b/src/hotspot/share/interpreter/templateTable.hpp --- a/src/hotspot/share/interpreter/templateTable.hpp +++ b/src/hotspot/share/interpreter/templateTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_INTERPRETER_TEMPLATETABLE_HPP -#define SHARE_VM_INTERPRETER_TEMPLATETABLE_HPP +#pragma once #include "interpreter/bytecodes.hpp" #include "memory/allocation.hpp" @@ -356,5 +355,3 @@ }; #endif /* !CC_INTERP */ - -#endif // SHARE_VM_INTERPRETER_TEMPLATETABLE_HPP diff --git a/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp b/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp --- a/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp +++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_JFRDCMDS_HPP -#define SHARE_VM_JFR_JFRDCMDS_HPP +#pragma once #include "services/diagnosticCommand.hpp" @@ -171,5 +170,3 @@ }; bool register_jfr_dcmds(); - -#endif // SHARE_VM_JFR_JFRDCMDS_HPP diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp --- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp +++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP -#define SHARE_VM_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/exceptions.hpp" @@ -41,5 +40,3 @@ static void set_force_instrumentation(bool force_instrumentation); static bool is_force_instrumentation(); }; - -#endif // SHARE_VM_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP diff --git a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp --- a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp +++ b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP -#define SHARE_VM_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" @@ -37,5 +36,3 @@ public: static void retransform_classes(JNIEnv* env, jobjectArray classes, TRAPS); }; - -#endif // SHARE_VM_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP diff --git a/src/hotspot/share/jfr/jfr.hpp b/src/hotspot/share/jfr/jfr.hpp --- a/src/hotspot/share/jfr/jfr.hpp +++ b/src/hotspot/share/jfr/jfr.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_JFR_HPP -#define SHARE_VM_JFR_JFR_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -54,5 +53,3 @@ static bool on_start_flight_recording_option(const JavaVMOption** option, char* delimiter); static void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f); }; - -#endif // SHARE_VM_JFR_JFR_HPP diff --git a/src/hotspot/share/jfr/jfrEvents.hpp b/src/hotspot/share/jfr/jfrEvents.hpp --- a/src/hotspot/share/jfr/jfrEvents.hpp +++ b/src/hotspot/share/jfr/jfrEvents.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_JFREVENTS_HPP -#define SHARE_VM_JFR_JFREVENTS_HPP +#pragma once /* * Declare your event in jfr/metadata/metadata.xml. * @@ -31,5 +30,3 @@ */ #include "jfrfiles/jfrEventClasses.hpp" #include "jfrfiles/jfrEventIds.hpp" - -#endif // SHARE_VM_JFR_JFREVENTS_HPP diff --git a/src/hotspot/share/jfr/jni/jfrGetAllEventClasses.hpp b/src/hotspot/share/jfr/jni/jfrGetAllEventClasses.hpp --- a/src/hotspot/share/jfr/jni/jfrGetAllEventClasses.hpp +++ b/src/hotspot/share/jfr/jni/jfrGetAllEventClasses.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_JFR_JNI_JFRGETALLEVENTCLASSES_HPP -#define SHARE_VM_JFR_JNI_JFRGETALLEVENTCLASSES_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -37,5 +36,3 @@ static jlong unloaded_event_classes_count(); static jobject get_all_event_classes(TRAPS); }; - -#endif // SHARE_VM_JFR_JNI_JFRGETALLEVENTCLASSES_HPP diff --git a/src/hotspot/share/jfr/jni/jfrJavaCall.hpp b/src/hotspot/share/jfr/jni/jfrJavaCall.hpp --- a/src/hotspot/share/jfr/jni/jfrJavaCall.hpp +++ b/src/hotspot/share/jfr/jni/jfrJavaCall.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_JNI_JFRJAVACALL_HPP -#define SHARE_VM_JFR_JNI_JFRJAVACALL_HPP +#pragma once #include "jni.h" #include "jfr/utilities/jfrAllocation.hpp" @@ -130,5 +129,3 @@ static void call_special(JfrJavaArguments* args, TRAPS); static void call_virtual(JfrJavaArguments* args, TRAPS); }; - -#endif // SHARE_VM_JFR_JNI_JFRJAVACALL_HPP diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp --- a/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp +++ b/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_JNI_JFRJAVASUPPORT_HPP -#define SHARE_VM_JFR_JNI_JFRJAVASUPPORT_HPP +#pragma once #include "jfr/jni/jfrJavaCall.hpp" #include "utilities/exceptions.hpp" @@ -110,5 +109,3 @@ static CAUSE _cause; static void set_cause(jthrowable throwable, Thread* t); }; - -#endif // SHARE_VM_JFR_JNI_JFRJAVASUPPORT_HPP diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp --- a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp +++ b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_JNI_JFRJNIMETHOD_HPP -#define SHARE_VM_JFR_JNI_JFRJNIMETHOD_HPP +#pragma once #include "jni.h" @@ -135,5 +134,3 @@ #ifdef __cplusplus } #endif - -#endif // SHARE_VM_JFR_JNI_JFRJNIMETHOD_HPP diff --git a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.hpp b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.hpp --- a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.hpp +++ b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP -#define SHARE_VM_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -35,5 +34,3 @@ public: JfrJniMethodRegistration(JNIEnv* env); }; - -#endif // SHARE_VM_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP diff --git a/src/hotspot/share/jfr/jni/jfrUpcalls.hpp b/src/hotspot/share/jfr/jni/jfrUpcalls.hpp --- a/src/hotspot/share/jfr/jni/jfrUpcalls.hpp +++ b/src/hotspot/share/jfr/jni/jfrUpcalls.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_JNI_JFRUPCALLS_HPP -#define SHARE_VM_JFR_JNI_JFRUPCALLS_HPP +#pragma once #include "jni.h" #include "jfr/utilities/jfrAllocation.hpp" @@ -54,5 +53,3 @@ unsigned char** new_class_data, TRAPS); }; - -#endif // SHARE_VM_JFR_JNI_JFRUPCALLS_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.hpp b/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.hpp --- a/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.hpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP -#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP +#pragma once #include "memory/iterator.hpp" #include "oops/oop.hpp" @@ -69,5 +68,3 @@ virtual void do_oop(oop* ref); virtual void do_oop(narrowOop* ref); }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/chains/bitset.hpp b/src/hotspot/share/jfr/leakprofiler/chains/bitset.hpp --- a/src/hotspot/share/jfr/leakprofiler/chains/bitset.hpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/bitset.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_BITSET_HPP -#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_BITSET_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oopsHierarchy.hpp" @@ -75,5 +74,3 @@ return _bits.at(bit); } }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_BITSET_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp b/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp --- a/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP -#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP +#pragma once #include "memory/iterator.hpp" #include "oops/oop.hpp" @@ -61,5 +60,3 @@ virtual void do_oop(oop* ref); virtual void do_oop(narrowOop* ref); }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/chains/edge.hpp b/src/hotspot/share/jfr/leakprofiler/chains/edge.hpp --- a/src/hotspot/share/jfr/leakprofiler/chains/edge.hpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/edge.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGE_HPP -#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGE_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oopsHierarchy.hpp" @@ -55,5 +54,3 @@ return here; } }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGE_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp b/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp --- a/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP -#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP +#pragma once #include "memory/allocation.hpp" #include "jfr/leakprofiler/chains/edge.hpp" @@ -56,5 +55,3 @@ size_t live_set() const; size_t sizeof_edge() const; // with alignments }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.hpp b/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.hpp --- a/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.hpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LEAKPROFILER_CHAINS_EDGESTORE_HPP -#define SHARE_VM_LEAKPROFILER_CHAINS_EDGESTORE_HPP +#pragma once #include "jfr/utilities/jfrHashtable.hpp" #include "jfr/leakprofiler/chains/edge.hpp" @@ -115,5 +114,3 @@ template void iterate_edges(T& functor) const { _edges->iterate_value(functor); } }; - -#endif // SHARE_VM_LEAKPROFILER_CHAINS_EDGESTORE_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp b/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp --- a/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LEAKPROFILER_CHAINS_EDGEUTILS_HPP -#define SHARE_VM_LEAKPROFILER_CHAINS_EDGEUTILS_HPP +#pragma once #include "memory/allocation.hpp" @@ -47,5 +46,3 @@ static void collapse_chain(const RoutableEdge& edge); }; - -#endif // SHARE_VM_LEAKPROFILER_CHAINS_EDGEUTILS_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp b/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp --- a/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP -#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/markOop.hpp" @@ -77,5 +76,3 @@ assert(NULL == obj->mark(), "invariant"); } }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.hpp b/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.hpp --- a/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.hpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP -#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP +#pragma once #include "memory/iterator.hpp" #include "oops/oop.hpp" @@ -42,5 +41,3 @@ virtual void do_oop(oop* reference); virtual void do_oop(narrowOop* reference); }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP -#define SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/exceptions.hpp" @@ -47,5 +46,3 @@ WriteObjectSampleStacktrace(JfrStackTraceRepository& repo); bool process(); }; - -#endif // SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP -#define SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP +#pragma once #define OBJECT_SAMPLE_DESCRIPTION_BUFFER_SIZE 100 @@ -70,5 +69,3 @@ void print_description(outputStream* out); const char* description(); }; - -#endif // SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleWriter.hpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleWriter.hpp --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleWriter.hpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleWriter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP -#define SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP +#pragma once #include "memory/allocation.hpp" @@ -46,5 +45,3 @@ bool operator()(const RoutableEdge& edge); }; - -#endif // SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP -#define SHARE_VM_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP +#pragma once #include "memory/allocation.hpp" #include "jfr/leakprofiler/utilities/rootType.hpp" @@ -48,5 +47,3 @@ public: static void resolve(RootCallback& callback); }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp b/src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp --- a/src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp +++ b/src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LEAKPROFILER_EMITEVENTOPERATION_HPP -#define SHARE_VM_LEAKPROFILER_EMITEVENTOPERATION_HPP +#pragma once #include "runtime/vmOperations.hpp" @@ -67,5 +66,3 @@ virtual void doit(); }; - -#endif // SHARE_VM_LEAKPROFILER_EMITEVENTOPERATION_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp b/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp --- a/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp +++ b/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_LEAKPROFILER_HPP -#define SHARE_VM_JFR_LEAKPROFILER_LEAKPROFILER_HPP +#pragma once #include "memory/allocation.hpp" @@ -63,5 +62,3 @@ // Called by GC static void oops_do(BoolObjectClosure* is_alive, OopClosure* f); }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_LEAKPROFILER_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp --- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp +++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP -#define SHARE_VM_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP +#pragma once #include "jfr/recorder/checkpoint/jfrCheckpointBlob.hpp" #include "jfr/utilities/jfrAllocation.hpp" @@ -245,5 +244,3 @@ } } }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp --- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp +++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP -#define SHARE_VM_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP +#pragma once #include "memory/allocation.hpp" #include "jfr/utilities/jfrTime.hpp" @@ -75,5 +74,3 @@ void set_last_resolved(const ObjectSample* sample); const JfrTicks& last_sweep() const; }; - -#endif // SHARE_VM_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/sampleList.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/sampleList.hpp --- a/src/hotspot/share/jfr/leakprofiler/sampling/sampleList.hpp +++ b/src/hotspot/share/jfr/leakprofiler/sampling/sampleList.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP -#define SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" #include "jfr/utilities/jfrDoublyLinkedList.hpp" @@ -60,5 +59,3 @@ bool is_full() const; size_t count() const; }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/sampling/samplePriorityQueue.hpp b/src/hotspot/share/jfr/leakprofiler/sampling/samplePriorityQueue.hpp --- a/src/hotspot/share/jfr/leakprofiler/sampling/samplePriorityQueue.hpp +++ b/src/hotspot/share/jfr/leakprofiler/sampling/samplePriorityQueue.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP -#define SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP +#pragma once #include "memory/allocation.hpp" @@ -54,5 +53,3 @@ size_t total() const; int count() const; }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/startOperation.hpp b/src/hotspot/share/jfr/leakprofiler/startOperation.hpp --- a/src/hotspot/share/jfr/leakprofiler/startOperation.hpp +++ b/src/hotspot/share/jfr/leakprofiler/startOperation.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LEAKPROFILER_STARTOPERATION_HPP -#define SHARE_VM_LEAKPROFILER_STARTOPERATION_HPP +#pragma once #include "jfr/recorder/jfrRecorder.hpp" #include "jfr/leakprofiler/leakProfiler.hpp" @@ -56,5 +55,3 @@ log_trace(jfr, system)( "Object sampling started"); } }; - -#endif // SHARE_VM_LEAKPROFILER_STARTOPERATION_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/stopOperation.hpp b/src/hotspot/share/jfr/leakprofiler/stopOperation.hpp --- a/src/hotspot/share/jfr/leakprofiler/stopOperation.hpp +++ b/src/hotspot/share/jfr/leakprofiler/stopOperation.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LEAKPROFILER_STOPOPERATION_HPP -#define SHARE_VM_LEAKPROFILER_STOPOPERATION_HPP +#pragma once #include "jfr/leakprofiler/leakProfiler.hpp" #include "jfr/leakprofiler/sampling/objectSampler.hpp" @@ -52,5 +51,3 @@ log_trace(jfr, system)( "Object sampling stopped"); } }; - -#endif // SHARE_VM_LEAKPROFILER_STOPOPERATION_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp b/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp --- a/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp +++ b/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP -#define SHARE_VM_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP +#pragma once #include "jfr/utilities/jfrTime.hpp" #include "memory/allocation.hpp" @@ -42,5 +41,3 @@ static const JfrTicks& end_time(); static bool is_finished(); }; - -#endif // SHARE_VM_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp b/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp --- a/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp +++ b/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP -#define SHARE_VM_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -105,5 +104,3 @@ return NULL; } }; - -#endif // SHARE_VM_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.hpp b/src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.hpp --- a/src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.hpp +++ b/src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP -#define SHARE_VM_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/iterator.hpp" @@ -124,5 +123,3 @@ SaveRestoreCLDClaimBits(); ~SaveRestoreCLDClaimBits(); }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP diff --git a/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp b/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp --- a/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp +++ b/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP -#define SHARE_VM_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP +#pragma once #include "oops/oop.inline.hpp" @@ -52,5 +51,3 @@ } }; - -#endif // SHARE_VM_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP diff --git a/src/hotspot/share/jfr/metadata/jfrSerializer.hpp b/src/hotspot/share/jfr/metadata/jfrSerializer.hpp --- a/src/hotspot/share/jfr/metadata/jfrSerializer.hpp +++ b/src/hotspot/share/jfr/metadata/jfrSerializer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_METADATA_JFRSERIALIZER_HPP -#define SHARE_VM_JFR_METADATA_JFRSERIALIZER_HPP +#pragma once #include "memory/allocation.hpp" #include "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp" @@ -96,5 +95,3 @@ * * Please see jfr/recorder/checkpoint/types/jfrType.cpp for reference. */ - -#endif // SHARE_VM_JFR_METADATA_JFRSERIALIZER_HPP diff --git a/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp b/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp --- a/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp +++ b/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_EVENT_JFRMODULEEVENT_HPP -#define SHARE_VM_JFR_EVENT_JFRMODULEEVENT_HPP +#pragma once #include "memory/allocation.hpp" @@ -32,5 +31,3 @@ static void generate_module_dependency_events(); static void generate_module_export_events(); }; - -#endif // SHARE_VM_JFR_EVENT_JFRMODULEEVENT_HPP diff --git a/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp b/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp --- a/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp +++ b/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP -#define SHARE_VM_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP +#pragma once #include "memory/allocation.hpp" @@ -34,5 +33,3 @@ static void destroy(); static void send_events(); }; - -#endif // SHARE_VM_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP diff --git a/src/hotspot/share/jfr/periodic/jfrOSInterface.hpp b/src/hotspot/share/jfr/periodic/jfrOSInterface.hpp --- a/src/hotspot/share/jfr/periodic/jfrOSInterface.hpp +++ b/src/hotspot/share/jfr/periodic/jfrOSInterface.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_PERIODIC_JFROSINTERFACE_HPP -#define SHARE_VM_JFR_PERIODIC_JFROSINTERFACE_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" @@ -56,5 +55,3 @@ static int system_processes(SystemProcess** system_processes, int* no_of_sys_processes); static int network_utilization(NetworkInterface** network_interfaces); }; - -#endif // SHARE_VM_JFR_PERIODIC_JFROSINTERFACE_HPP diff --git a/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp b/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp --- a/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp +++ b/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_PERIODIC_JFRTHREADCPULOAD_HPP -#define SHARE_VM_JFR_PERIODIC_JFRTHREADCPULOAD_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -40,6 +39,3 @@ static void send_events(); static void send_event_for_thread(JavaThread* jt); }; - -#endif // SHARE_VM_JFR_PERIODIC_JFRTHREADCPULOAD_HPP - diff --git a/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp b/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp --- a/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp +++ b/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_PERIODIC_JFRDCMDEVENT_HPP -#define SHARE_VM_JFR_PERIODIC_JFRDCMDEVENT_HPP +#pragma once #include "memory/allocation.hpp" @@ -35,5 +34,3 @@ // caller needs ResourceMark static const char* thread_dump(); }; - -#endif // SHARE_VM_JFR_PERIODIC_JFRDCMDEVENT_HPP diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp --- a/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp +++ b/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_ENGINE_SAMPLING_JFRCALLTRACE_HPP -#define SHARE_VM_JFR_ENGINE_SAMPLING_JFRCALLTRACE_HPP +#pragma once #include "memory/allocation.hpp" @@ -41,5 +40,3 @@ bool find_top_frame(frame& topframe, Method** method, frame& first_frame); bool get_topframe(void* ucontext, frame& top); }; - -#endif // SHARE_VM_JFR_ENGINE_SAMPLING_JFRCALLTRACE_HPP diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp --- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp +++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP -#define SHARE_VM_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" @@ -51,5 +50,3 @@ static void set_native_sample_interval(size_t period); static void on_javathread_suspend(JavaThread* thread); }; - -#endif // SHARE_VM_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP -#define SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" #include "jfr/utilities/jfrRefCountPointer.hpp" @@ -55,5 +54,3 @@ void set_next(const JfrCheckpointBlobHandle& ref); static JfrCheckpointBlobHandle make(const u1* checkpoint, size_t size); }; - -#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP -#define SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP +#pragma once #include "jfr/recorder/storage/jfrBuffer.hpp" #include "jfr/recorder/storage/jfrMemorySpace.hpp" @@ -104,5 +103,3 @@ template class, typename> friend class JfrMemorySpace; }; - -#endif //SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP -#define SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP +#pragma once #include "jfr/recorder/checkpoint/jfrCheckpointBlob.hpp" #include "jfr/recorder/storage/jfrBuffer.hpp" @@ -84,5 +83,3 @@ JfrCheckpointBlobHandle copy(const JfrCheckpointContext* ctx = NULL); JfrCheckpointBlobHandle move(const JfrCheckpointContext* ctx = NULL); }; - -#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP -#define SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -42,5 +41,3 @@ static size_t write(JfrChunkWriter& writer, jlong metadata_offset); static void update(jbyteArray metadata); }; - -#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP -#define SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP +#pragma once #include "jni.h" #include "jfr/utilities/jfrAllocation.hpp" @@ -61,5 +60,3 @@ static traceid thread_group_id(JavaThread* thread); static traceid thread_group_id(const JavaThread* thread, Thread* current); }; - -#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP -#define SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP +#pragma once #include "memory/allocation.hpp" @@ -33,5 +32,3 @@ public: static void serialize(JfrCheckpointWriter& writer); }; - -#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPE_HPP -#define SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPE_HPP +#pragma once #include "jfr/metadata/jfrSerializer.hpp" @@ -134,5 +133,3 @@ JfrThreadConstant(JavaThread* jt) : _thread(jt) {} void serialize(JfrCheckpointWriter& writer); }; - -#endif // SHARE_VM_JFR_CHECKPOINT_CONSTANT_JFRCONSTANT_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP -#define SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" @@ -40,5 +39,3 @@ static void create_thread_checkpoint(JavaThread* jt); static void write_thread_checkpoint(JavaThread* jt); }; - -#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP -#define SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" @@ -69,5 +68,3 @@ static void write_symbol_constants(JfrCheckpointWriter* writer, JfrCheckpointWriter* leakp_writer); static void serialize(JfrCheckpointWriter* writer, JfrCheckpointWriter* leakp_writer, bool class_unload); }; - -#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP -#define SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP +#pragma once #include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp" #include "jfr/utilities/jfrAllocation.hpp" @@ -372,5 +371,3 @@ return true; } }; - -#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetWriter.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetWriter.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetWriter.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetWriter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP -#define SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP +#pragma once #include "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp" #include "jfr/utilities/jfrTypes.hpp" @@ -104,5 +103,3 @@ return _predicate(value) ? Parent::operator()(value) : 0; } }; - -#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_HPP -#define SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_HPP +#pragma once #include "jni.h" #include "jfr/utilities/jfrTypes.hpp" @@ -124,5 +123,3 @@ static void tag_as_event_host(const Klass* k); static void tag_as_event_host(const jclass jc); }; - -#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTYPEIDS_INLINE_HPP -#define SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTYPEIDS_INLINE_HPP +#pragma once #include "classfile/classLoaderData.hpp" #include "classfile/moduleEntry.hpp" @@ -148,5 +147,3 @@ SET_TAG(k, EVENT_HOST_KLASS); assert(IS_EVENT_HOST_KLASS(k), "invariant"); } - -#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTYPEIDS_INLINE_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBITS_INLINE_HPP -#define SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBITS_INLINE_HPP +#pragma once #include "jfr/utilities/jfrTypes.hpp" #include "runtime/atomic.hpp" @@ -105,6 +104,3 @@ inline void set_leakp_traceid_mask(jbyte mask, traceid* dest) { set_mask(mask, ((jbyte*)dest) + leakp_offset); } - -#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBITS_INLINE_HPP - diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDEPOCH_HPP -#define SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDEPOCH_HPP +#pragma once #include "memory/allocation.hpp" #include "jfr/utilities/jfrTypes.hpp" @@ -99,5 +98,3 @@ return _epoch_state ? METHOD_AND_CLASS_IN_USE_EPOCH_1_BITS : METHOD_AND_CLASS_IN_USE_EPOCH_2_BITS; } }; - -#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDEPOCH_HPP diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDMACROS_HPP -#define SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDMACROS_HPP +#pragma once #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp" #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp" @@ -183,5 +182,3 @@ #define METHOD_FLAG_NOT_USED_ANY_EPOCH(m) ((METHOD_FLAG_NOT_USED_THIS_EPOCH(m) && METHOD_FLAG_NOT_USED_PREV_EPOCH(m)) != 0) #define CLEAR_METHOD_FLAG_USED_THIS_EPOCH(m) (clear_bits_cas((jbyte)JfrTraceIdEpoch::in_use_this_epoch_bit(), (m)->trace_flags_addr())) #define CLEAR_METHOD_FLAG_USED_PREV_EPOCH(m) (clear_bits_cas((jbyte)JfrTraceIdEpoch::in_use_prev_epoch_bit(), (m)->trace_flags_addr())) - -#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDMACROS_HPP diff --git a/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp b/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp --- a/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp +++ b/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_JFREVENTSETTING_HPP -#define SHARE_VM_JFR_RECORDER_JFREVENTSETTING_HPP +#pragma once #include "jni.h" #include "jfr/utilities/jfrAllocation.hpp" @@ -48,5 +47,3 @@ static jlong cutoff(JfrEventId event_id); DEBUG_ONLY(static bool bounds_check_event(jlong id);) }; - -#endif // SHARE_VM_JFR_RECORDER_JFREVENTSETTING_HPP diff --git a/src/hotspot/share/jfr/recorder/jfrEventSetting.inline.hpp b/src/hotspot/share/jfr/recorder/jfrEventSetting.inline.hpp --- a/src/hotspot/share/jfr/recorder/jfrEventSetting.inline.hpp +++ b/src/hotspot/share/jfr/recorder/jfrEventSetting.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP -#define SHARE_VM_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP +#pragma once #include "jfr/recorder/jfrEventSetting.hpp" @@ -46,6 +45,3 @@ inline jlong JfrEventSetting::cutoff(JfrEventId event_id) { return setting(event_id).cutoff_ticks; } - -#endif // SHARE_VM_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP - diff --git a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp --- a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp +++ b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_JFRRECORDER_HPP -#define SHARE_VM_JFR_RECORDER_JFRRECORDER_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" @@ -64,5 +63,3 @@ static bool is_recording(); static void stop_recording(); }; - -#endif // SHARE_VM_JFR_RECORDER_JFRRECORDER_HPP diff --git a/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp b/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp --- a/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp +++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP -#define SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP +#pragma once #include "memory/allocation.hpp" @@ -40,5 +39,3 @@ static bool should_rotate(); static void on_rotation(); }; - -#endif // SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP diff --git a/src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp b/src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp --- a/src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp +++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_REPOSITORY_JFRRCHUNKSTATE_HPP -#define SHARE_VM_JFR_RECORDER_REPOSITORY_JFRRCHUNKSTATE_HPP +#pragma once #include "jni.h" #include "jfr/utilities/jfrAllocation.hpp" @@ -56,5 +55,3 @@ void set_path(const char* path); const char* path() const; }; - -#endif // SHARE_VM_JFR_RECORDER_REPOSITORY_JFRRCHUNKSTATE_HPP diff --git a/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp b/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp --- a/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp +++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP -#define SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP +#pragma once #include "jfr/writers/jfrStorageAdapter.hpp" #include "jfr/writers/jfrStreamWriterHost.inline.hpp" @@ -53,5 +52,3 @@ void set_previous_checkpoint_offset(intptr_t offset); void time_stamp_chunk_now(); }; - -#endif // SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP diff --git a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp --- a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp +++ b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_INTERNAL_JFREMERGENCY_HPP -#define SHARE_VM_JFR_RECORDER_INTERNAL_JFREMERGENCY_HPP +#pragma once #include "memory/allocation.hpp" @@ -34,7 +33,3 @@ public: static void on_vm_shutdown(bool exception_handler); }; - -#endif // SHARE_VM_JFR_RECORDER_INTERNAL_JFREMERGENCY_HPP - - diff --git a/src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp b/src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp --- a/src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp +++ b/src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP -#define SHARE_VM_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP +#pragma once #include "jni.h" #include "jfr/utilities/jfrAllocation.hpp" @@ -69,5 +68,3 @@ static void set_path(jstring location, JavaThread* jt); static void set_chunk_path(jstring path, JavaThread* jt); }; - -#endif // SHARE_VM_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP diff --git a/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp b/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp --- a/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp +++ b/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFREVENT_HPP -#define SHARE_VM_JFR_RECORDER_SERVICE_JFREVENT_HPP +#pragma once #include "jfr/recorder/jfrEventSetting.inline.hpp" #include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp" @@ -210,5 +209,3 @@ } #endif // ASSERT }; - -#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFREVENT_HPP diff --git a/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp b/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp --- a/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp +++ b/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP -#define SHARE_VM_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -52,5 +51,3 @@ public: static bool adjust_options(JfrMemoryOptions* options); }; - -#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP diff --git a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp --- a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp +++ b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP -#define SHARE_VM_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -83,5 +82,3 @@ static const GrowableArray* startup_recording_options(); static void release_startup_recording_options(); }; - -#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP diff --git a/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp b/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp --- a/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp +++ b/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP -#define SHARE_VM_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" @@ -93,5 +92,3 @@ void notify_waiters(); void notify_collection_stop(); }; - -#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp --- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp +++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP -#define SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" @@ -73,5 +72,3 @@ void evaluate_chunk_size_for_rotation(); static bool is_recording(); }; - -#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp --- a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp +++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP -#define SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -41,5 +40,3 @@ static JfrPostBox& post_box(); static bool start(JfrCheckpointManager* cp_manager, JfrPostBox* post_box, TRAPS); }; - -#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp --- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp +++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP -#define SHARE_VM_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" #include "jfr/utilities/jfrTypes.hpp" @@ -149,5 +148,3 @@ size_t write(JfrChunkWriter& cw, bool clear); size_t clear(); }; - -#endif // SHARE_VM_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP diff --git a/src/hotspot/share/jfr/recorder/storage/jfrBuffer.hpp b/src/hotspot/share/jfr/recorder/storage/jfrBuffer.hpp --- a/src/hotspot/share/jfr/recorder/storage/jfrBuffer.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrBuffer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRBUFFER_HPP -#define SHARE_VM_JFR_RECORDER_STORAGE_JFRBUFFER_HPP +#pragma once #include "memory/allocation.hpp" @@ -183,5 +182,3 @@ return _retired; } }; - -#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRBUFFER_HPP diff --git a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.hpp b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.hpp --- a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP -#define SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" #include "jfr/utilities/jfrDoublyLinkedList.hpp" @@ -164,5 +163,3 @@ bool process(Type* t); size_t processed() const { return 0; } }; - -#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP diff --git a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp --- a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP -#define SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP +#pragma once #include "jfr/recorder/storage/jfrMemorySpace.hpp" @@ -380,6 +379,3 @@ memcpy(new_buffer->pos(), old->pos(), used); } } - -#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP - diff --git a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpaceRetrieval.hpp b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpaceRetrieval.hpp --- a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpaceRetrieval.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpaceRetrieval.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP -#define SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP +#pragma once #include "memory/allocation.hpp" #include "jfr/recorder/repository/jfrChunkWriter.hpp" @@ -109,5 +108,3 @@ return JfrExclusiveRetrieval::get(size, mspace, iterator, thread); } }; - -#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorage.hpp b/src/hotspot/share/jfr/recorder/storage/jfrStorage.hpp --- a/src/hotspot/share/jfr/recorder/storage/jfrStorage.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrStorage.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP -#define SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP +#pragma once #include "jfr/recorder/storage/jfrBuffer.hpp" #include "jfr/recorder/storage/jfrMemorySpace.hpp" @@ -94,5 +93,3 @@ template class, typename> friend class JfrMemorySpace; }; - -#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.hpp b/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.hpp --- a/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP -#define SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" @@ -64,5 +63,3 @@ void set_scavenge_threshold(size_t number_of_dead_buffers); bool should_scavenge() const; }; - -#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp --- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP -#define SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP +#pragma once #include "jfr/recorder/storage/jfrBuffer.hpp" #include "jfr/recorder/repository/jfrChunkWriter.hpp" @@ -120,5 +119,3 @@ bool process(Type* t); size_t processed() const { return _operation.processed(); } }; - -#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP diff --git a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp --- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP -#define SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP +#pragma once #include "jfr/recorder/storage/jfrStorageUtils.hpp" @@ -94,5 +93,3 @@ } return result; } - -#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP diff --git a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.hpp b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.hpp --- a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.hpp +++ b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP -#define SHARE_VM_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" @@ -62,5 +61,3 @@ size_t reserved_size() const; // size of reservation bool compact(size_t index); }; - -#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP diff --git a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp --- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp +++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP -#define SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP +#pragma once #include "jni.h" #include "jfr/recorder/storage/jfrMemorySpace.hpp" @@ -79,5 +78,3 @@ template class, typename> friend class JfrMemorySpace; }; - -#endif // SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP diff --git a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp --- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp +++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP -#define SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP +#pragma once #include "jfr/recorder/storage/jfrBuffer.hpp" @@ -42,5 +41,3 @@ void set_string_pos(uint64_t value); void set_string_top(uint64_t value); }; - -#endif // SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP diff --git a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp --- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp +++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP -#define SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP +#pragma once #include "memory/allocation.hpp" #include "jfr/recorder/stringpool/jfrStringPoolBuffer.hpp" @@ -54,5 +53,3 @@ ~JfrStringPoolWriter(); void inc_nof_strings(); }; - -#endif // SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP diff --git a/src/hotspot/share/jfr/support/jfrAllocationTracer.hpp b/src/hotspot/share/jfr/support/jfrAllocationTracer.hpp --- a/src/hotspot/share/jfr/support/jfrAllocationTracer.hpp +++ b/src/hotspot/share/jfr/support/jfrAllocationTracer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP -#define SHARE_VM_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP +#pragma once #include "memory/allocation.hpp" @@ -36,5 +35,3 @@ JfrAllocationTracer(HeapWord* obj, size_t alloc_size, Thread* thread); ~JfrAllocationTracer(); }; - -#endif // SHARE_VM_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP diff --git a/src/hotspot/share/jfr/support/jfrEventClass.hpp b/src/hotspot/share/jfr/support/jfrEventClass.hpp --- a/src/hotspot/share/jfr/support/jfrEventClass.hpp +++ b/src/hotspot/share/jfr/support/jfrEventClass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_SUPPORT_JFREVENTCLASS_HPP -#define SHARE_VM_JFR_SUPPORT_JFREVENTCLASS_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -60,5 +59,3 @@ static bool is_visible(const Klass* k); static bool is_visible(const jclass jc); }; - -#endif // SHARE_VM_JFR_SUPPORT_JFREVENTCLASS_HPP diff --git a/src/hotspot/share/jfr/support/jfrFlush.hpp b/src/hotspot/share/jfr/support/jfrFlush.hpp --- a/src/hotspot/share/jfr/support/jfrFlush.hpp +++ b/src/hotspot/share/jfr/support/jfrFlush.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_SUPPORT_JFRFLUSH_HPP -#define SHARE_VM_JFR_SUPPORT_JFRFLUSH_HPP +#pragma once #include "jfr/recorder/storage/jfrBuffer.hpp" #include "jfr/utilities/jfrTypes.hpp" @@ -73,5 +72,3 @@ } } }; - -#endif // SHARE_VM_JFR_SUPPORT_JFRFLUSH_HPP diff --git a/src/hotspot/share/jfr/support/jfrIntrinsics.hpp b/src/hotspot/share/jfr/support/jfrIntrinsics.hpp --- a/src/hotspot/share/jfr/support/jfrIntrinsics.hpp +++ b/src/hotspot/share/jfr/support/jfrIntrinsics.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_SUPPORT_JFRINTRINSICS_HPP -#define SHARE_VM_JFR_SUPPORT_JFRINTRINSICS_HPP +#pragma once #include "utilities/macros.hpp" @@ -53,4 +52,3 @@ #define JFR_INTRINSICS(do_intrinsic, do_class, do_name, do_signature, do_alias) #endif // INCLUDE_JFR -#endif // SHARE_VM_JFR_SUPPORT_JFRINTRINSICS_HPP diff --git a/src/hotspot/share/jfr/support/jfrKlassExtension.hpp b/src/hotspot/share/jfr/support/jfrKlassExtension.hpp --- a/src/hotspot/share/jfr/support/jfrKlassExtension.hpp +++ b/src/hotspot/share/jfr/support/jfrKlassExtension.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_SUPPORT_JFRKLASSEXTENSION_HPP -#define SHARE_VM_JFR_SUPPORT_JFRKLASSEXTENSION_HPP +#pragma once #include "jfr/instrumentation/jfrEventClassTransformer.hpp" #include "jfr/support/jfrTraceIdExtension.hpp" @@ -38,5 +37,3 @@ #define EVENT_HOST_KLASS 64 #define IS_EVENT_KLASS(ptr) (((ptr)->trace_id() & (JDK_JFR_EVENT_KLASS | JDK_JFR_EVENT_SUBKLASS)) != 0) #define ON_KLASS_CREATION(k, p, t) if (IS_EVENT_KLASS(k)) JfrEventClassTransformer::on_klass_creation(k, p, t) - -#endif // SHARE_VM_JFR_SUPPORT_JFRKLASSEXTENSION_HPP diff --git a/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp b/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp --- a/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp +++ b/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP -#define SHARE_VM_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP +#pragma once #include "memory/allocation.hpp" #include "jfrfiles/jfrEventIds.hpp" @@ -43,5 +42,3 @@ JfrStackTraceMark(JfrEventId eventId, Thread* t); ~JfrStackTraceMark(); }; - -#endif // SHARE_VM_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP diff --git a/src/hotspot/share/jfr/support/jfrThreadExtension.hpp b/src/hotspot/share/jfr/support/jfrThreadExtension.hpp --- a/src/hotspot/share/jfr/support/jfrThreadExtension.hpp +++ b/src/hotspot/share/jfr/support/jfrThreadExtension.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_SUPPORT_JFRTHREADEXTENSION_HPP -#define SHARE_VM_JFR_SUPPORT_JFRTHREADEXTENSION_HPP +#pragma once #include "jfr/periodic/sampling/jfrThreadSampler.hpp" #include "jfr/support/jfrThreadLocal.hpp" @@ -47,5 +46,3 @@ JfrThreadLocal::java_event_writer_offset() + THREAD_LOCAL_OFFSET_JFR #define SUSPEND_THREAD_CONDITIONAL(thread) if ((thread)->is_trace_suspend()) JfrThreadSampling::on_javathread_suspend(thread) - -#endif // SHARE_VM_JFR_SUPPORT_JFRTHREADEXTENSION_HPP diff --git a/src/hotspot/share/jfr/support/jfrThreadId.hpp b/src/hotspot/share/jfr/support/jfrThreadId.hpp --- a/src/hotspot/share/jfr/support/jfrThreadId.hpp +++ b/src/hotspot/share/jfr/support/jfrThreadId.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_SUPPORT_JFRTHREADID_HPP -#define SHARE_VM_JFR_SUPPORT_JFRTHREADID_HPP +#pragma once #include "utilities/macros.hpp" #include "utilities/globalDefinitions.hpp" @@ -36,6 +35,3 @@ typedef u8 traceid; #define JFR_THREAD_ID(thread) ((traceid)(thread)->osthread()->thread_id()) #endif - -#endif // SHARE_VM_JFR_SUPPORT_JFRTHREADID_HPP - diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp --- a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp +++ b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_SUPPORT_JFRTHREADLOCAL_HPP -#define SHARE_VM_JFR_SUPPORT_JFRTHREADLOCAL_HPP +#pragma once #include "jfr/recorder/checkpoint/jfrCheckpointBlob.hpp" #include "jfr/utilities/jfrTypes.hpp" @@ -220,5 +219,3 @@ static ByteSize trace_id_offset(); static ByteSize java_event_writer_offset(); }; - -#endif // SHARE_VM_JFR_SUPPORT_JFRTHREADLOCAL_HPP diff --git a/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp b/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp --- a/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp +++ b/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP -#define SHARE_VM_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP +#pragma once #include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp" @@ -77,5 +76,3 @@ jbyte* const trace_flags_addr() const { \ return _trace_flags.flags_addr(); \ } - -#endif // SHARE_VM_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrAllocation.hpp b/src/hotspot/share/jfr/utilities/jfrAllocation.hpp --- a/src/hotspot/share/jfr/utilities/jfrAllocation.hpp +++ b/src/hotspot/share/jfr/utilities/jfrAllocation.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRALLOCATION_HPP -#define SHARE_VM_JFR_UTILITIES_JFRALLOCATION_HPP +#pragma once #include "memory/allocation.hpp" #include "services/memTracker.hpp" @@ -70,5 +69,3 @@ return memory; } }; - -#endif // SHARE_VM_JFR_UTILITIES_JFRALLOCATION_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp --- a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp +++ b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRBIGENDIAN_HPP -#define SHARE_VM_JFR_UTILITIES_JFRBIGENDIAN_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/bytes.hpp" @@ -132,5 +131,3 @@ } return read_unaligned((const address)location); } - -#endif // SHARE_VM_JFR_UTILITIES_JFRBIGENDIAN_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp b/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp --- a/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp +++ b/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP -#define SHARE_VM_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP +#pragma once #include "memory/allocation.hpp" @@ -214,5 +213,3 @@ assert(in_list(tail_node), "not in list error"); assert(in_list(head_node), "not in list error"); } - -#endif // SHARE_VM_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrHashtable.hpp b/src/hotspot/share/jfr/utilities/jfrHashtable.hpp --- a/src/hotspot/share/jfr/utilities/jfrHashtable.hpp +++ b/src/hotspot/share/jfr/utilities/jfrHashtable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRHASHTABLE_HPP -#define SHARE_VM_JFR_UTILITIES_JFRHASHTABLE_HPP +#pragma once #include "memory/allocation.inline.hpp" #include "runtime/orderAccess.hpp" @@ -279,5 +278,3 @@ assert(0 == entry->id(), "invariant"); return entry; } - -#endif // SHARE_VM_JFR_UTILITIES_JFRHASHTABLE_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrIterator.hpp b/src/hotspot/share/jfr/utilities/jfrIterator.hpp --- a/src/hotspot/share/jfr/utilities/jfrIterator.hpp +++ b/src/hotspot/share/jfr/utilities/jfrIterator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRLISTITERATOR_HPP -#define SHARE_VM_JFR_UTILITIES_JFRLISTITERATOR_HPP +#pragma once #include "memory/allocation.hpp" @@ -103,5 +102,3 @@ public: StopOnNullIterator(List& list, jfr_iter_direction direction = forward) : IteratorHost(list, direction) {} }; - -#endif // SHARE_VM_JFR_UTILITIES_JFRLISTITERATOR_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp b/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp --- a/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp +++ b/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRJAVALOG_HPP -#define SHARE_VM_JFR_UTILITIES_JFRJAVALOG_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/exceptions.hpp" @@ -44,5 +43,3 @@ static void subscribe_log_level(jobject log_tag, jint id, TRAPS); static void log(jint tag_set, jint level, jstring message, TRAPS); }; - -#endif // SHARE_VM_JFR_UTILITIES_JFRJAVALOG_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp b/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp --- a/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp +++ b/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRLOGTAGSETS_HPP -#define SHARE_VM_JFR_UTILITIES_JFRLOGTAGSETS_HPP +#pragma once #include "logging/logTag.hpp" @@ -58,5 +57,3 @@ JFR_LOG_TAG(jfr, setting) \ JFR_LOG_TAG(jfr, dcmd) /* NEW TAGS, DONT FORGET TO UPDATE JAVA SIDE */ - -#endif // SHARE_VM_JFR_UTILITIES_JFRLOGTAGSETS_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrRefCountPointer.hpp b/src/hotspot/share/jfr/utilities/jfrRefCountPointer.hpp --- a/src/hotspot/share/jfr/utilities/jfrRefCountPointer.hpp +++ b/src/hotspot/share/jfr/utilities/jfrRefCountPointer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP -#define SHARE_VM_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" #include "runtime/atomic.hpp" @@ -150,5 +149,3 @@ return RefHandle(new RefCountPointer(ptr)); } }; - -#endif // SHARE_VM_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrResourceManager.hpp b/src/hotspot/share/jfr/utilities/jfrResourceManager.hpp --- a/src/hotspot/share/jfr/utilities/jfrResourceManager.hpp +++ b/src/hotspot/share/jfr/utilities/jfrResourceManager.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_RESOURCEMANAGER_HPP -#define SHARE_VM_JFR_UTILITIES_RESOURCEMANAGER_HPP +#pragma once #include "memory/allocation.hpp" @@ -56,5 +55,3 @@ operator T*() { return _resource_array; } T* operator->() const { return _resource_array; } }; - -#endif // SHARE_VM_JFR_UTILITIES_RESOURCEMANAGER_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp b/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp --- a/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp +++ b/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP -#define SHARE_VM_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP +#pragma once #include "runtime/thread.hpp" @@ -46,5 +45,3 @@ Thread::SpinRelease(_lock); } }; - -#endif // SHARE_VM_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrTime.hpp b/src/hotspot/share/jfr/utilities/jfrTime.hpp --- a/src/hotspot/share/jfr/utilities/jfrTime.hpp +++ b/src/hotspot/share/jfr/utilities/jfrTime.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRTIME_HPP -#define SHARE_VM_JFR_UTILITIES_JFRTIME_HPP +#pragma once #include "utilities/ticks.hpp" @@ -40,5 +39,3 @@ static jlong frequency(); static const void* time_function(); }; - -#endif // SHARE_VM_JFR_UTILITIES_JFRTIME_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp b/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp --- a/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp +++ b/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRTIMECONVERTER_HPP -#define SHARE_VM_JFR_UTILITIES_JFRTIMECONVERTER_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -49,5 +48,3 @@ // nanos to ticks static jlong nanos_to_countertime(jlong c, bool as_os_time = false); }; - -#endif // SHARE_VM_JFR_UTILITIES_JFRTIMECONVERTER_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrTryLock.hpp b/src/hotspot/share/jfr/utilities/jfrTryLock.hpp --- a/src/hotspot/share/jfr/utilities/jfrTryLock.hpp +++ b/src/hotspot/share/jfr/utilities/jfrTryLock.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRTRYLOCK_HPP -#define SHARE_VM_JFR_UTILITIES_JFRTRYLOCK_HPP +#pragma once #include "runtime/atomic.hpp" #include "runtime/orderAccess.hpp" @@ -70,5 +69,3 @@ } }; - -#endif // SHARE_VM_JFR_UTILITIES_JFRTRYLOCK_HPP diff --git a/src/hotspot/share/jfr/utilities/jfrTypes.hpp b/src/hotspot/share/jfr/utilities/jfrTypes.hpp --- a/src/hotspot/share/jfr/utilities/jfrTypes.hpp +++ b/src/hotspot/share/jfr/utilities/jfrTypes.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_UTILITIES_JFRTYPES_HPP -#define SHARE_VM_JFR_UTILITIES_JFRTYPES_HPP +#pragma once #include "jfrfiles/jfrEventIds.hpp" #include "memory/allocation.hpp" @@ -38,5 +37,3 @@ UNTIMED, TIMED }; - -#endif // SHARE_VM_JFR_UTILITIES_JFRTYPES_HPP diff --git a/src/hotspot/share/jfr/writers/jfrBigEndianWriter.hpp b/src/hotspot/share/jfr/writers/jfrBigEndianWriter.hpp --- a/src/hotspot/share/jfr/writers/jfrBigEndianWriter.hpp +++ b/src/hotspot/share/jfr/writers/jfrBigEndianWriter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRBIGENDIANWRITER_HPP -#define SHARE_VM_JFR_WRITERS_JFRBIGENDIANWRITER_HPP +#pragma once #include "jfr/writers/jfrEncoding.hpp" #include "jfr/writers/jfrMemoryWriterHost.inline.hpp" @@ -38,5 +37,3 @@ template JfrBigEndianWriter(StorageType* storage, size_t size) : BigEndianWriterBase(storage, size + size_safety_cushion) {} }; - -#endif // SHARE_VM_JFR_WRITERS_JFRBIGENDIANWRITER_HPP diff --git a/src/hotspot/share/jfr/writers/jfrEncoders.hpp b/src/hotspot/share/jfr/writers/jfrEncoders.hpp --- a/src/hotspot/share/jfr/writers/jfrEncoders.hpp +++ b/src/hotspot/share/jfr/writers/jfrEncoders.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRENCODERS_HPP -#define SHARE_VM_JFR_WRITERS_JFRENCODERS_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/bytes.hpp" @@ -294,5 +293,3 @@ } return size; } - -#endif // SHARE_VM_JFR_WRITERS_JFRENCODERS_HPP diff --git a/src/hotspot/share/jfr/writers/jfrEncoding.hpp b/src/hotspot/share/jfr/writers/jfrEncoding.hpp --- a/src/hotspot/share/jfr/writers/jfrEncoding.hpp +++ b/src/hotspot/share/jfr/writers/jfrEncoding.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRENCODING_HPP -#define SHARE_VM_JFR_WRITERS_JFRENCODING_HPP +#pragma once #include "jfr/writers/jfrEncoders.hpp" #include "memory/allocation.hpp" @@ -113,5 +112,3 @@ typedef EncoderHost BigEndianEncoder; typedef EncoderHost CompressedIntegerEncoder; - -#endif // SHARE_VM_JFR_WRITERS_JFRENCODING_HPP diff --git a/src/hotspot/share/jfr/writers/jfrEventWriterHost.hpp b/src/hotspot/share/jfr/writers/jfrEventWriterHost.hpp --- a/src/hotspot/share/jfr/writers/jfrEventWriterHost.hpp +++ b/src/hotspot/share/jfr/writers/jfrEventWriterHost.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_HPP -#define SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_HPP +#pragma once #include "jfr/writers/jfrWriterHost.inline.hpp" @@ -47,5 +46,3 @@ StackEventWriterHost(Thread* thread); ~StackEventWriterHost(); }; - -#endif // SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_HPP diff --git a/src/hotspot/share/jfr/writers/jfrEventWriterHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrEventWriterHost.inline.hpp --- a/src/hotspot/share/jfr/writers/jfrEventWriterHost.inline.hpp +++ b/src/hotspot/share/jfr/writers/jfrEventWriterHost.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP -#define SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP +#pragma once #include "jfr/writers/jfrEventWriterHost.hpp" @@ -93,5 +92,3 @@ inline StackEventWriterHost::~StackEventWriterHost() { this->end_event_write(); } - -#endif // SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP diff --git a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp --- a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp +++ b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP -#define SHARE_VM_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -45,5 +44,3 @@ static jobject new_event_writer(TRAPS); static jboolean flush(jobject writer, jint used, jint requested, JavaThread* jt); }; - -#endif // SHARE_VM_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP diff --git a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp --- a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp +++ b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP -#define SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP +#pragma once #include "jfr/writers/jfrStorageHost.inline.hpp" @@ -68,5 +67,3 @@ AcquireReleaseMemoryWriterHost(Thread* thread); ~AcquireReleaseMemoryWriterHost(); }; - -#endif // SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP diff --git a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp --- a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp +++ b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP -#define SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP +#pragma once #include "jfr/writers/jfrMemoryWriterHost.hpp" @@ -95,5 +94,3 @@ assert(this->is_acquired(), "invariant"); this->release(); } - -#endif // SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP diff --git a/src/hotspot/share/jfr/writers/jfrNativeEventWriter.hpp b/src/hotspot/share/jfr/writers/jfrNativeEventWriter.hpp --- a/src/hotspot/share/jfr/writers/jfrNativeEventWriter.hpp +++ b/src/hotspot/share/jfr/writers/jfrNativeEventWriter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP -#define SHARE_VM_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP +#pragma once #include "jfr/support/jfrFlush.hpp" #include "jfr/writers/jfrEncoding.hpp" @@ -34,5 +33,3 @@ typedef Adapter JfrNativeEventAdapter; typedef MemoryWriterHost JfrNativeEventWriterImpl; typedef StackEventWriterHost JfrNativeEventWriter; - -#endif // SHARE_VM_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP diff --git a/src/hotspot/share/jfr/writers/jfrPosition.hpp b/src/hotspot/share/jfr/writers/jfrPosition.hpp --- a/src/hotspot/share/jfr/writers/jfrPosition.hpp +++ b/src/hotspot/share/jfr/writers/jfrPosition.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRPOSITION_HPP -#define SHARE_VM_JFR_WRITERS_JFRPOSITION_HPP +#pragma once #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -53,5 +52,3 @@ size_t used_size() const; void reset(); }; - -#endif // SHARE_VM_JFR_WRITERS_JFRPOSITION_HPP diff --git a/src/hotspot/share/jfr/writers/jfrPosition.inline.hpp b/src/hotspot/share/jfr/writers/jfrPosition.inline.hpp --- a/src/hotspot/share/jfr/writers/jfrPosition.inline.hpp +++ b/src/hotspot/share/jfr/writers/jfrPosition.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRPOSITION_INLINE_HPP -#define SHARE_VM_JFR_WRITERS_JFRPOSITION_INLINE_HPP +#pragma once #include "jfr/writers/jfrPosition.hpp" @@ -98,5 +97,3 @@ inline void Position::reset() { set_current_pos(_start_pos); } - -#endif // SHARE_VM_JFR_WRITERS_JFRPOSITION_INLINE_HPP diff --git a/src/hotspot/share/jfr/writers/jfrStorageAdapter.hpp b/src/hotspot/share/jfr/writers/jfrStorageAdapter.hpp --- a/src/hotspot/share/jfr/writers/jfrStorageAdapter.hpp +++ b/src/hotspot/share/jfr/writers/jfrStorageAdapter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRSTORAGEADAPTER_HPP -#define SHARE_VM_JFR_WRITERS_JFRSTORAGEADAPTER_HPP +#pragma once #include "jfr/utilities/jfrAllocation.hpp" @@ -239,5 +238,3 @@ return false; } }; - -#endif // SHARE_VM_JFR_WRITERS_JFRSTORAGEADAPTER_HPP diff --git a/src/hotspot/share/jfr/writers/jfrStorageHost.hpp b/src/hotspot/share/jfr/writers/jfrStorageHost.hpp --- a/src/hotspot/share/jfr/writers/jfrStorageHost.hpp +++ b/src/hotspot/share/jfr/writers/jfrStorageHost.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_HPP -#define SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_HPP +#pragma once #include "jfr/writers/jfrPosition.inline.hpp" @@ -54,6 +53,3 @@ void flush(); void seek(intptr_t offset); }; - -#endif // SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_HPP - diff --git a/src/hotspot/share/jfr/writers/jfrStorageHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrStorageHost.inline.hpp --- a/src/hotspot/share/jfr/writers/jfrStorageHost.inline.hpp +++ b/src/hotspot/share/jfr/writers/jfrStorageHost.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP -#define SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP +#pragma once #include "jfr/writers/jfrStorageHost.hpp" @@ -134,5 +133,3 @@ this->set_current_pos(this->start_pos() + offset); } } - -#endif // SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP diff --git a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.hpp b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.hpp --- a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.hpp +++ b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP -#define SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP +#pragma once #include "jfr/utilities/jfrTypes.hpp" #include "jfr/writers/jfrMemoryWriterHost.inline.hpp" @@ -55,6 +54,3 @@ void close_fd(); void reset(fio_fd fd); }; - -#endif // SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP - diff --git a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp --- a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp +++ b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP -#define SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP +#pragma once #include "jfr/writers/jfrStreamWriterHost.hpp" #include "runtime/os.hpp" @@ -135,5 +134,3 @@ _stream_pos = 0; this->hard_reset(); } - -#endif // SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP diff --git a/src/hotspot/share/jfr/writers/jfrWriterHost.hpp b/src/hotspot/share/jfr/writers/jfrWriterHost.hpp --- a/src/hotspot/share/jfr/writers/jfrWriterHost.hpp +++ b/src/hotspot/share/jfr/writers/jfrWriterHost.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRWRITERHOST_HPP -#define SHARE_VM_JFR_WRITERS_JFRWRITERHOST_HPP +#pragma once #include "jni.h" #include "utilities/globalDefinitions.hpp" @@ -98,5 +97,3 @@ void write_be_at_offset(T value, intptr_t offset); intptr_t reserve(size_t size); }; - -#endif // SHARE_VM_JFR_WRITERS_JFRWRITERHOST_HPP diff --git a/src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp --- a/src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp +++ b/src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP -#define SHARE_VM_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP +#pragma once #include "classfile/javaClasses.hpp" #include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp" @@ -359,6 +358,3 @@ this->seek(current); // restore } } - -#endif // SHARE_VM_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP - diff --git a/src/hotspot/share/jvmci/compilerRuntime.hpp b/src/hotspot/share/jvmci/compilerRuntime.hpp --- a/src/hotspot/share/jvmci/compilerRuntime.hpp +++ b/src/hotspot/share/jvmci/compilerRuntime.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_RUNTIME_COMPILERRUNTIME_HPP -#define SHARE_VM_RUNTIME_COMPILERRUNTIME_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/resourceArea.hpp" @@ -47,5 +46,3 @@ static void invocation_event(JavaThread *thread, MethodCounters* counters); static void backedge_event(JavaThread *thread, MethodCounters* counters, int branch_bci, int target_bci); }; - -#endif // SHARE_VM_RUNTIME_COMPILERRUNTIME_HPP diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp --- a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp +++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_JVMCI_JVMCI_CODE_INSTALLER_HPP -#define SHARE_VM_JVMCI_JVMCI_CODE_INSTALLER_HPP +#pragma once #include "jvmci/jvmciCompiler.hpp" #include "jvmci/jvmciEnv.hpp" @@ -276,7 +275,3 @@ * Gets the Method metaspace object from a HotSpotResolvedJavaMethodImpl Java object. */ Method* getMethodFromHotSpotMethod(oop hotspot_method); - - - -#endif // SHARE_VM_JVMCI_JVMCI_CODE_INSTALLER_HPP diff --git a/src/hotspot/share/jvmci/jvmciCompiler.hpp b/src/hotspot/share/jvmci/jvmciCompiler.hpp --- a/src/hotspot/share/jvmci/jvmciCompiler.hpp +++ b/src/hotspot/share/jvmci/jvmciCompiler.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_JVMCI_JVMCI_COMPILER_HPP -#define SHARE_VM_JVMCI_JVMCI_COMPILER_HPP +#pragma once #include "compiler/abstractCompiler.hpp" #include "jvmci/jvmciEnv.hpp" @@ -106,5 +105,3 @@ static elapsedTimer* codeInstallTimer() { return &_codeInstallTimer; } }; - -#endif // SHARE_VM_JVMCI_JVMCI_COMPILER_HPP diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp --- a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp +++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_JVMCI_JVMCI_COMPILER_TO_VM_HPP -#define SHARE_VM_JVMCI_JVMCI_COMPILER_TO_VM_HPP +#pragma once #include "jni.h" #include "runtime/javaCalls.hpp" @@ -241,5 +240,3 @@ static void push_jni_handle_block(); static void pop_jni_handle_block(); }; - -#endif // SHARE_VM_JVMCI_JVMCI_COMPILER_TO_VM_HPP diff --git a/src/hotspot/share/jvmci/jvmciEnv.hpp b/src/hotspot/share/jvmci/jvmciEnv.hpp --- a/src/hotspot/share/jvmci/jvmciEnv.hpp +++ b/src/hotspot/share/jvmci/jvmciEnv.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JVMCI_JVMCIENV_HPP -#define SHARE_VM_JVMCI_JVMCIENV_HPP +#pragma once #include "classfile/systemDictionary.hpp" #include "code/debugInfoRec.hpp" @@ -180,5 +179,3 @@ // array types into java/lang/Object and other types stay as they are. static InstanceKlass* get_instance_klass_for_declared_method_holder(Klass* klass); }; - -#endif // SHARE_VM_JVMCI_JVMCIENV_HPP diff --git a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp --- a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp +++ b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP -#define SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP +#pragma once #include "classfile/systemDictionary.hpp" #include "oops/access.hpp" @@ -380,5 +379,3 @@ #undef EMPTY_CAST void compute_offset(int &dest_offset, Klass* klass, const char* name, const char* signature, bool static_field, TRAPS); - -#endif // SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP diff --git a/src/hotspot/share/jvmci/jvmciRuntime.hpp b/src/hotspot/share/jvmci/jvmciRuntime.hpp --- a/src/hotspot/share/jvmci/jvmciRuntime.hpp +++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_JVMCI_JVMCI_RUNTIME_HPP -#define SHARE_VM_JVMCI_JVMCI_RUNTIME_HPP +#pragma once #include "interpreter/interpreter.hpp" #include "memory/allocation.hpp" @@ -199,5 +198,3 @@ #define TRACE_jvmci_3 if (!(JVMCITraceLevel >= 3 && (tty->print(" JVMCITrace-3: "), true))) ; else tty->print_cr #define TRACE_jvmci_4 if (!(JVMCITraceLevel >= 4 && (tty->print(" JVMCITrace-4: "), true))) ; else tty->print_cr #define TRACE_jvmci_5 if (!(JVMCITraceLevel >= 5 && (tty->print(" JVMCITrace-5: "), true))) ; else tty->print_cr - -#endif // SHARE_VM_JVMCI_JVMCI_RUNTIME_HPP diff --git a/src/hotspot/share/jvmci/jvmci_globals.hpp b/src/hotspot/share/jvmci/jvmci_globals.hpp --- a/src/hotspot/share/jvmci/jvmci_globals.hpp +++ b/src/hotspot/share/jvmci/jvmci_globals.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JVMCI_JVMCIGLOBALS_HPP -#define SHARE_VM_JVMCI_JVMCIGLOBALS_HPP +#pragma once #include "runtime/globals.hpp" @@ -140,4 +139,3 @@ // Check and exit VM with error if selected GC is not supported by JVMCI. static void check_jvmci_supported_gc(); }; -#endif // SHARE_VM_JVMCI_JVMCIGLOBALS_HPP diff --git a/src/hotspot/share/jvmci/systemDictionary_jvmci.hpp b/src/hotspot/share/jvmci/systemDictionary_jvmci.hpp --- a/src/hotspot/share/jvmci/systemDictionary_jvmci.hpp +++ b/src/hotspot/share/jvmci/systemDictionary_jvmci.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP -#define SHARE_VM_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP +#pragma once #if !INCLUDE_JVMCI #define JVMCI_WK_KLASSES_DO(do_klass) @@ -90,5 +89,3 @@ do_klass(ValueKind_klass, jdk_vm_ci_meta_ValueKind ) \ do_klass(Value_klass, jdk_vm_ci_meta_Value ) #endif - -#endif // SHARE_VM_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP diff --git a/src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp b/src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp --- a/src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp +++ b/src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP -#define SHARE_VM_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP +#pragma once #if INCLUDE_AOT #include "jvmci/compilerRuntime.hpp" @@ -41,5 +40,3 @@ #define VM_ADDRESSES_COMPILER_RUNTIME(declare_address, declare_preprocessor_address, declare_function) #endif // INCLUDE_AOT - -#endif // SHARE_VM_AOT_VMSTRUCTS_COMPILER_RUNTIME_HPP diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.hpp b/src/hotspot/share/jvmci/vmStructs_jvmci.hpp --- a/src/hotspot/share/jvmci/vmStructs_jvmci.hpp +++ b/src/hotspot/share/jvmci/vmStructs_jvmci.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP -#define SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP +#pragma once #include "runtime/vmStructs.hpp" @@ -62,5 +61,3 @@ static int localHotSpotVMLongConstants_count(); static int localHotSpotVMAddresses_count(); }; - -#endif // SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP diff --git a/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp b/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp --- a/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp +++ b/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP -#define SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP +#pragma once #if !INCLUDE_JVMCI @@ -103,5 +102,3 @@ template(constantPool_fromMetaspace_signature, "(J)Ljdk/vm/ci/hotspot/HotSpotConstantPool;") \ template(klass_fromMetaspace_signature, "(Ljava/lang/Class;)Ljdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl;") #endif - -#endif // SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP diff --git a/src/hotspot/share/libadt/dict.hpp b/src/hotspot/share/libadt/dict.hpp --- a/src/hotspot/share/libadt/dict.hpp +++ b/src/hotspot/share/libadt/dict.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LIBADT_DICT_HPP -#define SHARE_VM_LIBADT_DICT_HPP +#pragma once // Dictionaries - An Abstract Data Type @@ -117,5 +116,3 @@ void operator ++(void); // Increment iterator int test(void) { return _i<_d->_size;} // Test for end of iteration }; - -#endif // SHARE_VM_LIBADT_DICT_HPP diff --git a/src/hotspot/share/libadt/set.hpp b/src/hotspot/share/libadt/set.hpp --- a/src/hotspot/share/libadt/set.hpp +++ b/src/hotspot/share/libadt/set.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LIBADT_SET_HPP -#define SHARE_VM_LIBADT_SET_HPP +#pragma once #include "memory/allocation.hpp" @@ -243,5 +242,3 @@ void operator ++(void) { elem = impl->next(); } int test(void) { return impl->test(); } }; - -#endif // SHARE_VM_LIBADT_SET_HPP diff --git a/src/hotspot/share/libadt/vectset.hpp b/src/hotspot/share/libadt/vectset.hpp --- a/src/hotspot/share/libadt/vectset.hpp +++ b/src/hotspot/share/libadt/vectset.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LIBADT_VECTSET_HPP -#define SHARE_VM_LIBADT_VECTSET_HPP +#pragma once #include "libadt/set.hpp" @@ -183,5 +182,3 @@ void operator ++(void) { elem = next(); } int test(void) { return i < s->size; } }; - -#endif // SHARE_VM_LIBADT_VECTSET_HPP diff --git a/src/hotspot/share/logging/log.hpp b/src/hotspot/share/logging/log.hpp --- a/src/hotspot/share/logging/log.hpp +++ b/src/hotspot/share/logging/log.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOG_HPP -#define SHARE_VM_LOGGING_LOG_HPP +#pragma once #include "logging/logLevel.hpp" #include "logging/logPrefix.hpp" @@ -197,5 +196,3 @@ } }; - -#endif // SHARE_VM_LOGGING_LOG_HPP diff --git a/src/hotspot/share/logging/logConfiguration.hpp b/src/hotspot/share/logging/logConfiguration.hpp --- a/src/hotspot/share/logging/logConfiguration.hpp +++ b/src/hotspot/share/logging/logConfiguration.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGCONFIGURATION_HPP -#define SHARE_VM_LOGGING_LOGCONFIGURATION_HPP +#pragma once #include "logging/logLevel.hpp" #include "memory/allocation.hpp" @@ -124,5 +123,3 @@ // Rotates all LogOutput static void rotate_all_outputs(); }; - -#endif // SHARE_VM_LOGGING_LOGCONFIGURATION_HPP diff --git a/src/hotspot/share/logging/logDecorations.hpp b/src/hotspot/share/logging/logDecorations.hpp --- a/src/hotspot/share/logging/logDecorations.hpp +++ b/src/hotspot/share/logging/logDecorations.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGDECORATIONS_HPP -#define SHARE_VM_LOGGING_LOGDECORATIONS_HPP +#pragma once #include "logging/logDecorators.hpp" #include "logging/logTagSet.hpp" @@ -63,5 +62,3 @@ return _decoration_offset[decorator]; } }; - -#endif // SHARE_VM_LOGGING_LOGDECORATIONS_HPP diff --git a/src/hotspot/share/logging/logDecorators.hpp b/src/hotspot/share/logging/logDecorators.hpp --- a/src/hotspot/share/logging/logDecorators.hpp +++ b/src/hotspot/share/logging/logDecorators.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGDECORATORS_HPP -#define SHARE_VM_LOGGING_LOGDECORATORS_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -114,5 +113,3 @@ bool parse(const char* decorator_args, outputStream* errstream = NULL); }; - -#endif // SHARE_VM_LOGGING_LOGDECORATORS_HPP diff --git a/src/hotspot/share/logging/logDiagnosticCommand.hpp b/src/hotspot/share/logging/logDiagnosticCommand.hpp --- a/src/hotspot/share/logging/logDiagnosticCommand.hpp +++ b/src/hotspot/share/logging/logDiagnosticCommand.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGDIAGNOSTICCOMMAND_HPP -#define SHARE_VM_LOGGING_LOGDIAGNOSTICCOMMAND_HPP +#pragma once #include "services/diagnosticCommand.hpp" @@ -65,5 +64,3 @@ return p; } }; - -#endif // SHARE_VM_LOGGING_LOGDIAGNOSTICCOMMAND_HPP diff --git a/src/hotspot/share/logging/logFileOutput.hpp b/src/hotspot/share/logging/logFileOutput.hpp --- a/src/hotspot/share/logging/logFileOutput.hpp +++ b/src/hotspot/share/logging/logFileOutput.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGFILEOUTPUT_HPP -#define SHARE_VM_LOGGING_LOGFILEOUTPUT_HPP +#pragma once #include "logging/logFileStreamOutput.hpp" #include "runtime/semaphore.hpp" @@ -94,5 +93,3 @@ static const char* const Prefix; static void set_file_name_parameters(jlong start_time); }; - -#endif // SHARE_VM_LOGGING_LOGFILEOUTPUT_HPP diff --git a/src/hotspot/share/logging/logFileStreamOutput.hpp b/src/hotspot/share/logging/logFileStreamOutput.hpp --- a/src/hotspot/share/logging/logFileStreamOutput.hpp +++ b/src/hotspot/share/logging/logFileStreamOutput.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGFILESTREAMOUTPUT_HPP -#define SHARE_VM_LOGGING_LOGFILESTREAMOUTPUT_HPP +#pragma once #include "logging/logDecorators.hpp" #include "logging/logOutput.hpp" @@ -89,5 +88,3 @@ extern LogStderrOutput &StderrLog; extern LogStdoutOutput &StdoutLog; - -#endif // SHARE_VM_LOGGING_LOGFILESTREAMOUTPUT_HPP diff --git a/src/hotspot/share/logging/logHandle.hpp b/src/hotspot/share/logging/logHandle.hpp --- a/src/hotspot/share/logging/logHandle.hpp +++ b/src/hotspot/share/logging/logHandle.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGHANDLE_HPP -#define SHARE_VM_LOGGING_LOGHANDLE_HPP +#pragma once #include "logging/log.hpp" @@ -100,5 +99,3 @@ } }; - -#endif // SHARE_VM_LOGGING_LOGHANDLE_HPP diff --git a/src/hotspot/share/logging/logLevel.hpp b/src/hotspot/share/logging/logLevel.hpp --- a/src/hotspot/share/logging/logLevel.hpp +++ b/src/hotspot/share/logging/logLevel.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGLEVEL_HPP -#define SHARE_VM_LOGGING_LOGLEVEL_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/macros.hpp" @@ -78,5 +77,3 @@ }; typedef LogLevel::type LogLevelType; - -#endif // SHARE_VM_LOGGING_LOGLEVEL_HPP diff --git a/src/hotspot/share/logging/logMessage.hpp b/src/hotspot/share/logging/logMessage.hpp --- a/src/hotspot/share/logging/logMessage.hpp +++ b/src/hotspot/share/logging/logMessage.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGMESSAGE_HPP -#define SHARE_VM_LOGGING_LOGMESSAGE_HPP +#pragma once #include "logging/log.hpp" #include "logging/logMessageBuffer.hpp" @@ -101,5 +100,3 @@ LOG_LEVEL_LIST #undef LOG_LEVEL }; - -#endif // SHARE_VM_LOGGING_LOGMESSAGE_HPP diff --git a/src/hotspot/share/logging/logMessageBuffer.hpp b/src/hotspot/share/logging/logMessageBuffer.hpp --- a/src/hotspot/share/logging/logMessageBuffer.hpp +++ b/src/hotspot/share/logging/logMessageBuffer.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGMESSAGEBUFFER_HPP -#define SHARE_VM_LOGGING_LOGMESSAGEBUFFER_HPP +#pragma once #include "logging/logDecorations.hpp" #include "logging/logLevel.hpp" @@ -127,5 +126,3 @@ LOG_LEVEL_LIST #undef LOG_LEVEL }; - -#endif // SHARE_VM_LOGGING_LOGMESSAGEBUFFER_HPP diff --git a/src/hotspot/share/logging/logOutput.hpp b/src/hotspot/share/logging/logOutput.hpp --- a/src/hotspot/share/logging/logOutput.hpp +++ b/src/hotspot/share/logging/logOutput.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGOUTPUT_HPP -#define SHARE_VM_LOGGING_LOGOUTPUT_HPP +#pragma once #include "logging/logDecorators.hpp" #include "logging/logLevel.hpp" @@ -100,5 +99,3 @@ virtual int write(const LogDecorations& decorations, const char* msg) = 0; virtual int write(LogMessageBuffer::Iterator msg_iterator) = 0; }; - -#endif // SHARE_VM_LOGGING_LOGOUTPUT_HPP diff --git a/src/hotspot/share/logging/logOutputList.hpp b/src/hotspot/share/logging/logOutputList.hpp --- a/src/hotspot/share/logging/logOutputList.hpp +++ b/src/hotspot/share/logging/logOutputList.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGOUTPUTLIST_HPP -#define SHARE_VM_LOGGING_LOGOUTPUTLIST_HPP +#pragma once #include "logging/logLevel.hpp" #include "memory/allocation.hpp" @@ -127,5 +126,3 @@ return NULL; } }; - -#endif // SHARE_VM_LOGGING_LOGOUTPUTLIST_HPP diff --git a/src/hotspot/share/logging/logPrefix.hpp b/src/hotspot/share/logging/logPrefix.hpp --- a/src/hotspot/share/logging/logPrefix.hpp +++ b/src/hotspot/share/logging/logPrefix.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGPREFIX_HPP -#define SHARE_VM_LOGGING_LOGPREFIX_HPP +#pragma once #include "gc/shared/gcId.hpp" #include "logging/logTag.hpp" @@ -116,5 +115,3 @@ }; LOG_PREFIX_LIST #undef LOG_PREFIX - -#endif // SHARE_VM_LOGGING_LOGPREFIX_HPP diff --git a/src/hotspot/share/logging/logSelection.hpp b/src/hotspot/share/logging/logSelection.hpp --- a/src/hotspot/share/logging/logSelection.hpp +++ b/src/hotspot/share/logging/logSelection.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGSELECTION_HPP -#define SHARE_VM_LOGGING_LOGSELECTION_HPP +#pragma once #include "logging/logLevel.hpp" #include "logging/logTag.hpp" @@ -70,5 +69,3 @@ // Compute a similarity measure in the range [0, 1], where higher means more similar double similarity(const LogSelection& other) const; }; - -#endif // SHARE_VM_LOGGING_LOGSELECTION_HPP diff --git a/src/hotspot/share/logging/logSelectionList.hpp b/src/hotspot/share/logging/logSelectionList.hpp --- a/src/hotspot/share/logging/logSelectionList.hpp +++ b/src/hotspot/share/logging/logSelectionList.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGSELECTIONLIST_HPP -#define SHARE_VM_LOGGING_LOGSELECTIONLIST_HPP +#pragma once #include "logging/logConfiguration.hpp" #include "logging/logSelection.hpp" @@ -61,5 +60,3 @@ // this function will list all the invalid selections on the stream. bool verify_selections(outputStream* out = NULL) const; }; - -#endif // SHARE_VM_LOGGING_LOGSELECTIONLIST_HPP diff --git a/src/hotspot/share/logging/logStream.hpp b/src/hotspot/share/logging/logStream.hpp --- a/src/hotspot/share/logging/logStream.hpp +++ b/src/hotspot/share/logging/logStream.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_LOGGING_LOGSTREAM_HPP -#define SHARE_VM_LOGGING_LOGSTREAM_HPP +#pragma once #include "logging/log.hpp" #include "logging/logHandle.hpp" @@ -104,5 +103,3 @@ public: LogStreamTemplate() : LogStream((LogTargetImpl*)NULL) {} }; - -#endif // SHARE_VM_LOGGING_LOGSTREAM_HPP diff --git a/src/hotspot/share/logging/logTag.hpp b/src/hotspot/share/logging/logTag.hpp --- a/src/hotspot/share/logging/logTag.hpp +++ b/src/hotspot/share/logging/logTag.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGTAG_HPP -#define SHARE_VM_LOGGING_LOGTAG_HPP +#pragma once #include "logging/logTag_ext.hpp" #include "memory/allocation.hpp" @@ -219,5 +218,3 @@ }; typedef LogTag::type LogTagType; - -#endif // SHARE_VM_LOGGING_LOGTAG_HPP diff --git a/src/hotspot/share/logging/logTagSet.hpp b/src/hotspot/share/logging/logTagSet.hpp --- a/src/hotspot/share/logging/logTagSet.hpp +++ b/src/hotspot/share/logging/logTagSet.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGTAGSET_HPP -#define SHARE_VM_LOGGING_LOGTAGSET_HPP +#pragma once #include "logging/logDecorators.hpp" #include "logging/logLevel.hpp" @@ -155,5 +154,3 @@ // tagset. This _tagset contains the configuration for those tags. template LogTagSet LogTagSetMapping::_tagset(&LogPrefix::prefix, T0, T1, T2, T3, T4); - -#endif // SHARE_VM_LOGGING_LOGTAGSET_HPP diff --git a/src/hotspot/share/logging/logTagSetDescriptions.hpp b/src/hotspot/share/logging/logTagSetDescriptions.hpp --- a/src/hotspot/share/logging/logTagSetDescriptions.hpp +++ b/src/hotspot/share/logging/logTagSetDescriptions.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGTAGSETDESCRIPTIONS_HPP -#define SHARE_VM_LOGGING_LOGTAGSETDESCRIPTIONS_HPP +#pragma once class LogTagSet; @@ -32,5 +31,3 @@ }; extern struct LogTagSetDescription tagset_descriptions[]; - -#endif // SHARE_VM_LOGGING_LOGTAGSETDESCRIPTIONS_HPP diff --git a/src/hotspot/share/logging/logTag_ext.hpp b/src/hotspot/share/logging/logTag_ext.hpp --- a/src/hotspot/share/logging/logTag_ext.hpp +++ b/src/hotspot/share/logging/logTag_ext.hpp @@ -21,9 +21,6 @@ * questions. * */ -#ifndef SHARE_VM_LOGGING_LOGTAG_EXT_HPP -#define SHARE_VM_LOGGING_LOGTAG_EXT_HPP +#pragma once #define LOG_TAG_LIST_EXT - -#endif // SHARE_VM_LOGGING_LOGTAG_EXT_HPP diff --git a/src/hotspot/share/memory/allocation.hpp b/src/hotspot/share/memory/allocation.hpp --- a/src/hotspot/share/memory/allocation.hpp +++ b/src/hotspot/share/memory/allocation.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_ALLOCATION_HPP -#define SHARE_VM_MEMORY_ALLOCATION_HPP +#pragma once #include "runtime/globals.hpp" #include "utilities/globalDefinitions.hpp" @@ -569,5 +568,3 @@ static E* allocate(size_t length, MEMFLAGS flags); static void free(E* addr); }; - -#endif // SHARE_VM_MEMORY_ALLOCATION_HPP diff --git a/src/hotspot/share/memory/allocation.inline.hpp b/src/hotspot/share/memory/allocation.inline.hpp --- a/src/hotspot/share/memory/allocation.inline.hpp +++ b/src/hotspot/share/memory/allocation.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP -#define SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP +#pragma once #include "runtime/atomic.hpp" #include "runtime/os.hpp" @@ -170,5 +169,3 @@ } } } - -#endif // SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP diff --git a/src/hotspot/share/memory/arena.hpp b/src/hotspot/share/memory/arena.hpp --- a/src/hotspot/share/memory/arena.hpp +++ b/src/hotspot/share/memory/arena.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_ARENA_HPP -#define SHARE_VM_ARENA_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/globals.hpp" @@ -255,5 +254,3 @@ #define NEW_ARENA_OBJ(arena, type) \ NEW_ARENA_ARRAY(arena, type, 1) - -#endif // SHARE_VM_ARENA_HPP diff --git a/src/hotspot/share/memory/binaryTreeDictionary.hpp b/src/hotspot/share/memory/binaryTreeDictionary.hpp --- a/src/hotspot/share/memory/binaryTreeDictionary.hpp +++ b/src/hotspot/share/memory/binaryTreeDictionary.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_BINARYTREEDICTIONARY_HPP -#define SHARE_VM_MEMORY_BINARYTREEDICTIONARY_HPP +#pragma once #include "memory/freeList.hpp" #include "memory/memRegion.hpp" @@ -391,5 +390,3 @@ return false; } }; - -#endif // SHARE_VM_MEMORY_BINARYTREEDICTIONARY_HPP diff --git a/src/hotspot/share/memory/binaryTreeDictionary.inline.hpp b/src/hotspot/share/memory/binaryTreeDictionary.inline.hpp --- a/src/hotspot/share/memory/binaryTreeDictionary.inline.hpp +++ b/src/hotspot/share/memory/binaryTreeDictionary.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP -#define SHARE_VM_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP +#pragma once #include "gc/shared/spaceDecorator.hpp" #include "logging/log.hpp" @@ -1034,5 +1033,3 @@ ) return total_size(); } - -#endif // SHARE_VM_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP diff --git a/src/hotspot/share/memory/filemap.hpp b/src/hotspot/share/memory/filemap.hpp --- a/src/hotspot/share/memory/filemap.hpp +++ b/src/hotspot/share/memory/filemap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_FILEMAP_HPP -#define SHARE_VM_MEMORY_FILEMAP_HPP +#pragma once #include "classfile/classLoader.hpp" #include "include/cds.h" @@ -349,5 +348,3 @@ address decode_start_address(CDSFileMapRegion* spc, bool with_current_oop_encoding_mode); }; - -#endif // SHARE_VM_MEMORY_FILEMAP_HPP diff --git a/src/hotspot/share/memory/freeList.hpp b/src/hotspot/share/memory/freeList.hpp --- a/src/hotspot/share/memory/freeList.hpp +++ b/src/hotspot/share/memory/freeList.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_FREELIST_HPP -#define SHARE_VM_MEMORY_FREELIST_HPP +#pragma once // A class for maintaining a free list of Chunk's. The FreeList // maintains a the structure of the list (head, tail, etc.) plus @@ -172,5 +171,3 @@ static void print_labels_on(outputStream* st, const char* c); void print_on(outputStream* st, const char* c = NULL) const; }; - -#endif // SHARE_VM_MEMORY_FREELIST_HPP diff --git a/src/hotspot/share/memory/freeList.inline.hpp b/src/hotspot/share/memory/freeList.inline.hpp --- a/src/hotspot/share/memory/freeList.inline.hpp +++ b/src/hotspot/share/memory/freeList.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_MEMORY_FREELIST_INLINE_HPP -#define SHARE_MEMORY_FREELIST_INLINE_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "memory/freeList.hpp" @@ -326,5 +325,3 @@ st->print(SIZE_FORMAT_W(16), size()); } } - -#endif // SHARE_MEMORY_FREELIST_INLINE_HPP diff --git a/src/hotspot/share/memory/guardedMemory.hpp b/src/hotspot/share/memory/guardedMemory.hpp --- a/src/hotspot/share/memory/guardedMemory.hpp +++ b/src/hotspot/share/memory/guardedMemory.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_GUARDEDMEMORY_HPP -#define SHARE_VM_MEMORY_GUARDEDMEMORY_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -319,5 +318,3 @@ static bool free_copy(void* p); }; // GuardedMemory - -#endif // SHARE_VM_MEMORY_GUARDEDMEMORY_HPP diff --git a/src/hotspot/share/memory/heap.hpp b/src/hotspot/share/memory/heap.hpp --- a/src/hotspot/share/memory/heap.hpp +++ b/src/hotspot/share/memory/heap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_HEAP_HPP -#define SHARE_VM_MEMORY_HEAP_HPP +#pragma once #include "code/codeBlob.hpp" #include "memory/allocation.hpp" @@ -222,5 +221,3 @@ void verify() PRODUCT_RETURN; void print() PRODUCT_RETURN; }; - -#endif // SHARE_VM_MEMORY_HEAP_HPP diff --git a/src/hotspot/share/memory/heapInspection.hpp b/src/hotspot/share/memory/heapInspection.hpp --- a/src/hotspot/share/memory/heapInspection.hpp +++ b/src/hotspot/share/memory/heapInspection.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_HEAPINSPECTION_HPP -#define SHARE_VM_MEMORY_HEAPINSPECTION_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/objArrayOop.hpp" @@ -364,5 +363,3 @@ private: void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL); }; - -#endif // SHARE_VM_MEMORY_HEAPINSPECTION_HPP diff --git a/src/hotspot/share/memory/heapShared.hpp b/src/hotspot/share/memory/heapShared.hpp --- a/src/hotspot/share/memory/heapShared.hpp +++ b/src/hotspot/share/memory/heapShared.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_HEAPSHARED_HPP -#define SHARE_VM_MEMORY_HEAPSHARED_HPP +#pragma once #include "classfile/compactHashtable.hpp" #include "classfile/systemDictionary.hpp" @@ -342,4 +341,3 @@ static void write_subgraph_info_table() NOT_CDS_JAVA_HEAP_RETURN; static void serialize_subgraph_info_table_header(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN; }; -#endif // SHARE_VM_MEMORY_HEAPSHARED_HPP diff --git a/src/hotspot/share/memory/heapShared.inline.hpp b/src/hotspot/share/memory/heapShared.inline.hpp --- a/src/hotspot/share/memory/heapShared.inline.hpp +++ b/src/hotspot/share/memory/heapShared.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP -#define SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP +#pragma once #include "oops/compressedOops.inline.hpp" #include "memory/heapShared.hpp" @@ -45,5 +44,3 @@ } #endif - -#endif // SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP diff --git a/src/hotspot/share/memory/iterator.hpp b/src/hotspot/share/memory/iterator.hpp --- a/src/hotspot/share/memory/iterator.hpp +++ b/src/hotspot/share/memory/iterator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_ITERATOR_HPP -#define SHARE_VM_MEMORY_ITERATOR_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/memRegion.hpp" @@ -361,5 +360,3 @@ template static void oop_oop_iterate(OopClosureType* cl, oop obj, Klass* klass, MemRegion mr); template static void oop_oop_iterate_backwards(OopClosureType* cl, oop obj, Klass* klass); }; - -#endif // SHARE_VM_MEMORY_ITERATOR_HPP diff --git a/src/hotspot/share/memory/iterator.inline.hpp b/src/hotspot/share/memory/iterator.inline.hpp --- a/src/hotspot/share/memory/iterator.inline.hpp +++ b/src/hotspot/share/memory/iterator.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_ITERATOR_INLINE_HPP -#define SHARE_VM_MEMORY_ITERATOR_INLINE_HPP +#pragma once #include "classfile/classLoaderData.hpp" #include "memory/iterator.hpp" @@ -419,5 +418,3 @@ void OopIteratorClosureDispatch::oop_oop_iterate_backwards(OopClosureType* cl, oop obj, Klass* klass) { OopOopIterateBackwardsDispatch::function(klass)(cl, obj, klass); } - -#endif // SHARE_VM_MEMORY_ITERATOR_INLINE_HPP diff --git a/src/hotspot/share/memory/memRegion.hpp b/src/hotspot/share/memory/memRegion.hpp --- a/src/hotspot/share/memory/memRegion.hpp +++ b/src/hotspot/share/memory/memRegion.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_MEMREGION_HPP -#define SHARE_VM_MEMORY_MEMREGION_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -123,5 +122,3 @@ void operator delete(void* p) {} // nothing to do }; - -#endif // SHARE_VM_MEMORY_MEMREGION_HPP diff --git a/src/hotspot/share/memory/metadataFactory.hpp b/src/hotspot/share/memory/metadataFactory.hpp --- a/src/hotspot/share/memory/metadataFactory.hpp +++ b/src/hotspot/share/memory/metadataFactory.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_METADATAFACTORY_HPP -#define SHARE_VM_MEMORY_METADATAFACTORY_HPP +#pragma once #include "classfile/classLoaderData.hpp" #include "oops/array.hpp" @@ -72,5 +71,3 @@ } } }; - -#endif // SHARE_VM_MEMORY_METADATAFACTORY_HPP diff --git a/src/hotspot/share/memory/metaspace.hpp b/src/hotspot/share/memory/metaspace.hpp --- a/src/hotspot/share/memory/metaspace.hpp +++ b/src/hotspot/share/memory/metaspace.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_MEMORY_METASPACE_HPP -#define SHARE_VM_MEMORY_METASPACE_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/memRegion.hpp" @@ -483,5 +482,3 @@ // a GC. static void compute_new_size(); }; - -#endif // SHARE_VM_MEMORY_METASPACE_HPP diff --git a/src/hotspot/share/memory/metaspace/blockFreelist.hpp b/src/hotspot/share/memory/metaspace/blockFreelist.hpp --- a/src/hotspot/share/memory/metaspace/blockFreelist.hpp +++ b/src/hotspot/share/memory/metaspace/blockFreelist.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_BLOCKFREELIST_HPP -#define SHARE_MEMORY_METASPACE_BLOCKFREELIST_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/binaryTreeDictionary.hpp" @@ -88,6 +87,3 @@ }; } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_BLOCKFREELIST_HPP */ - diff --git a/src/hotspot/share/memory/metaspace/chunkManager.hpp b/src/hotspot/share/memory/metaspace/chunkManager.hpp --- a/src/hotspot/share/memory/metaspace/chunkManager.hpp +++ b/src/hotspot/share/memory/metaspace/chunkManager.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_CHUNKMANAGER_HPP -#define SHARE_MEMORY_METASPACE_CHUNKMANAGER_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/binaryTreeDictionary.hpp" @@ -218,7 +217,3 @@ }; } // namespace metaspace - - -#endif /* SHARE_MEMORY_METASPACE_CHUNKMANAGER_HPP_ */ - diff --git a/src/hotspot/share/memory/metaspace/metaDebug.hpp b/src/hotspot/share/memory/metaspace/metaDebug.hpp --- a/src/hotspot/share/memory/metaspace/metaDebug.hpp +++ b/src/hotspot/share/memory/metaspace/metaDebug.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_METADEBUG_HPP -#define SHARE_MEMORY_METASPACE_METADEBUG_HPP +#pragma once #include "memory/allocation.hpp" @@ -42,6 +41,3 @@ }; } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_METADEBUG_HPP */ - diff --git a/src/hotspot/share/memory/metaspace/metabase.hpp b/src/hotspot/share/memory/metaspace/metabase.hpp --- a/src/hotspot/share/memory/metaspace/metabase.hpp +++ b/src/hotspot/share/memory/metaspace/metabase.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_METABASE_HPP -#define SHARE_MEMORY_METASPACE_METABASE_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -77,6 +76,3 @@ }; } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_METABASE_HPP */ - diff --git a/src/hotspot/share/memory/metaspace/metablock.hpp b/src/hotspot/share/memory/metaspace/metablock.hpp --- a/src/hotspot/share/memory/metaspace/metablock.hpp +++ b/src/hotspot/share/memory/metaspace/metablock.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_METABLOCK_HPP -#define SHARE_MEMORY_METASPACE_METABLOCK_HPP +#pragma once #include "memory/metaspace/metabase.hpp" #include "utilities/globalDefinitions.hpp" @@ -46,6 +45,3 @@ }; } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_METABLOCK_HPP */ - diff --git a/src/hotspot/share/memory/metaspace/metachunk.hpp b/src/hotspot/share/memory/metaspace/metachunk.hpp --- a/src/hotspot/share/memory/metaspace/metachunk.hpp +++ b/src/hotspot/share/memory/metaspace/metachunk.hpp @@ -21,8 +21,7 @@ * questions. * */ -#ifndef SHARE_VM_MEMORY_METACHUNK_HPP -#define SHARE_VM_MEMORY_METACHUNK_HPP +#pragma once #include "memory/metaspace/metabase.hpp" #include "memory/metaspace/metaspaceCommon.hpp" @@ -169,5 +168,3 @@ void do_update_in_use_info_for_chunk(Metachunk* chunk, bool inuse); } // namespace metaspace - -#endif // SHARE_VM_MEMORY_METACHUNK_HPP diff --git a/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp --- a/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_METASPACECOMMON_HPP -#define SHARE_MEMORY_METASPACE_METASPACECOMMON_HPP +#pragma once #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -122,6 +121,3 @@ } } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP */ - diff --git a/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp b/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp --- a/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp @@ -23,8 +23,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_METASPACEDCMD_HPP -#define SHARE_MEMORY_METASPACE_METASPACEDCMD_HPP +#pragma once #include "services/diagnosticCommand.hpp" @@ -62,5 +61,3 @@ }; } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP */ diff --git a/src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp b/src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp --- a/src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp @@ -23,8 +23,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP -#define SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "memory/metaspace.hpp" // for MetadataType enum @@ -183,6 +182,3 @@ }; // ClassLoaderMetaspaceStatistics } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP */ - diff --git a/src/hotspot/share/memory/metaspace/occupancyMap.hpp b/src/hotspot/share/memory/metaspace/occupancyMap.hpp --- a/src/hotspot/share/memory/metaspace/occupancyMap.hpp +++ b/src/hotspot/share/memory/metaspace/occupancyMap.hpp @@ -23,8 +23,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_OCCUPANCYMAP_HPP -#define SHARE_MEMORY_METASPACE_OCCUPANCYMAP_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -238,6 +237,3 @@ }; } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_OCCUPANCYMAP_HPP */ - diff --git a/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp --- a/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp +++ b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_PRINTCLDMETASPACEINFOCLOSURE_HPP -#define SHARE_MEMORY_METASPACE_PRINTCLDMETASPACEINFOCLOSURE_HPP +#pragma once #include "memory/iterator.hpp" #include "memory/metaspace.hpp" @@ -59,6 +58,3 @@ }; } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_PRINTCLDMETASPACEINFOCLOSURE_HPP */ - diff --git a/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp --- a/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp +++ b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp @@ -23,8 +23,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP_ -#define SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP_ +#pragma once #include "memory/iterator.hpp" #include "utilities/globalDefinitions.hpp" @@ -54,5 +53,3 @@ }; // end: PrintKlassInfoClosure } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP_ */ diff --git a/src/hotspot/share/memory/metaspace/smallBlocks.hpp b/src/hotspot/share/memory/metaspace/smallBlocks.hpp --- a/src/hotspot/share/memory/metaspace/smallBlocks.hpp +++ b/src/hotspot/share/memory/metaspace/smallBlocks.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_SMALLBLOCKS_HPP -#define SHARE_MEMORY_METASPACE_SMALLBLOCKS_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/binaryTreeDictionary.hpp" @@ -83,7 +82,3 @@ }; } // namespace metaspace - - -#endif /* SHARE_MEMORY_METASPACE_SMALLBLOCKS_HPP */ - diff --git a/src/hotspot/share/memory/metaspace/spaceManager.hpp b/src/hotspot/share/memory/metaspace/spaceManager.hpp --- a/src/hotspot/share/memory/metaspace/spaceManager.hpp +++ b/src/hotspot/share/memory/metaspace/spaceManager.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_SPACEMANAGER_HPP -#define SHARE_MEMORY_METASPACE_SPACEMANAGER_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/metaspace.hpp" @@ -229,6 +228,3 @@ } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_SPACEMANAGER_HPP */ - diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp b/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp --- a/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp +++ b/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_VIRTUALSPACELIST_HPP -#define SHARE_MEMORY_METASPACE_VIRTUALSPACELIST_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/metaspace/virtualSpaceNode.hpp" @@ -147,6 +146,3 @@ }; } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_VIRTUALSPACELIST_HPP */ - diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp b/src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp --- a/src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp +++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_MEMORY_METASPACE_VIRTUALSPACENODE_HPP -#define SHARE_MEMORY_METASPACE_VIRTUALSPACENODE_HPP +#pragma once #include "memory/virtualspace.hpp" #include "memory/memRegion.hpp" @@ -161,5 +160,3 @@ }; } // namespace metaspace - -#endif /* SHARE_MEMORY_METASPACE_VIRTUALSPACENODE_HPP */ diff --git a/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp b/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp --- a/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp +++ b/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP -#define SHARE_VM_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP +#pragma once class MetaspaceChunkFreeListSummary { @@ -99,5 +98,3 @@ return _humongous_chunks_size_in_bytes; } }; - -#endif // SHARE_VM_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP diff --git a/src/hotspot/share/memory/metaspaceClosure.hpp b/src/hotspot/share/memory/metaspaceClosure.hpp --- a/src/hotspot/share/memory/metaspaceClosure.hpp +++ b/src/hotspot/share/memory/metaspaceClosure.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_METASPACE_ITERATOR_HPP -#define SHARE_VM_MEMORY_METASPACE_ITERATOR_HPP +#pragma once #include "logging/log.hpp" #include "memory/allocation.hpp" @@ -272,5 +271,3 @@ private: KVHashtable _has_been_visited; }; - -#endif // SHARE_VM_MEMORY_METASPACE_ITERATOR_HPP diff --git a/src/hotspot/share/memory/metaspaceCounters.hpp b/src/hotspot/share/memory/metaspaceCounters.hpp --- a/src/hotspot/share/memory/metaspaceCounters.hpp +++ b/src/hotspot/share/memory/metaspaceCounters.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_METASPACECOUNTERS_HPP -#define SHARE_VM_MEMORY_METASPACECOUNTERS_HPP +#pragma once #include "memory/allocation.hpp" @@ -50,5 +49,3 @@ static void initialize_performance_counters(); static void update_performance_counters(); }; - -#endif // SHARE_VM_MEMORY_METASPACECOUNTERS_HPP diff --git a/src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp b/src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp --- a/src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp +++ b/src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP -#define SHARE_VM_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -48,5 +47,3 @@ }; } }; - -#endif // SHARE_VM_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP diff --git a/src/hotspot/share/memory/metaspaceShared.hpp b/src/hotspot/share/memory/metaspaceShared.hpp --- a/src/hotspot/share/memory/metaspaceShared.hpp +++ b/src/hotspot/share/memory/metaspaceShared.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_METASPACESHARED_HPP -#define SHARE_VM_MEMORY_METASPACESHARED_HPP +#pragma once #include "classfile/compactHashtable.hpp" #include "memory/allocation.hpp" @@ -203,4 +202,3 @@ private: static void read_extra_data(const char* filename, TRAPS) NOT_CDS_RETURN; }; -#endif // SHARE_VM_MEMORY_METASPACESHARED_HPP diff --git a/src/hotspot/share/memory/metaspaceShared.inline.hpp b/src/hotspot/share/memory/metaspaceShared.inline.hpp --- a/src/hotspot/share/memory/metaspaceShared.inline.hpp +++ b/src/hotspot/share/memory/metaspaceShared.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_METASPACESHARED_INLINE_HPP -#define SHARE_VM_MEMORY_METASPACESHARED_INLINE_HPP +#pragma once #include "memory/metaspaceShared.hpp" #if INCLUDE_G1GC @@ -35,5 +34,3 @@ return (p == NULL) ? false : G1ArchiveAllocator::is_archive_object(p); } #endif - -#endif // SHARE_VM_MEMORY_METASPACESHARED_INLINE_HPP diff --git a/src/hotspot/share/memory/metaspaceTracer.hpp b/src/hotspot/share/memory/metaspaceTracer.hpp --- a/src/hotspot/share/memory/metaspaceTracer.hpp +++ b/src/hotspot/share/memory/metaspaceTracer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_METASPACETRACER_HPP -#define SHARE_VM_MEMORY_METASPACETRACER_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/metaspace.hpp" @@ -51,5 +50,3 @@ Metaspace::MetadataType mdtype) const; }; - -#endif // SHARE_VM_MEMORY_METASPACETRACER_HPP diff --git a/src/hotspot/share/memory/oopFactory.hpp b/src/hotspot/share/memory/oopFactory.hpp --- a/src/hotspot/share/memory/oopFactory.hpp +++ b/src/hotspot/share/memory/oopFactory.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_OOPFACTORY_HPP -#define SHARE_VM_MEMORY_OOPFACTORY_HPP +#pragma once #include "classfile/symbolTable.hpp" #include "classfile/systemDictionary.hpp" @@ -71,5 +70,3 @@ static objArrayHandle new_objArray_handle(Klass* klass, int length, TRAPS); static typeArrayHandle new_byteArray_handle(int length, TRAPS); }; - -#endif // SHARE_VM_MEMORY_OOPFACTORY_HPP diff --git a/src/hotspot/share/memory/padded.hpp b/src/hotspot/share/memory/padded.hpp --- a/src/hotspot/share/memory/padded.hpp +++ b/src/hotspot/share/memory/padded.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_PADDED_HPP -#define SHARE_VM_MEMORY_PADDED_HPP +#pragma once #include "utilities/align.hpp" #include "utilities/globalDefinitions.hpp" @@ -116,5 +115,3 @@ public: static T* create_unfreeable(size_t length); }; - -#endif // SHARE_VM_MEMORY_PADDED_HPP diff --git a/src/hotspot/share/memory/padded.inline.hpp b/src/hotspot/share/memory/padded.inline.hpp --- a/src/hotspot/share/memory/padded.inline.hpp +++ b/src/hotspot/share/memory/padded.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_PADDED_INLINE_HPP -#define SHARE_VM_MEMORY_PADDED_INLINE_HPP +#pragma once #include "memory/allocation.inline.hpp" #include "memory/padded.hpp" @@ -89,5 +88,3 @@ return (T*)align_up(chunk, alignment); } - -#endif // SHARE_VM_MEMORY_PADDED_INLINE_HPP diff --git a/src/hotspot/share/memory/referenceType.hpp b/src/hotspot/share/memory/referenceType.hpp --- a/src/hotspot/share/memory/referenceType.hpp +++ b/src/hotspot/share/memory/referenceType.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_REFERENCETYPE_HPP -#define SHARE_VM_MEMORY_REFERENCETYPE_HPP +#pragma once #include "utilities/debug.hpp" @@ -37,5 +36,3 @@ REF_FINAL, // Subclass of java/lang/ref/FinalReference REF_PHANTOM // Subclass of java/lang/ref/PhantomReference }; - -#endif // SHARE_VM_MEMORY_REFERENCETYPE_HPP diff --git a/src/hotspot/share/memory/resourceArea.hpp b/src/hotspot/share/memory/resourceArea.hpp --- a/src/hotspot/share/memory/resourceArea.hpp +++ b/src/hotspot/share/memory/resourceArea.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_RESOURCEAREA_HPP -#define SHARE_VM_MEMORY_RESOURCEAREA_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/thread.hpp" @@ -260,5 +259,3 @@ void free_malloced_objects() PRODUCT_RETURN; size_t size_in_bytes() { return _size_in_bytes; }; }; - -#endif // SHARE_VM_MEMORY_RESOURCEAREA_HPP diff --git a/src/hotspot/share/memory/resourceArea.inline.hpp b/src/hotspot/share/memory/resourceArea.inline.hpp --- a/src/hotspot/share/memory/resourceArea.inline.hpp +++ b/src/hotspot/share/memory/resourceArea.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_RESOURCEAREA_INLINE_HPP -#define SHARE_VM_MEMORY_RESOURCEAREA_INLINE_HPP +#pragma once #include "memory/resourceArea.hpp" @@ -39,5 +38,3 @@ #endif return (char*)Amalloc(size, alloc_failmode); } - -#endif // SHARE_VM_MEMORY_RESOURCEAREA_INLINE_HPP diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp --- a/src/hotspot/share/memory/universe.hpp +++ b/src/hotspot/share/memory/universe.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_MEMORY_UNIVERSE_HPP -#define SHARE_VM_MEMORY_UNIVERSE_HPP +#pragma once #include "oops/array.hpp" #include "runtime/handles.hpp" @@ -537,5 +536,3 @@ size_t bytesize() { return _bytesize; } oop get_oop() { return _oop; } }; - -#endif // SHARE_VM_MEMORY_UNIVERSE_HPP diff --git a/src/hotspot/share/memory/virtualspace.hpp b/src/hotspot/share/memory/virtualspace.hpp --- a/src/hotspot/share/memory/virtualspace.hpp +++ b/src/hotspot/share/memory/virtualspace.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_VIRTUALSPACE_HPP -#define SHARE_VM_RUNTIME_VIRTUALSPACE_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -235,5 +234,3 @@ void print_on(outputStream* out) PRODUCT_RETURN; void print(); }; - -#endif // SHARE_VM_RUNTIME_VIRTUALSPACE_HPP diff --git a/src/hotspot/share/metaprogramming/conditional.hpp b/src/hotspot/share/metaprogramming/conditional.hpp --- a/src/hotspot/share/metaprogramming/conditional.hpp +++ b/src/hotspot/share/metaprogramming/conditional.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_CONDITIONAL_HPP -#define SHARE_VM_METAPROGRAMMING_CONDITIONAL_HPP +#pragma once #include "memory/allocation.hpp" @@ -39,5 +38,3 @@ struct Conditional: AllStatic { typedef FalseType type; }; - -#endif // SHARE_VM_METAPROGRAMMING_CONDITIONAL_HPP diff --git a/src/hotspot/share/metaprogramming/decay.hpp b/src/hotspot/share/metaprogramming/decay.hpp --- a/src/hotspot/share/metaprogramming/decay.hpp +++ b/src/hotspot/share/metaprogramming/decay.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_DECAY_HPP -#define SHARE_VM_METAPROGRAMMING_DECAY_HPP +#pragma once #include "memory/allocation.hpp" #include "metaprogramming/removeCV.hpp" @@ -37,5 +36,3 @@ struct Decay: AllStatic { typedef typename RemoveCV::type>::type type; }; - -#endif // SHARE_VM_METAPROGRAMMING_DECAY_HPP diff --git a/src/hotspot/share/metaprogramming/enableIf.hpp b/src/hotspot/share/metaprogramming/enableIf.hpp --- a/src/hotspot/share/metaprogramming/enableIf.hpp +++ b/src/hotspot/share/metaprogramming/enableIf.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_ENABLEIF_HPP -#define SHARE_VM_METAPROGRAMMING_ENABLEIF_HPP +#pragma once #include "memory/allocation.hpp" @@ -43,5 +42,3 @@ struct EnableIf: AllStatic { typedef T type; }; - -#endif // SHARE_VM_METAPROGRAMMING_ENABLEIF_HPP diff --git a/src/hotspot/share/metaprogramming/integralConstant.hpp b/src/hotspot/share/metaprogramming/integralConstant.hpp --- a/src/hotspot/share/metaprogramming/integralConstant.hpp +++ b/src/hotspot/share/metaprogramming/integralConstant.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_INTEGRALCONSTANT_HPP -#define SHARE_VM_METAPROGRAMMING_INTEGRALCONSTANT_HPP +#pragma once // An Integral Constant is a class providing a compile-time value of an @@ -55,5 +54,3 @@ // A bool valued IntegralConstant whose value is false. typedef IntegralConstant FalseType; - -#endif // SHARE_VM_METAPROGRAMMING_INTEGRALCONSTANT_HPP diff --git a/src/hotspot/share/metaprogramming/isConst.hpp b/src/hotspot/share/metaprogramming/isConst.hpp --- a/src/hotspot/share/metaprogramming/isConst.hpp +++ b/src/hotspot/share/metaprogramming/isConst.hpp @@ -22,12 +22,9 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_ISCONST_HPP -#define SHARE_VM_METAPROGRAMMING_ISCONST_HPP +#pragma once #include "metaprogramming/integralConstant.hpp" template struct IsConst: public FalseType {}; template struct IsConst: public TrueType {}; - -#endif // SHARE_VM_METAPROGRAMMING_ISCONST_HPP diff --git a/src/hotspot/share/metaprogramming/isFloatingPoint.hpp b/src/hotspot/share/metaprogramming/isFloatingPoint.hpp --- a/src/hotspot/share/metaprogramming/isFloatingPoint.hpp +++ b/src/hotspot/share/metaprogramming/isFloatingPoint.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_ISFLOATINGPOINT_HPP -#define SHARE_VM_METAPROGRAMMING_ISFLOATINGPOINT_HPP +#pragma once #include "metaprogramming/integralConstant.hpp" @@ -46,5 +45,3 @@ template <> struct IsFloatingPoint: public TrueType {}; template <> struct IsFloatingPoint: public TrueType {}; template <> struct IsFloatingPoint: public TrueType {}; - -#endif // SHARE_VM_METAPROGRAMMING_ISFLOATINGPOINT_HPP diff --git a/src/hotspot/share/metaprogramming/isIntegral.hpp b/src/hotspot/share/metaprogramming/isIntegral.hpp --- a/src/hotspot/share/metaprogramming/isIntegral.hpp +++ b/src/hotspot/share/metaprogramming/isIntegral.hpp @@ -23,8 +23,7 @@ */ -#ifndef SHARE_VM_METAPROGRAMMING_ISINTEGRAL_HPP -#define SHARE_VM_METAPROGRAMMING_ISINTEGRAL_HPP +#pragma once #include "metaprogramming/integralConstant.hpp" #include "metaprogramming/isSigned.hpp" @@ -54,5 +53,3 @@ struct IsUnsignedIntegral : public IntegralConstant::value && !IsSigned::value> {}; - -#endif // SHARE_VM_METAPROGRAMMING_ISINTEGRAL_HPP diff --git a/src/hotspot/share/metaprogramming/isPointer.hpp b/src/hotspot/share/metaprogramming/isPointer.hpp --- a/src/hotspot/share/metaprogramming/isPointer.hpp +++ b/src/hotspot/share/metaprogramming/isPointer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_ISPOINTER_HPP -#define SHARE_VM_METAPROGRAMMING_ISPOINTER_HPP +#pragma once #include "metaprogramming/integralConstant.hpp" @@ -36,5 +35,3 @@ template class IsPointer: public TrueType {}; template class IsPointer: public TrueType {}; template class IsPointer: public TrueType {}; - -#endif // SHARE_VM_METAPROGRAMMING_ISPOINTER_HPP diff --git a/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp b/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp --- a/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp +++ b/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_ISREGISTEREDENUM_HPP -#define SHARE_VM_METAPROGRAMMING_ISREGISTEREDENUM_HPP +#pragma once #include "metaprogramming/integralConstant.hpp" @@ -36,6 +35,3 @@ // distinguish. template struct IsRegisteredEnum : public FalseType {}; - -#endif // SHARE_VM_METAPROGRAMMING_ISREGISTEREDENUM_HPP - diff --git a/src/hotspot/share/metaprogramming/isSame.hpp b/src/hotspot/share/metaprogramming/isSame.hpp --- a/src/hotspot/share/metaprogramming/isSame.hpp +++ b/src/hotspot/share/metaprogramming/isSame.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_ISSAME_HPP -#define SHARE_VM_METAPROGRAMMING_ISSAME_HPP +#pragma once #include "metaprogramming/integralConstant.hpp" @@ -34,5 +33,3 @@ template struct IsSame: public TrueType {}; - -#endif // SHARE_VM_METAPROGRAMMING_ISSAME_HPP diff --git a/src/hotspot/share/metaprogramming/isSigned.hpp b/src/hotspot/share/metaprogramming/isSigned.hpp --- a/src/hotspot/share/metaprogramming/isSigned.hpp +++ b/src/hotspot/share/metaprogramming/isSigned.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_ISSIGNED_HPP -#define SHARE_VM_METAPROGRAMMING_ISSIGNED_HPP +#pragma once #include "metaprogramming/integralConstant.hpp" #include "metaprogramming/removeCV.hpp" @@ -33,5 +32,3 @@ struct IsSigned : public IntegralConstant::type>::is_signed> {}; - -#endif // SHARE_VM_METAPROGRAMMING_ISSIGNED_HPP diff --git a/src/hotspot/share/metaprogramming/isVolatile.hpp b/src/hotspot/share/metaprogramming/isVolatile.hpp --- a/src/hotspot/share/metaprogramming/isVolatile.hpp +++ b/src/hotspot/share/metaprogramming/isVolatile.hpp @@ -22,12 +22,9 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_ISVOLATILE_HPP -#define SHARE_VM_METAPROGRAMMING_ISVOLATILE_HPP +#pragma once #include "metaprogramming/integralConstant.hpp" template struct IsVolatile: public FalseType {}; template struct IsVolatile: public TrueType {}; - -#endif // SHARE_VM_METAPROGRAMMING_ISVOLATILE_HPP diff --git a/src/hotspot/share/metaprogramming/primitiveConversions.hpp b/src/hotspot/share/metaprogramming/primitiveConversions.hpp --- a/src/hotspot/share/metaprogramming/primitiveConversions.hpp +++ b/src/hotspot/share/metaprogramming/primitiveConversions.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP -#define SHARE_VM_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP +#pragma once #include "memory/allocation.hpp" #include "metaprogramming/enableIf.hpp" @@ -181,5 +180,3 @@ static Decayed decay(Value x) { return PrimitiveConversions::cast(x); } static Value recover(Decayed x) { return PrimitiveConversions::cast(x); } }; - -#endif // SHARE_VM_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP diff --git a/src/hotspot/share/metaprogramming/removeCV.hpp b/src/hotspot/share/metaprogramming/removeCV.hpp --- a/src/hotspot/share/metaprogramming/removeCV.hpp +++ b/src/hotspot/share/metaprogramming/removeCV.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_REMOVECV_HPP -#define SHARE_VM_METAPROGRAMMING_REMOVECV_HPP +#pragma once #include "memory/allocation.hpp" @@ -46,5 +45,3 @@ struct RemoveCV: AllStatic { typedef T type; }; - -#endif // SHARE_VM_METAPROGRAMMING_REMOVECV_HPP diff --git a/src/hotspot/share/metaprogramming/removePointer.hpp b/src/hotspot/share/metaprogramming/removePointer.hpp --- a/src/hotspot/share/metaprogramming/removePointer.hpp +++ b/src/hotspot/share/metaprogramming/removePointer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_REMOVEPOINTER_HPP -#define SHARE_VM_METAPROGRAMMING_REMOVEPOINTER_HPP +#pragma once #include "memory/allocation.hpp" @@ -37,5 +36,3 @@ template struct RemovePointer: AllStatic { typedef T type; }; template struct RemovePointer: AllStatic { typedef T type; }; template struct RemovePointer: AllStatic { typedef T type; }; - -#endif // SHARE_VM_METAPROGRAMMING_REMOVEPOINTER_HPP diff --git a/src/hotspot/share/metaprogramming/removeReference.hpp b/src/hotspot/share/metaprogramming/removeReference.hpp --- a/src/hotspot/share/metaprogramming/removeReference.hpp +++ b/src/hotspot/share/metaprogramming/removeReference.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_METAPROGRAMMING_REMOVEREFERENCE_HPP -#define SHARE_VM_METAPROGRAMMING_REMOVEREFERENCE_HPP +#pragma once #include "memory/allocation.hpp" @@ -34,5 +33,3 @@ template struct RemoveReference: AllStatic { typedef T type; }; template struct RemoveReference: AllStatic { typedef T type; }; - -#endif // SHARE_VM_METAPROGRAMMING_REMOVEREFERENCE_HPP diff --git a/src/hotspot/share/oops/access.hpp b/src/hotspot/share/oops/access.hpp --- a/src/hotspot/share/oops/access.hpp +++ b/src/hotspot/share/oops/access.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_OOPS_ACCESS_HPP -#define SHARE_OOPS_ACCESS_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/accessBackend.hpp" @@ -378,5 +377,3 @@ (location_decorators ^ IN_HEAP) == 0 )); } - -#endif // SHARE_OOPS_ACCESS_HPP diff --git a/src/hotspot/share/oops/access.inline.hpp b/src/hotspot/share/oops/access.inline.hpp --- a/src/hotspot/share/oops/access.inline.hpp +++ b/src/hotspot/share/oops/access.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_OOPS_ACCESS_INLINE_HPP -#define SHARE_OOPS_ACCESS_INLINE_HPP +#pragma once #include "gc/shared/barrierSetConfig.inline.hpp" #include "oops/access.hpp" @@ -374,5 +373,3 @@ return function(o1, o2); } } - -#endif // SHARE_OOPS_ACCESS_INLINE_HPP diff --git a/src/hotspot/share/oops/accessBackend.hpp b/src/hotspot/share/oops/accessBackend.hpp --- a/src/hotspot/share/oops/accessBackend.hpp +++ b/src/hotspot/share/oops/accessBackend.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_OOPS_ACCESSBACKEND_HPP -#define SHARE_OOPS_ACCESSBACKEND_HPP +#pragma once #include "gc/shared/barrierSetConfig.hpp" #include "memory/allocation.hpp" @@ -1390,5 +1389,3 @@ } }; } - -#endif // SHARE_OOPS_ACCESSBACKEND_HPP diff --git a/src/hotspot/share/oops/accessBackend.inline.hpp b/src/hotspot/share/oops/accessBackend.inline.hpp --- a/src/hotspot/share/oops/accessBackend.inline.hpp +++ b/src/hotspot/share/oops/accessBackend.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP -#define SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP +#pragma once #include "oops/access.hpp" #include "oops/accessBackend.hpp" @@ -362,5 +361,3 @@ // Clear the header dst->init_mark_raw(); } - -#endif // SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP diff --git a/src/hotspot/share/oops/accessDecorators.hpp b/src/hotspot/share/oops/accessDecorators.hpp --- a/src/hotspot/share/oops/accessDecorators.hpp +++ b/src/hotspot/share/oops/accessDecorators.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_OOPS_ACCESSDECORATORS_HPP -#define SHARE_OOPS_ACCESSDECORATORS_HPP +#pragma once #include "gc/shared/barrierSetConfig.hpp" #include "memory/allocation.hpp" @@ -260,5 +259,3 @@ return value; } } - -#endif // SHARE_OOPS_ACCESSDECORATORS_HPP diff --git a/src/hotspot/share/oops/annotations.hpp b/src/hotspot/share/oops/annotations.hpp --- a/src/hotspot/share/oops/annotations.hpp +++ b/src/hotspot/share/oops/annotations.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_ANNOTATIONS_HPP -#define SHARE_VM_OOPS_ANNOTATIONS_HPP +#pragma once #include "oops/array.hpp" #include "oops/metadata.hpp" @@ -106,4 +105,3 @@ #endif void print_value_on(outputStream* st) const; }; -#endif // SHARE_VM_OOPS_ANNOTATIONS_HPP diff --git a/src/hotspot/share/oops/array.hpp b/src/hotspot/share/oops/array.hpp --- a/src/hotspot/share/oops/array.hpp +++ b/src/hotspot/share/oops/array.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_ARRAY_HPP -#define SHARE_VM_OOPS_ARRAY_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/metaspace.hpp" @@ -154,6 +153,3 @@ void print() { print(tty); } #endif // PRODUCT }; - - -#endif // SHARE_VM_OOPS_ARRAY_HPP diff --git a/src/hotspot/share/oops/array.inline.hpp b/src/hotspot/share/oops/array.inline.hpp --- a/src/hotspot/share/oops/array.inline.hpp +++ b/src/hotspot/share/oops/array.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_ARRAY_INLINE_HPP -#define SHARE_VM_OOPS_ARRAY_INLINE_HPP +#pragma once #include "oops/array.hpp" #include "runtime/orderAccess.hpp" @@ -33,5 +32,3 @@ template inline void Array::release_at_put(int which, T contents) { OrderAccess::release_store(adr_at(which), contents); } - -#endif // SHARE_VM_OOPS_ARRAY_INLINE_HPP diff --git a/src/hotspot/share/oops/arrayKlass.hpp b/src/hotspot/share/oops/arrayKlass.hpp --- a/src/hotspot/share/oops/arrayKlass.hpp +++ b/src/hotspot/share/oops/arrayKlass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_ARRAYKLASS_HPP -#define SHARE_VM_OOPS_ARRAYKLASS_HPP +#pragma once #include "memory/universe.hpp" #include "oops/klass.hpp" @@ -143,5 +142,3 @@ void oop_verify_on(oop obj, outputStream* st); }; - -#endif // SHARE_VM_OOPS_ARRAYKLASS_HPP diff --git a/src/hotspot/share/oops/arrayKlass.inline.hpp b/src/hotspot/share/oops/arrayKlass.inline.hpp --- a/src/hotspot/share/oops/arrayKlass.inline.hpp +++ b/src/hotspot/share/oops/arrayKlass.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_ARRAYKLASS_INLINE_HPP -#define SHARE_VM_OOPS_ARRAYKLASS_INLINE_HPP +#pragma once #include "runtime/orderAccess.hpp" #include "oops/arrayKlass.hpp" @@ -35,5 +34,3 @@ inline void ArrayKlass::release_set_higher_dimension(Klass* k) { OrderAccess::release_store(&_higher_dimension, k); } - -#endif // SHARE_VM_OOPS_ARRAYKLASS_INLINE_HPP diff --git a/src/hotspot/share/oops/arrayOop.hpp b/src/hotspot/share/oops/arrayOop.hpp --- a/src/hotspot/share/oops/arrayOop.hpp +++ b/src/hotspot/share/oops/arrayOop.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_ARRAYOOP_HPP -#define SHARE_VM_OOPS_ARRAYOOP_HPP +#pragma once #include "memory/universe.hpp" #include "oops/oop.hpp" @@ -149,5 +148,3 @@ } }; - -#endif // SHARE_VM_OOPS_ARRAYOOP_HPP diff --git a/src/hotspot/share/oops/arrayOop.inline.hpp b/src/hotspot/share/oops/arrayOop.inline.hpp --- a/src/hotspot/share/oops/arrayOop.inline.hpp +++ b/src/hotspot/share/oops/arrayOop.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_OOPS_ARRAYOOP_INLINE_HPP -#define SHARE_OOPS_ARRAYOOP_INLINE_HPP +#pragma once #include "oops/access.inline.hpp" #include "oops/arrayOop.hpp" @@ -36,5 +35,3 @@ void* arrayOopDesc::base_raw(BasicType type) const { return reinterpret_cast(cast_from_oop(as_oop()) + base_offset_in_bytes(type)); } - -#endif // SHARE_OOPS_ARRAYOOP_INLINE_HPP diff --git a/src/hotspot/share/oops/compiledICHolder.hpp b/src/hotspot/share/oops/compiledICHolder.hpp --- a/src/hotspot/share/oops/compiledICHolder.hpp +++ b/src/hotspot/share/oops/compiledICHolder.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_COMPILEDICHOLDEROOP_HPP -#define SHARE_VM_OOPS_COMPILEDICHOLDEROOP_HPP +#pragma once #include "oops/oop.hpp" #include "utilities/macros.hpp" @@ -96,5 +95,3 @@ void claim() NOT_DEBUG_RETURN; }; - -#endif // SHARE_VM_OOPS_COMPILEDICHOLDEROOP_HPP diff --git a/src/hotspot/share/oops/compressedOops.inline.hpp b/src/hotspot/share/oops/compressedOops.inline.hpp --- a/src/hotspot/share/oops/compressedOops.inline.hpp +++ b/src/hotspot/share/oops/compressedOops.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_OOPS_COMPRESSEDOOPS_INLINE_HPP -#define SHARE_OOPS_COMPRESSEDOOPS_INLINE_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "memory/universe.hpp" @@ -80,5 +79,3 @@ inline narrowOop encode_not_null(narrowOop v) { return v; } inline narrowOop encode(narrowOop v) { return v; } } - -#endif // SHARE_OOPS_COMPRESSEDOOPS_INLINE_HPP diff --git a/src/hotspot/share/oops/constMethod.hpp b/src/hotspot/share/oops/constMethod.hpp --- a/src/hotspot/share/oops/constMethod.hpp +++ b/src/hotspot/share/oops/constMethod.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_CONSTMETHODOOP_HPP -#define SHARE_VM_OOPS_CONSTMETHODOOP_HPP +#pragma once #include "oops/oop.hpp" #include "utilities/align.hpp" @@ -560,5 +559,3 @@ // Verify void verify_on(outputStream* st); }; - -#endif // SHARE_VM_OOPS_CONSTMETHODOOP_HPP diff --git a/src/hotspot/share/oops/constantPool.hpp b/src/hotspot/share/oops/constantPool.hpp --- a/src/hotspot/share/oops/constantPool.hpp +++ b/src/hotspot/share/oops/constantPool.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_CONSTANTPOOLOOP_HPP -#define SHARE_VM_OOPS_CONSTANTPOOLOOP_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/arrayOop.hpp" @@ -1023,5 +1022,3 @@ ~SymbolHashMap(); }; // End SymbolHashMap class - -#endif // SHARE_VM_OOPS_CONSTANTPOOLOOP_HPP diff --git a/src/hotspot/share/oops/constantPool.inline.hpp b/src/hotspot/share/oops/constantPool.inline.hpp --- a/src/hotspot/share/oops/constantPool.inline.hpp +++ b/src/hotspot/share/oops/constantPool.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_CONSTANTPOOL_INLINE_HPP -#define SHARE_VM_OOPS_CONSTANTPOOL_INLINE_HPP +#pragma once #include "oops/constantPool.hpp" #include "oops/cpCache.inline.hpp" @@ -66,5 +65,3 @@ oop s = resolved_references()->obj_at(obj_index); return s; } - -#endif // SHARE_VM_OOPS_CONSTANTPOOL_INLINE_HPP diff --git a/src/hotspot/share/oops/cpCache.hpp b/src/hotspot/share/oops/cpCache.hpp --- a/src/hotspot/share/oops/cpCache.hpp +++ b/src/hotspot/share/oops/cpCache.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_CPCACHEOOP_HPP -#define SHARE_VM_OOPS_CPCACHEOOP_HPP +#pragma once #include "interpreter/bytecodes.hpp" #include "memory/allocation.hpp" @@ -525,5 +524,3 @@ // Verify void verify_on(outputStream* st); }; - -#endif // SHARE_VM_OOPS_CPCACHEOOP_HPP diff --git a/src/hotspot/share/oops/cpCache.inline.hpp b/src/hotspot/share/oops/cpCache.inline.hpp --- a/src/hotspot/share/oops/cpCache.inline.hpp +++ b/src/hotspot/share/oops/cpCache.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_CPCACHEOOP_INLINE_HPP -#define SHARE_VM_OOPS_CPCACHEOOP_INLINE_HPP +#pragma once #include "oops/cpCache.hpp" #include "oops/oopHandle.inline.hpp" @@ -98,5 +97,3 @@ } inline oop ConstantPoolCache::resolved_references() { return _resolved_references.resolve(); } - -#endif // SHARE_VM_OOPS_CPCACHEOOP_INLINE_HPP diff --git a/src/hotspot/share/oops/fieldInfo.hpp b/src/hotspot/share/oops/fieldInfo.hpp --- a/src/hotspot/share/oops/fieldInfo.hpp +++ b/src/hotspot/share/oops/fieldInfo.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_FIELDINFO_HPP -#define SHARE_VM_OOPS_FIELDINFO_HPP +#pragma once #include "oops/constantPool.hpp" #include "oops/typeArrayOop.hpp" @@ -253,5 +252,3 @@ return vmSymbols::symbol_at((vmSymbols::SID)symbol_index); } }; - -#endif // SHARE_VM_OOPS_FIELDINFO_HPP diff --git a/src/hotspot/share/oops/fieldStreams.hpp b/src/hotspot/share/oops/fieldStreams.hpp --- a/src/hotspot/share/oops/fieldStreams.hpp +++ b/src/hotspot/share/oops/fieldStreams.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_FIELDSTREAMS_HPP -#define SHARE_VM_OOPS_FIELDSTREAMS_HPP +#pragma once #include "oops/instanceKlass.hpp" #include "oops/fieldInfo.hpp" @@ -245,5 +244,3 @@ AllFieldStream(Array* fields, const constantPoolHandle& constants): FieldStreamBase(fields, constants) {} AllFieldStream(InstanceKlass* k): FieldStreamBase(k->fields(), k->constants()) {} }; - -#endif // SHARE_VM_OOPS_FIELDSTREAMS_HPP diff --git a/src/hotspot/share/oops/generateOopMap.hpp b/src/hotspot/share/oops/generateOopMap.hpp --- a/src/hotspot/share/oops/generateOopMap.hpp +++ b/src/hotspot/share/oops/generateOopMap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_GENERATEOOPMAP_HPP -#define SHARE_VM_OOPS_GENERATEOOPMAP_HPP +#pragma once #include "interpreter/bytecodeStream.hpp" #include "memory/allocation.hpp" @@ -562,5 +561,3 @@ // Call compute_map(CHECK) to generate info. }; - -#endif // SHARE_VM_OOPS_GENERATEOOPMAP_HPP diff --git a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp --- a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp +++ b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_HPP -#define SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_HPP +#pragma once #include "oops/instanceKlass.hpp" #include "utilities/macros.hpp" @@ -67,5 +66,3 @@ template inline void oop_oop_iterate_bounded(oop obj, OopClosureType* closure, MemRegion mr); }; - -#endif // SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_HPP diff --git a/src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp b/src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp --- a/src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp +++ b/src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP -#define SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP +#pragma once #include "classfile/javaClasses.hpp" #include "memory/iterator.hpp" @@ -69,5 +68,3 @@ } } } - -#endif // SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp --- a/src/hotspot/share/oops/instanceKlass.hpp +++ b/src/hotspot/share/oops/instanceKlass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_INSTANCEKLASS_HPP -#define SHARE_VM_OOPS_INSTANCEKLASS_HPP +#pragma once #include "classfile/classLoader.hpp" #include "classfile/classLoaderData.hpp" @@ -1473,5 +1472,3 @@ _idx + InstanceKlass::inner_class_access_flags_offset); } }; - -#endif // SHARE_VM_OOPS_INSTANCEKLASS_HPP diff --git a/src/hotspot/share/oops/instanceKlass.inline.hpp b/src/hotspot/share/oops/instanceKlass.inline.hpp --- a/src/hotspot/share/oops/instanceKlass.inline.hpp +++ b/src/hotspot/share/oops/instanceKlass.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_INSTANCEKLASS_INLINE_HPP -#define SHARE_VM_OOPS_INSTANCEKLASS_INLINE_HPP +#pragma once #include "memory/iterator.hpp" #include "oops/instanceKlass.hpp" @@ -156,5 +155,3 @@ oop_oop_iterate_oop_maps_bounded(obj, closure, mr); } - -#endif // SHARE_VM_OOPS_INSTANCEKLASS_INLINE_HPP diff --git a/src/hotspot/share/oops/instanceMirrorKlass.hpp b/src/hotspot/share/oops/instanceMirrorKlass.hpp --- a/src/hotspot/share/oops/instanceMirrorKlass.hpp +++ b/src/hotspot/share/oops/instanceMirrorKlass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP -#define SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP +#pragma once #include "classfile/systemDictionary.hpp" #include "oops/instanceKlass.hpp" @@ -120,5 +119,3 @@ template inline void oop_oop_iterate_statics_bounded(oop obj, OopClosureType* closure, MemRegion mr); }; - -#endif // SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP diff --git a/src/hotspot/share/oops/instanceMirrorKlass.inline.hpp b/src/hotspot/share/oops/instanceMirrorKlass.inline.hpp --- a/src/hotspot/share/oops/instanceMirrorKlass.inline.hpp +++ b/src/hotspot/share/oops/instanceMirrorKlass.inline.hpp @@ -21,8 +21,7 @@ * */ -#ifndef SHARE_VM_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP -#define SHARE_VM_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP +#pragma once #include "classfile/javaClasses.hpp" #include "oops/instanceKlass.inline.hpp" @@ -126,5 +125,3 @@ oop_oop_iterate_statics_bounded(obj, closure, mr); } - -#endif // SHARE_VM_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP diff --git a/src/hotspot/share/oops/instanceOop.hpp b/src/hotspot/share/oops/instanceOop.hpp --- a/src/hotspot/share/oops/instanceOop.hpp +++ b/src/hotspot/share/oops/instanceOop.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_INSTANCEOOP_HPP -#define SHARE_VM_OOPS_INSTANCEOOP_HPP +#pragma once #include "oops/oop.hpp" @@ -50,5 +49,3 @@ (offset-base_in_bytes) < nonstatic_field_size * heapOopSize); } }; - -#endif // SHARE_VM_OOPS_INSTANCEOOP_HPP diff --git a/src/hotspot/share/oops/instanceRefKlass.hpp b/src/hotspot/share/oops/instanceRefKlass.hpp --- a/src/hotspot/share/oops/instanceRefKlass.hpp +++ b/src/hotspot/share/oops/instanceRefKlass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_INSTANCEREFKLASS_HPP -#define SHARE_VM_OOPS_INSTANCEREFKLASS_HPP +#pragma once #include "oops/instanceKlass.hpp" #include "utilities/macros.hpp" @@ -137,5 +136,3 @@ // Verification void oop_verify_on(oop obj, outputStream* st); }; - -#endif // SHARE_VM_OOPS_INSTANCEREFKLASS_HPP diff --git a/src/hotspot/share/oops/instanceRefKlass.inline.hpp b/src/hotspot/share/oops/instanceRefKlass.inline.hpp --- a/src/hotspot/share/oops/instanceRefKlass.inline.hpp +++ b/src/hotspot/share/oops/instanceRefKlass.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_INSTANCEREFKLASS_INLINE_HPP -#define SHARE_VM_OOPS_INSTANCEREFKLASS_INLINE_HPP +#pragma once #include "classfile/javaClasses.inline.hpp" #include "gc/shared/referenceProcessor.hpp" @@ -196,5 +195,3 @@ p2i(discovered_addr), p2i((oop)HeapAccess::oop_load(discovered_addr))); } #endif - -#endif // SHARE_VM_OOPS_INSTANCEREFKLASS_INLINE_HPP diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp --- a/src/hotspot/share/oops/klass.hpp +++ b/src/hotspot/share/oops/klass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_KLASS_HPP -#define SHARE_VM_OOPS_KLASS_HPP +#pragma once #include "classfile/classLoaderData.hpp" #include "memory/iterator.hpp" @@ -705,5 +704,3 @@ static Klass* decode_klass_not_null(narrowKlass v); static Klass* decode_klass(narrowKlass v); }; - -#endif // SHARE_VM_OOPS_KLASS_HPP diff --git a/src/hotspot/share/oops/klass.inline.hpp b/src/hotspot/share/oops/klass.inline.hpp --- a/src/hotspot/share/oops/klass.inline.hpp +++ b/src/hotspot/share/oops/klass.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_KLASS_INLINE_HPP -#define SHARE_VM_OOPS_KLASS_INLINE_HPP +#pragma once #include "memory/universe.hpp" #include "oops/klass.hpp" @@ -70,5 +69,3 @@ inline Klass* Klass::decode_klass(narrowKlass v) { return is_null(v) ? (Klass*)NULL : decode_klass_not_null(v); } - -#endif // SHARE_VM_OOPS_KLASS_INLINE_HPP diff --git a/src/hotspot/share/oops/klassVtable.hpp b/src/hotspot/share/oops/klassVtable.hpp --- a/src/hotspot/share/oops/klassVtable.hpp +++ b/src/hotspot/share/oops/klassVtable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_KLASSVTABLE_HPP -#define SHARE_VM_OOPS_KLASSVTABLE_HPP +#pragma once #include "oops/oopsHierarchy.hpp" #include "runtime/handles.hpp" @@ -351,5 +350,3 @@ static void update_stats(int size) PRODUCT_RETURN NOT_PRODUCT({ _total_classes++; _total_size += size; }) }; - -#endif // SHARE_VM_OOPS_KLASSVTABLE_HPP diff --git a/src/hotspot/share/oops/markOop.hpp b/src/hotspot/share/oops/markOop.hpp --- a/src/hotspot/share/oops/markOop.hpp +++ b/src/hotspot/share/oops/markOop.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_MARKOOP_HPP -#define SHARE_VM_OOPS_MARKOOP_HPP +#pragma once #include "oops/oop.hpp" @@ -402,5 +401,3 @@ } #endif // _LP64 }; - -#endif // SHARE_VM_OOPS_MARKOOP_HPP diff --git a/src/hotspot/share/oops/markOop.inline.hpp b/src/hotspot/share/oops/markOop.inline.hpp --- a/src/hotspot/share/oops/markOop.inline.hpp +++ b/src/hotspot/share/oops/markOop.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_MARKOOP_INLINE_HPP -#define SHARE_VM_OOPS_MARKOOP_INLINE_HPP +#pragma once #include "oops/klass.hpp" #include "oops/markOop.hpp" @@ -110,5 +109,3 @@ #endif return obj->klass()->prototype_header(); } - -#endif // SHARE_VM_OOPS_MARKOOP_INLINE_HPP diff --git a/src/hotspot/share/oops/metadata.hpp b/src/hotspot/share/oops/metadata.hpp --- a/src/hotspot/share/oops/metadata.hpp +++ b/src/hotspot/share/oops/metadata.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_METADATA_HPP -#define SHARE_VM_OOPS_METADATA_HPP +#pragma once #include "utilities/exceptions.hpp" #include "utilities/globalDefinitions.hpp" @@ -75,5 +74,3 @@ // and constant pools need to be set, but someday instanceKlasses might also. static void mark_on_stack(Metadata* m) { m->set_on_stack(true); } }; - -#endif // SHARE_VM_OOPS_METADATA_HPP diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp --- a/src/hotspot/share/oops/method.hpp +++ b/src/hotspot/share/oops/method.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_METHODOOP_HPP -#define SHARE_VM_OOPS_METHODOOP_HPP +#pragma once #include "classfile/vmSymbols.hpp" #include "code/compressedStream.hpp" @@ -1175,5 +1174,3 @@ _table[idx].catch_type_index = value; } }; - -#endif // SHARE_VM_OOPS_METHODOOP_HPP diff --git a/src/hotspot/share/oops/method.inline.hpp b/src/hotspot/share/oops/method.inline.hpp --- a/src/hotspot/share/oops/method.inline.hpp +++ b/src/hotspot/share/oops/method.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_METHOD_INLINE_HPP -#define SHARE_VM_OOPS_METHOD_INLINE_HPP +#pragma once #include "oops/method.hpp" #include "runtime/orderAccess.hpp" @@ -49,5 +48,3 @@ } inline bool Method::has_compiled_code() const { return code() != NULL; } - -#endif // SHARE_VM_OOPS_METHOD_INLINE_HPP diff --git a/src/hotspot/share/oops/methodCounters.hpp b/src/hotspot/share/oops/methodCounters.hpp --- a/src/hotspot/share/oops/methodCounters.hpp +++ b/src/hotspot/share/oops/methodCounters.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_METHODCOUNTERS_HPP -#define SHARE_VM_OOPS_METHODCOUNTERS_HPP +#pragma once #include "oops/metadata.hpp" #include "compiler/compilerDefinitions.hpp" @@ -265,4 +264,3 @@ virtual void print_value_on(outputStream* st) const; }; -#endif //SHARE_VM_OOPS_METHODCOUNTERS_HPP diff --git a/src/hotspot/share/oops/methodData.hpp b/src/hotspot/share/oops/methodData.hpp --- a/src/hotspot/share/oops/methodData.hpp +++ b/src/hotspot/share/oops/methodData.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_METHODDATAOOP_HPP -#define SHARE_VM_OOPS_METHODDATAOOP_HPP +#pragma once #include "interpreter/bytecodes.hpp" #include "memory/universe.hpp" @@ -2426,5 +2425,3 @@ DEBUG_ONLY(void verify_clean_weak_method_links();) Mutex* extra_data_lock() { return &_extra_data_lock; } }; - -#endif // SHARE_VM_OOPS_METHODDATAOOP_HPP diff --git a/src/hotspot/share/oops/methodData.inline.hpp b/src/hotspot/share/oops/methodData.inline.hpp --- a/src/hotspot/share/oops/methodData.inline.hpp +++ b/src/hotspot/share/oops/methodData.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_METHODDATA_INLINE_HPP -#define SHARE_VM_OOPS_METHODDATA_INLINE_HPP +#pragma once #include "oops/methodData.hpp" #include "runtime/orderAccess.hpp" @@ -51,5 +50,3 @@ // threads wrt bci_count and bci_displacement. release_set_int_at(bci0_offset + row * ret_row_cell_count, bci); } - -#endif // SHARE_VM_OOPS_METHODDATA_INLINE_HPP diff --git a/src/hotspot/share/oops/objArrayKlass.hpp b/src/hotspot/share/oops/objArrayKlass.hpp --- a/src/hotspot/share/oops/objArrayKlass.hpp +++ b/src/hotspot/share/oops/objArrayKlass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_OBJARRAYKLASS_HPP -#define SHARE_VM_OOPS_OBJARRAYKLASS_HPP +#pragma once #include "classfile/classLoaderData.hpp" #include "oops/arrayKlass.hpp" @@ -173,5 +172,3 @@ void oop_verify_on(oop obj, outputStream* st); }; - -#endif // SHARE_VM_OOPS_OBJARRAYKLASS_HPP diff --git a/src/hotspot/share/oops/objArrayKlass.inline.hpp b/src/hotspot/share/oops/objArrayKlass.inline.hpp --- a/src/hotspot/share/oops/objArrayKlass.inline.hpp +++ b/src/hotspot/share/oops/objArrayKlass.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP -#define SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP +#pragma once #include "memory/memRegion.hpp" #include "memory/iterator.hpp" @@ -116,5 +115,3 @@ ((ObjArrayKlass*)klass())->oop_oop_iterate_range(this, blk, start, end); } } - -#endif // SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP diff --git a/src/hotspot/share/oops/objArrayOop.hpp b/src/hotspot/share/oops/objArrayOop.hpp --- a/src/hotspot/share/oops/objArrayOop.hpp +++ b/src/hotspot/share/oops/objArrayOop.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_OBJARRAYOOP_HPP -#define SHARE_VM_OOPS_OBJARRAYOOP_HPP +#pragma once #include "oops/arrayOop.hpp" #include "utilities/align.hpp" @@ -111,5 +110,3 @@ template void oop_iterate_range(OopClosureType* blk, int start, int end); }; - -#endif // SHARE_VM_OOPS_OBJARRAYOOP_HPP diff --git a/src/hotspot/share/oops/objArrayOop.inline.hpp b/src/hotspot/share/oops/objArrayOop.inline.hpp --- a/src/hotspot/share/oops/objArrayOop.inline.hpp +++ b/src/hotspot/share/oops/objArrayOop.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_OBJARRAYOOP_INLINE_HPP -#define SHARE_VM_OOPS_OBJARRAYOOP_INLINE_HPP +#pragma once #include "oops/access.inline.hpp" #include "oops/arrayOop.inline.hpp" @@ -53,5 +52,3 @@ ptrdiff_t offset = UseCompressedOops ? obj_at_offset(index) : obj_at_offset(index); HeapAccess::oop_store_at(as_oop(), offset, value); } - -#endif // SHARE_VM_OOPS_OBJARRAYOOP_INLINE_HPP diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp --- a/src/hotspot/share/oops/oop.hpp +++ b/src/hotspot/share/oops/oop.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_OOP_HPP -#define SHARE_VM_OOPS_OOP_HPP +#pragma once #include "memory/iterator.hpp" #include "memory/memRegion.hpp" @@ -330,5 +329,3 @@ static bool is_valid(oop obj); static oop oop_or_null(address addr); }; - -#endif // SHARE_VM_OOPS_OOP_HPP diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp --- a/src/hotspot/share/oops/oop.inline.hpp +++ b/src/hotspot/share/oops/oop.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_OOP_INLINE_HPP -#define SHARE_VM_OOPS_OOP_INLINE_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "oops/access.inline.hpp" @@ -480,5 +479,3 @@ void oopDesc::set_displaced_mark_raw(markOop m) { mark_raw()->set_displaced_mark_helper(m); } - -#endif // SHARE_VM_OOPS_OOP_INLINE_HPP diff --git a/src/hotspot/share/oops/oopHandle.hpp b/src/hotspot/share/oops/oopHandle.hpp --- a/src/hotspot/share/oops/oopHandle.hpp +++ b/src/hotspot/share/oops/oopHandle.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_OOPHANDLE_HPP -#define SHARE_VM_OOPS_OOPHANDLE_HPP +#pragma once #include "oops/oop.hpp" @@ -49,5 +48,3 @@ // Used only for removing handle. oop* ptr_raw() const { return _obj; } }; - -#endif // SHARE_VM_OOPS_OOPHANDLE_HPP diff --git a/src/hotspot/share/oops/oopHandle.inline.hpp b/src/hotspot/share/oops/oopHandle.inline.hpp --- a/src/hotspot/share/oops/oopHandle.inline.hpp +++ b/src/hotspot/share/oops/oopHandle.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_OOPHANDLE_INLINE_HPP -#define SHARE_VM_OOPS_OOPHANDLE_INLINE_HPP +#pragma once #include "oops/access.inline.hpp" #include "oops/oopHandle.hpp" @@ -35,5 +34,3 @@ inline oop OopHandle::peek() const { return (_obj == NULL) ? (oop)NULL : NativeAccess::oop_load(_obj); } - -#endif // SHARE_VM_OOPS_OOPHANDLE_INLINE_HPP diff --git a/src/hotspot/share/oops/oopsHierarchy.hpp b/src/hotspot/share/oops/oopsHierarchy.hpp --- a/src/hotspot/share/oops/oopsHierarchy.hpp +++ b/src/hotspot/share/oops/oopsHierarchy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_OOPSHIERARCHY_HPP -#define SHARE_VM_OOPS_OOPSHIERARCHY_HPP +#pragma once #include "metaprogramming/integralConstant.hpp" #include "metaprogramming/primitiveConversions.hpp" @@ -219,5 +218,3 @@ class ArrayKlass; class ObjArrayKlass; class TypeArrayKlass; - -#endif // SHARE_VM_OOPS_OOPSHIERARCHY_HPP diff --git a/src/hotspot/share/oops/reflectionAccessorImplKlassHelper.hpp b/src/hotspot/share/oops/reflectionAccessorImplKlassHelper.hpp --- a/src/hotspot/share/oops/reflectionAccessorImplKlassHelper.hpp +++ b/src/hotspot/share/oops/reflectionAccessorImplKlassHelper.hpp @@ -23,8 +23,7 @@ * */ -#ifndef HOTSPOT_SHARE_OOPS_REFLECTIONACCESSORIMPLKLASSHELPER_HPP -#define HOTSPOT_SHARE_OOPS_REFLECTIONACCESSORIMPLKLASSHELPER_HPP +#pragma once #include "memory/allocation.hpp" @@ -67,9 +66,3 @@ static void print_invocation_target(outputStream* out, Klass* k); }; - - - - -#endif /* HOTSPOT_SHARE_OOPS_REFLECTIONACCESSORIMPLKLASSHELPER_HPP */ - diff --git a/src/hotspot/share/oops/symbol.hpp b/src/hotspot/share/oops/symbol.hpp --- a/src/hotspot/share/oops/symbol.hpp +++ b/src/hotspot/share/oops/symbol.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_SYMBOL_HPP -#define SHARE_VM_OOPS_SYMBOL_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/exceptions.hpp" @@ -271,4 +270,3 @@ return (((uintptr_t)this < (uintptr_t)other) ? -1 : ((uintptr_t)this == (uintptr_t) other) ? 0 : 1); } -#endif // SHARE_VM_OOPS_SYMBOL_HPP diff --git a/src/hotspot/share/oops/typeArrayKlass.hpp b/src/hotspot/share/oops/typeArrayKlass.hpp --- a/src/hotspot/share/oops/typeArrayKlass.hpp +++ b/src/hotspot/share/oops/typeArrayKlass.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_TYPEARRAYKLASS_HPP -#define SHARE_VM_OOPS_TYPEARRAYKLASS_HPP +#pragma once #include "classfile/classLoaderData.hpp" #include "oops/arrayKlass.hpp" @@ -134,5 +133,3 @@ ModuleEntry* module() const; PackageEntry* package() const; }; - -#endif // SHARE_VM_OOPS_TYPEARRAYKLASS_HPP diff --git a/src/hotspot/share/oops/typeArrayKlass.inline.hpp b/src/hotspot/share/oops/typeArrayKlass.inline.hpp --- a/src/hotspot/share/oops/typeArrayKlass.inline.hpp +++ b/src/hotspot/share/oops/typeArrayKlass.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_TYPEARRAYKLASS_INLINE_HPP -#define SHARE_VM_OOPS_TYPEARRAYKLASS_INLINE_HPP +#pragma once #include "oops/arrayKlass.hpp" #include "oops/klass.hpp" @@ -53,5 +52,3 @@ void TypeArrayKlass::oop_oop_iterate_reverse(oop obj, OopClosureType* closure) { oop_oop_iterate_impl(obj, closure); } - -#endif // SHARE_VM_OOPS_TYPEARRAYKLASS_INLINE_HPP diff --git a/src/hotspot/share/oops/typeArrayOop.hpp b/src/hotspot/share/oops/typeArrayOop.hpp --- a/src/hotspot/share/oops/typeArrayOop.hpp +++ b/src/hotspot/share/oops/typeArrayOop.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_TYPEARRAYOOP_HPP -#define SHARE_VM_OOPS_TYPEARRAYOOP_HPP +#pragma once #include "oops/arrayOop.hpp" #include "oops/typeArrayKlass.hpp" @@ -133,5 +132,3 @@ public: inline int object_size(); }; - -#endif // SHARE_VM_OOPS_TYPEARRAYOOP_HPP diff --git a/src/hotspot/share/oops/typeArrayOop.inline.hpp b/src/hotspot/share/oops/typeArrayOop.inline.hpp --- a/src/hotspot/share/oops/typeArrayOop.inline.hpp +++ b/src/hotspot/share/oops/typeArrayOop.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_TYPEARRAYOOP_INLINE_HPP -#define SHARE_VM_OOPS_TYPEARRAYOOP_INLINE_HPP +#pragma once #include "oops/access.inline.hpp" #include "oops/oop.inline.hpp" @@ -201,6 +200,3 @@ HeapAccess::store_at(as_oop(), offset, (jint)contents); } #endif // _LP64 - - -#endif // SHARE_VM_OOPS_TYPEARRAYOOP_INLINE_HPP diff --git a/src/hotspot/share/oops/verifyOopClosure.hpp b/src/hotspot/share/oops/verifyOopClosure.hpp --- a/src/hotspot/share/oops/verifyOopClosure.hpp +++ b/src/hotspot/share/oops/verifyOopClosure.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_VERIFYOOPCLOSURE_HPP -#define SHARE_VM_OOPS_VERIFYOOPCLOSURE_HPP +#pragma once #include "memory/iterator.hpp" @@ -35,5 +34,3 @@ virtual void do_oop(narrowOop* p); static VerifyOopClosure verify_oop; }; - -#endif // SHARE_VM_OOPS_VERIFYOOPCLOSURE_HPP diff --git a/src/hotspot/share/oops/weakHandle.hpp b/src/hotspot/share/oops/weakHandle.hpp --- a/src/hotspot/share/oops/weakHandle.hpp +++ b/src/hotspot/share/oops/weakHandle.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_WEAKHANDLE_HPP -#define SHARE_VM_OOPS_WEAKHANDLE_HPP +#pragma once #include "oops/oop.hpp" #include "runtime/handles.hpp" @@ -65,5 +64,3 @@ }; typedef WeakHandle ClassLoaderWeakHandle; - -#endif // SHARE_VM_OOPS_WEAKHANDLE_HPP diff --git a/src/hotspot/share/oops/weakHandle.inline.hpp b/src/hotspot/share/oops/weakHandle.inline.hpp --- a/src/hotspot/share/oops/weakHandle.inline.hpp +++ b/src/hotspot/share/oops/weakHandle.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OOPS_WEAKHANDLE_INLINE_HPP -#define SHARE_VM_OOPS_WEAKHANDLE_INLINE_HPP +#pragma once #include "oops/weakHandle.hpp" #include "oops/access.inline.hpp" @@ -44,6 +43,3 @@ void WeakHandle::replace(oop with_obj) { NativeAccess::oop_store(_obj, with_obj); } - -#endif // SHARE_VM_OOPS_WEAKHANDLE_INLINE_HPP - diff --git a/src/hotspot/share/opto/ad.hpp b/src/hotspot/share/opto/ad.hpp --- a/src/hotspot/share/opto/ad.hpp +++ b/src/hotspot/share/opto/ad.hpp @@ -22,12 +22,9 @@ * */ -#ifndef SHARE_VM_OPTO_AD_HPP -#define SHARE_VM_OPTO_AD_HPP +#pragma once #include "utilities/macros.hpp" #include CPU_HEADER(adfiles/ad) - -#endif // SHARE_VM_OPTO_AD_HPP diff --git a/src/hotspot/share/opto/addnode.hpp b/src/hotspot/share/opto/addnode.hpp --- a/src/hotspot/share/opto/addnode.hpp +++ b/src/hotspot/share/opto/addnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_ADDNODE_HPP -#define SHARE_VM_OPTO_ADDNODE_HPP +#pragma once #include "opto/node.hpp" #include "opto/opcodes.hpp" @@ -296,5 +295,3 @@ virtual const Type *bottom_type() const { return Type::DOUBLE; } virtual uint ideal_reg() const { return Op_RegD; } }; - -#endif // SHARE_VM_OPTO_ADDNODE_HPP diff --git a/src/hotspot/share/opto/adlcVMDeps.hpp b/src/hotspot/share/opto/adlcVMDeps.hpp --- a/src/hotspot/share/opto/adlcVMDeps.hpp +++ b/src/hotspot/share/opto/adlcVMDeps.hpp @@ -22,20 +22,16 @@ * */ -#ifndef SHARE_VM_OPTO_ADLCVMDEPS_HPP -#define SHARE_VM_OPTO_ADLCVMDEPS_HPP - -// adlcVMDeps.hpp is used by both adlc and vm builds. -// Only include allocation.hpp when we're not building adlc. -#ifndef SHARE_VM_ADLC_ARENA_HPP -#include "memory/allocation.hpp" -#endif +#pragma once // Declare commonly known constant and data structures between the // ADLC and the VM // -class AdlcVMDeps : public AllStatic { +// adlcVMDeps.hpp is used by both adlc and vm builds. +// Don't inherit from AllStatic to avoid including memory/allocation.hpp. + +class AdlcVMDeps { // : public AllStatic { public: // Mirror of TypeFunc types enum { Control, I_O, Memory, FramePtr, ReturnAdr, Parms }; @@ -51,5 +47,3 @@ static const char* oop_reloc_type() { return "relocInfo::oop_type"; } static const char* none_reloc_type() { return "relocInfo::none"; } }; - -#endif // SHARE_VM_OPTO_ADLCVMDEPS_HPP diff --git a/src/hotspot/share/opto/arraycopynode.hpp b/src/hotspot/share/opto/arraycopynode.hpp --- a/src/hotspot/share/opto/arraycopynode.hpp +++ b/src/hotspot/share/opto/arraycopynode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_ARRAYCOPYNODE_HPP -#define SHARE_VM_OPTO_ARRAYCOPYNODE_HPP +#pragma once #include "gc/shared/c2/barrierSetC2.hpp" #include "opto/callnode.hpp" @@ -178,4 +177,3 @@ virtual void dump_compact_spec(outputStream* st) const; #endif }; -#endif // SHARE_VM_OPTO_ARRAYCOPYNODE_HPP diff --git a/src/hotspot/share/opto/block.hpp b/src/hotspot/share/opto/block.hpp --- a/src/hotspot/share/opto/block.hpp +++ b/src/hotspot/share/opto/block.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_BLOCK_HPP -#define SHARE_VM_OPTO_BLOCK_HPP +#pragma once #include "opto/multnode.hpp" #include "opto/node.hpp" @@ -886,5 +885,3 @@ void reorder_traces(int count); void union_traces(Trace* from, Trace* to); }; - -#endif // SHARE_VM_OPTO_BLOCK_HPP diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp --- a/src/hotspot/share/opto/c2_globals.hpp +++ b/src/hotspot/share/opto/c2_globals.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_C2_GLOBALS_HPP -#define SHARE_VM_OPTO_C2_GLOBALS_HPP +#pragma once #include "runtime/globals.hpp" #include "utilities/macros.hpp" @@ -772,5 +771,3 @@ IGNORE_RANGE, \ IGNORE_CONSTRAINT, \ IGNORE_WRITEABLE) - -#endif // SHARE_VM_OPTO_C2_GLOBALS_HPP diff --git a/src/hotspot/share/opto/c2compiler.hpp b/src/hotspot/share/opto/c2compiler.hpp --- a/src/hotspot/share/opto/c2compiler.hpp +++ b/src/hotspot/share/opto/c2compiler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_C2COMPILER_HPP -#define SHARE_VM_OPTO_C2COMPILER_HPP +#pragma once #include "compiler/abstractCompiler.hpp" #include "opto/output.hpp" @@ -69,5 +68,3 @@ // Initial size of the code buffer (may be increased at runtime) static int initial_code_buffer_size(int const_size = initial_const_capacity); }; - -#endif // SHARE_VM_OPTO_C2COMPILER_HPP diff --git a/src/hotspot/share/opto/callGenerator.hpp b/src/hotspot/share/opto/callGenerator.hpp --- a/src/hotspot/share/opto/callGenerator.hpp +++ b/src/hotspot/share/opto/callGenerator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_CALLGENERATOR_HPP -#define SHARE_VM_OPTO_CALLGENERATOR_HPP +#pragma once #include "compiler/compileBroker.hpp" #include "opto/callnode.hpp" @@ -341,5 +340,3 @@ int count_all() const; #endif }; - -#endif // SHARE_VM_OPTO_CALLGENERATOR_HPP diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp --- a/src/hotspot/share/opto/callnode.hpp +++ b/src/hotspot/share/opto/callnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_CALLNODE_HPP -#define SHARE_VM_OPTO_CALLNODE_HPP +#pragma once #include "opto/connode.hpp" #include "opto/mulnode.hpp" @@ -1124,4 +1123,3 @@ JVMState* dbg_jvms() const { return NULL; } #endif }; -#endif // SHARE_VM_OPTO_CALLNODE_HPP diff --git a/src/hotspot/share/opto/castnode.hpp b/src/hotspot/share/opto/castnode.hpp --- a/src/hotspot/share/opto/castnode.hpp +++ b/src/hotspot/share/opto/castnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_CASTNODE_HPP -#define SHARE_VM_OPTO_CASTNODE_HPP +#pragma once #include "opto/node.hpp" #include "opto/opcodes.hpp" @@ -148,7 +147,3 @@ // Return false to keep node from moving away from an associated card mark. virtual bool depends_only_on_test() const { return false; } }; - - - -#endif // SHARE_VM_OPTO_CASTNODE_HPP diff --git a/src/hotspot/share/opto/cfgnode.hpp b/src/hotspot/share/opto/cfgnode.hpp --- a/src/hotspot/share/opto/cfgnode.hpp +++ b/src/hotspot/share/opto/cfgnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_CFGNODE_HPP -#define SHARE_VM_OPTO_CFGNODE_HPP +#pragma once #include "opto/multnode.hpp" #include "opto/node.hpp" @@ -612,5 +611,3 @@ virtual void format( PhaseRegAlloc *, outputStream *st ) const; #endif }; - -#endif // SHARE_VM_OPTO_CFGNODE_HPP diff --git a/src/hotspot/share/opto/chaitin.hpp b/src/hotspot/share/opto/chaitin.hpp --- a/src/hotspot/share/opto/chaitin.hpp +++ b/src/hotspot/share/opto/chaitin.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_CHAITIN_HPP -#define SHARE_VM_OPTO_CHAITIN_HPP +#pragma once #include "code/vmreg.hpp" #include "memory/resourceArea.hpp" @@ -800,5 +799,3 @@ friend class PhaseAggressiveCoalesce; friend class PhaseConservativeCoalesce; }; - -#endif // SHARE_VM_OPTO_CHAITIN_HPP diff --git a/src/hotspot/share/opto/coalesce.hpp b/src/hotspot/share/opto/coalesce.hpp --- a/src/hotspot/share/opto/coalesce.hpp +++ b/src/hotspot/share/opto/coalesce.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_COALESCE_HPP -#define SHARE_VM_OPTO_COALESCE_HPP +#pragma once #include "opto/phase.hpp" @@ -113,5 +112,3 @@ void update_ifg(uint lr1, uint lr2, IndexSet *n_lr1, IndexSet *n_lr2); }; - -#endif // SHARE_VM_OPTO_COALESCE_HPP diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp --- a/src/hotspot/share/opto/compile.hpp +++ b/src/hotspot/share/opto/compile.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_COMPILE_HPP -#define SHARE_VM_OPTO_COMPILE_HPP +#pragma once #include "asm/codeBuffer.hpp" #include "ci/compilerInterface.hpp" @@ -1361,5 +1360,3 @@ CloneMap& clone_map(); void set_clone_map(Dict* d); }; - -#endif // SHARE_VM_OPTO_COMPILE_HPP diff --git a/src/hotspot/share/opto/connode.hpp b/src/hotspot/share/opto/connode.hpp --- a/src/hotspot/share/opto/connode.hpp +++ b/src/hotspot/share/opto/connode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_CONNODE_HPP -#define SHARE_VM_OPTO_CONNODE_HPP +#pragma once #include "opto/node.hpp" #include "opto/opcodes.hpp" @@ -148,7 +147,3 @@ virtual const Type *bottom_type() const { return TypeRawPtr::BOTTOM;} virtual uint ideal_reg() const { return Op_RegP; } }; - - - -#endif // SHARE_VM_OPTO_CONNODE_HPP diff --git a/src/hotspot/share/opto/convertnode.hpp b/src/hotspot/share/opto/convertnode.hpp --- a/src/hotspot/share/opto/convertnode.hpp +++ b/src/hotspot/share/opto/convertnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_CONVERTNODE_HPP -#define SHARE_VM_OPTO_CONVERTNODE_HPP +#pragma once #include "opto/node.hpp" #include "opto/opcodes.hpp" @@ -211,6 +210,3 @@ virtual Node* Identity(PhaseGVN* phase); virtual const Type* Value(PhaseGVN* phase) const; }; - - -#endif // SHARE_VM_OPTO_CONVERTNODE_HPP diff --git a/src/hotspot/share/opto/countbitsnode.hpp b/src/hotspot/share/opto/countbitsnode.hpp --- a/src/hotspot/share/opto/countbitsnode.hpp +++ b/src/hotspot/share/opto/countbitsnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_COUNTBITSNODE_HPP -#define SHARE_VM_OPTO_COUNTBITSNODE_HPP +#pragma once #include "opto/node.hpp" #include "opto/opcodes.hpp" @@ -89,6 +88,3 @@ PopCountLNode(Node* in1) : CountBitsNode(in1) {} virtual int Opcode() const; }; - - -#endif // SHARE_VM_OPTO_COUNTBITSNODE_HPP diff --git a/src/hotspot/share/opto/divnode.hpp b/src/hotspot/share/opto/divnode.hpp --- a/src/hotspot/share/opto/divnode.hpp +++ b/src/hotspot/share/opto/divnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_DIVNODE_HPP -#define SHARE_VM_OPTO_DIVNODE_HPP +#pragma once #include "opto/multnode.hpp" #include "opto/node.hpp" @@ -183,5 +182,3 @@ // Make a divmod and associated projections from a div or mod. static DivModLNode* make(Node* div_or_mod); }; - -#endif // SHARE_VM_OPTO_DIVNODE_HPP diff --git a/src/hotspot/share/opto/escape.hpp b/src/hotspot/share/opto/escape.hpp --- a/src/hotspot/share/opto/escape.hpp +++ b/src/hotspot/share/opto/escape.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_ESCAPE_HPP -#define SHARE_VM_OPTO_ESCAPE_HPP +#pragma once #include "opto/addnode.hpp" #include "opto/node.hpp" @@ -614,5 +613,3 @@ _pidx(CG->next_pidx()) { assert(n != NULL && es != UnknownEscape, "sanity"); } - -#endif // SHARE_VM_OPTO_ESCAPE_HPP diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp --- a/src/hotspot/share/opto/graphKit.hpp +++ b/src/hotspot/share/opto/graphKit.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_GRAPHKIT_HPP -#define SHARE_VM_OPTO_GRAPHKIT_HPP +#pragma once #include "ci/ciEnv.hpp" #include "ci/ciMethodData.hpp" @@ -926,5 +925,3 @@ PreserveReexecuteState(GraphKit* kit); ~PreserveReexecuteState(); }; - -#endif // SHARE_VM_OPTO_GRAPHKIT_HPP diff --git a/src/hotspot/share/opto/idealGraphPrinter.hpp b/src/hotspot/share/opto/idealGraphPrinter.hpp --- a/src/hotspot/share/opto/idealGraphPrinter.hpp +++ b/src/hotspot/share/opto/idealGraphPrinter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_IDEALGRAPHPRINTER_HPP -#define SHARE_VM_OPTO_IDEALGRAPHPRINTER_HPP +#pragma once #include "libadt/dict.hpp" #include "libadt/vectset.hpp" @@ -138,5 +137,3 @@ }; #endif - -#endif // SHARE_VM_OPTO_IDEALGRAPHPRINTER_HPP diff --git a/src/hotspot/share/opto/idealKit.hpp b/src/hotspot/share/opto/idealKit.hpp --- a/src/hotspot/share/opto/idealKit.hpp +++ b/src/hotspot/share/opto/idealKit.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_IDEALKIT_HPP -#define SHARE_VM_OPTO_IDEALKIT_HPP +#pragma once #include "opto/addnode.hpp" #include "opto/cfgnode.hpp" @@ -259,5 +258,3 @@ Node* parm2, Node* parm3); }; - -#endif // SHARE_VM_OPTO_IDEALKIT_HPP diff --git a/src/hotspot/share/opto/indexSet.hpp b/src/hotspot/share/opto/indexSet.hpp --- a/src/hotspot/share/opto/indexSet.hpp +++ b/src/hotspot/share/opto/indexSet.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_INDEXSET_HPP -#define SHARE_VM_OPTO_INDEXSET_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/resourceArea.hpp" @@ -467,5 +466,3 @@ } } }; - -#endif // SHARE_VM_OPTO_INDEXSET_HPP diff --git a/src/hotspot/share/opto/intrinsicnode.hpp b/src/hotspot/share/opto/intrinsicnode.hpp --- a/src/hotspot/share/opto/intrinsicnode.hpp +++ b/src/hotspot/share/opto/intrinsicnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_INTRINSICNODE_HPP -#define SHARE_VM_OPTO_INTRINSICNODE_HPP +#pragma once #include "opto/node.hpp" #include "opto/opcodes.hpp" @@ -215,5 +214,3 @@ const Type* bottom_type() const { return TypeInt::BOOL; } virtual uint ideal_reg() const { return Op_RegI; } }; - -#endif // SHARE_VM_OPTO_INTRINSICNODE_HPP diff --git a/src/hotspot/share/opto/live.hpp b/src/hotspot/share/opto/live.hpp --- a/src/hotspot/share/opto/live.hpp +++ b/src/hotspot/share/opto/live.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_LIVE_HPP -#define SHARE_VM_OPTO_LIVE_HPP +#pragma once #include "libadt/vectset.hpp" #include "opto/block.hpp" @@ -89,5 +88,3 @@ void stats(uint iters) const; #endif }; - -#endif // SHARE_VM_OPTO_LIVE_HPP diff --git a/src/hotspot/share/opto/locknode.hpp b/src/hotspot/share/opto/locknode.hpp --- a/src/hotspot/share/opto/locknode.hpp +++ b/src/hotspot/share/opto/locknode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_LOCKNODE_HPP -#define SHARE_VM_OPTO_LOCKNODE_HPP +#pragma once #include "opto/node.hpp" #include "opto/opcodes.hpp" @@ -127,5 +126,3 @@ const Type *sub(const Type *t1, const Type *t2) const { return TypeInt::CC;} }; - -#endif // SHARE_VM_OPTO_LOCKNODE_HPP diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp --- a/src/hotspot/share/opto/loopnode.hpp +++ b/src/hotspot/share/opto/loopnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_LOOPNODE_HPP -#define SHARE_VM_OPTO_LOOPNODE_HPP +#pragma once #include "opto/cfgnode.hpp" #include "opto/multnode.hpp" @@ -1427,5 +1426,3 @@ IdealLoopTree* current() { return _curnt; } // Return current value of iterator. }; - -#endif // SHARE_VM_OPTO_LOOPNODE_HPP diff --git a/src/hotspot/share/opto/machnode.hpp b/src/hotspot/share/opto/machnode.hpp --- a/src/hotspot/share/opto/machnode.hpp +++ b/src/hotspot/share/opto/machnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_MACHNODE_HPP -#define SHARE_VM_OPTO_MACHNODE_HPP +#pragma once #include "opto/callnode.hpp" #include "opto/matcher.hpp" @@ -1101,5 +1100,3 @@ virtual void ext_format(PhaseRegAlloc *ra, const MachNode *node, int idx, outputStream *st) const { int_format( ra, node, st ); } #endif }; - -#endif // SHARE_VM_OPTO_MACHNODE_HPP diff --git a/src/hotspot/share/opto/macro.hpp b/src/hotspot/share/opto/macro.hpp --- a/src/hotspot/share/opto/macro.hpp +++ b/src/hotspot/share/opto/macro.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_MACRO_HPP -#define SHARE_VM_OPTO_MACRO_HPP +#pragma once #include "opto/phase.hpp" @@ -216,5 +215,3 @@ Node* old_eden_top, Node* new_eden_top, intx lines); }; - -#endif // SHARE_VM_OPTO_MACRO_HPP diff --git a/src/hotspot/share/opto/matcher.hpp b/src/hotspot/share/opto/matcher.hpp --- a/src/hotspot/share/opto/matcher.hpp +++ b/src/hotspot/share/opto/matcher.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_MATCHER_HPP -#define SHARE_VM_OPTO_MATCHER_HPP +#pragma once #include "libadt/vectset.hpp" #include "memory/resourceArea.hpp" @@ -563,5 +562,3 @@ } #endif }; - -#endif // SHARE_VM_OPTO_MATCHER_HPP diff --git a/src/hotspot/share/opto/mathexactnode.hpp b/src/hotspot/share/opto/mathexactnode.hpp --- a/src/hotspot/share/opto/mathexactnode.hpp +++ b/src/hotspot/share/opto/mathexactnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_MATHEXACTNODE_HPP -#define SHARE_VM_OPTO_MATHEXACTNODE_HPP +#pragma once #include "opto/multnode.hpp" #include "opto/node.hpp" @@ -134,6 +133,3 @@ static bool is_overflow(jlong v1, jlong v2); }; - -#endif - diff --git a/src/hotspot/share/opto/memnode.hpp b/src/hotspot/share/opto/memnode.hpp --- a/src/hotspot/share/opto/memnode.hpp +++ b/src/hotspot/share/opto/memnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_MEMNODE_HPP -#define SHARE_VM_OPTO_MEMNODE_HPP +#pragma once #include "opto/multnode.hpp" #include "opto/node.hpp" @@ -1639,5 +1638,3 @@ virtual uint match_edge(uint idx) const { return idx==2; } virtual const Type *bottom_type() const { return ( AllocatePrefetchStyle == 3 ) ? Type::MEMORY : Type::ABIO; } }; - -#endif // SHARE_VM_OPTO_MEMNODE_HPP diff --git a/src/hotspot/share/opto/movenode.hpp b/src/hotspot/share/opto/movenode.hpp --- a/src/hotspot/share/opto/movenode.hpp +++ b/src/hotspot/share/opto/movenode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_MOVENODE_HPP -#define SHARE_VM_OPTO_MOVENODE_HPP +#pragma once #include "opto/node.hpp" @@ -150,7 +149,3 @@ virtual void related(GrowableArray *in_rel, GrowableArray *out_rel, bool compact) const; #endif }; - - -#endif // SHARE_VM_OPTO_MOVENODE_HPP - diff --git a/src/hotspot/share/opto/mulnode.hpp b/src/hotspot/share/opto/mulnode.hpp --- a/src/hotspot/share/opto/mulnode.hpp +++ b/src/hotspot/share/opto/mulnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_MULNODE_HPP -#define SHARE_VM_OPTO_MULNODE_HPP +#pragma once #include "opto/node.hpp" #include "opto/opcodes.hpp" @@ -295,5 +294,3 @@ const Type *bottom_type() const { return TypeInt::INT; } virtual uint ideal_reg() const { return Op_RegI; } }; - -#endif // SHARE_VM_OPTO_MULNODE_HPP diff --git a/src/hotspot/share/opto/multnode.hpp b/src/hotspot/share/opto/multnode.hpp --- a/src/hotspot/share/opto/multnode.hpp +++ b/src/hotspot/share/opto/multnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_MULTNODE_HPP -#define SHARE_VM_OPTO_MULTNODE_HPP +#pragma once #include "opto/node.hpp" @@ -104,5 +103,3 @@ // Return other proj node when this is a If proj node ProjNode* other_if_proj() const; }; - -#endif // SHARE_VM_OPTO_MULTNODE_HPP diff --git a/src/hotspot/share/opto/narrowptrnode.hpp b/src/hotspot/share/opto/narrowptrnode.hpp --- a/src/hotspot/share/opto/narrowptrnode.hpp +++ b/src/hotspot/share/opto/narrowptrnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_NARROWPTRNODE_HPP -#define SHARE_VM_OPTO_NARROWPTRNODE_HPP +#pragma once #include "opto/node.hpp" #include "opto/opcodes.hpp" @@ -113,6 +112,3 @@ virtual const Type* Value(PhaseGVN* phase) const; virtual Node* Identity(PhaseGVN* phase); }; - -#endif // SHARE_VM_OPTO_NARROWPTRNODE_HPP - diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp --- a/src/hotspot/share/opto/node.hpp +++ b/src/hotspot/share/opto/node.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_NODE_HPP -#define SHARE_VM_OPTO_NODE_HPP +#pragma once #include "libadt/vectset.hpp" #include "opto/compile.hpp" @@ -1741,5 +1740,3 @@ virtual void dump_compact_spec(outputStream *st) const; #endif }; - -#endif // SHARE_VM_OPTO_NODE_HPP diff --git a/src/hotspot/share/opto/opaquenode.hpp b/src/hotspot/share/opto/opaquenode.hpp --- a/src/hotspot/share/opto/opaquenode.hpp +++ b/src/hotspot/share/opto/opaquenode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_OPAQUENODE_HPP -#define SHARE_VM_OPTO_OPAQUENODE_HPP +#pragma once #include "opto/node.hpp" #include "opto/opcodes.hpp" @@ -132,6 +131,3 @@ virtual Node* Identity(PhaseGVN* phase); virtual const Type *bottom_type() const { return TypeInt::BOOL; } }; - -#endif // SHARE_VM_OPTO_OPAQUENODE_HPP - diff --git a/src/hotspot/share/opto/opcodes.hpp b/src/hotspot/share/opto/opcodes.hpp --- a/src/hotspot/share/opto/opcodes.hpp +++ b/src/hotspot/share/opto/opcodes.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_OPCODES_HPP -#define SHARE_VM_OPTO_OPCODES_HPP +#pragma once // Build a big enum of class names to give them dense integer indices #define macro(x) Op_##x, @@ -52,5 +51,3 @@ // Table of names, indexed by Opcode extern const char *NodeClassNames[]; - -#endif // SHARE_VM_OPTO_OPCODES_HPP diff --git a/src/hotspot/share/opto/optoreg.hpp b/src/hotspot/share/opto/optoreg.hpp --- a/src/hotspot/share/opto/optoreg.hpp +++ b/src/hotspot/share/opto/optoreg.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_OPTOREG_HPP -#define SHARE_VM_OPTO_OPTOREG_HPP +#pragma once #include "utilities/macros.hpp" @@ -206,5 +205,3 @@ OptoRegPair(OptoReg::Name f) { _second = OptoReg::Bad; _first = f; } OptoRegPair() { _second = OptoReg::Bad; _first = OptoReg::Bad; } }; - -#endif // SHARE_VM_OPTO_OPTOREG_HPP diff --git a/src/hotspot/share/opto/output.hpp b/src/hotspot/share/opto/output.hpp --- a/src/hotspot/share/opto/output.hpp +++ b/src/hotspot/share/opto/output.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_OUTPUT_HPP -#define SHARE_VM_OPTO_OUTPUT_HPP +#pragma once #include "opto/ad.hpp" #include "opto/block.hpp" @@ -217,5 +216,3 @@ #endif }; - -#endif // SHARE_VM_OPTO_OUTPUT_HPP diff --git a/src/hotspot/share/opto/parse.hpp b/src/hotspot/share/opto/parse.hpp --- a/src/hotspot/share/opto/parse.hpp +++ b/src/hotspot/share/opto/parse.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_PARSE_HPP -#define SHARE_VM_OPTO_PARSE_HPP +#pragma once #include "ci/ciMethodData.hpp" #include "ci/ciTypeFlow.hpp" @@ -628,5 +627,3 @@ void dump_bci(int bci); #endif }; - -#endif // SHARE_VM_OPTO_PARSE_HPP diff --git a/src/hotspot/share/opto/phase.hpp b/src/hotspot/share/opto/phase.hpp --- a/src/hotspot/share/opto/phase.hpp +++ b/src/hotspot/share/opto/phase.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_PHASE_HPP -#define SHARE_VM_OPTO_PHASE_HPP +#pragma once #include "runtime/timer.hpp" @@ -139,5 +138,3 @@ static void print_timers(); }; - -#endif // SHARE_VM_OPTO_PHASE_HPP diff --git a/src/hotspot/share/opto/phaseX.hpp b/src/hotspot/share/opto/phaseX.hpp --- a/src/hotspot/share/opto/phaseX.hpp +++ b/src/hotspot/share/opto/phaseX.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_PHASEX_HPP -#define SHARE_VM_OPTO_PHASEX_HPP +#pragma once #include "libadt/dict.hpp" #include "libadt/vectset.hpp" @@ -638,5 +637,3 @@ static void print_statistics(); #endif }; - -#endif // SHARE_VM_OPTO_PHASEX_HPP diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp --- a/src/hotspot/share/opto/phasetype.hpp +++ b/src/hotspot/share/opto/phasetype.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_PHASETYPE_HPP -#define SHARE_VM_OPTO_PHASETYPE_HPP +#pragma once enum CompilerPhaseType { PHASE_BEFORE_STRINGOPTS, @@ -100,5 +99,3 @@ } } }; - -#endif //SHARE_VM_OPTO_PHASETYPE_HPP diff --git a/src/hotspot/share/opto/regalloc.hpp b/src/hotspot/share/opto/regalloc.hpp --- a/src/hotspot/share/opto/regalloc.hpp +++ b/src/hotspot/share/opto/regalloc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_REGALLOC_HPP -#define SHARE_VM_OPTO_REGALLOC_HPP +#pragma once #include "code/vmreg.hpp" #include "opto/block.hpp" @@ -131,5 +130,3 @@ static void print_statistics(); #endif }; - -#endif // SHARE_VM_OPTO_REGALLOC_HPP diff --git a/src/hotspot/share/opto/regmask.hpp b/src/hotspot/share/opto/regmask.hpp --- a/src/hotspot/share/opto/regmask.hpp +++ b/src/hotspot/share/opto/regmask.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_REGMASK_HPP -#define SHARE_VM_OPTO_REGMASK_HPP +#pragma once #include "code/vmreg.hpp" #include "opto/optoreg.hpp" @@ -312,5 +311,3 @@ // Do not use this constant directly in client code! #undef RM_SIZE - -#endif // SHARE_VM_OPTO_REGMASK_HPP diff --git a/src/hotspot/share/opto/replacednodes.hpp b/src/hotspot/share/opto/replacednodes.hpp --- a/src/hotspot/share/opto/replacednodes.hpp +++ b/src/hotspot/share/opto/replacednodes.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_REPLACEDNODES_HPP -#define SHARE_VM_OPTO_REPLACEDNODES_HPP +#pragma once #include "opto/connode.hpp" @@ -77,5 +76,3 @@ void dump(outputStream *st) const; void apply(Compile* C, Node* ctl); }; - -#endif // SHARE_VM_OPTO_REPLACEDNODES_HPP diff --git a/src/hotspot/share/opto/rootnode.hpp b/src/hotspot/share/opto/rootnode.hpp --- a/src/hotspot/share/opto/rootnode.hpp +++ b/src/hotspot/share/opto/rootnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_ROOTNODE_HPP -#define SHARE_VM_OPTO_ROOTNODE_HPP +#pragma once #include "opto/loopnode.hpp" @@ -69,5 +68,3 @@ virtual void related(GrowableArray *in_rel, GrowableArray *out_rel, bool compact) const; #endif }; - -#endif // SHARE_VM_OPTO_ROOTNODE_HPP diff --git a/src/hotspot/share/opto/runtime.hpp b/src/hotspot/share/opto/runtime.hpp --- a/src/hotspot/share/opto/runtime.hpp +++ b/src/hotspot/share/opto/runtime.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_RUNTIME_HPP -#define SHARE_VM_OPTO_RUNTIME_HPP +#pragma once #include "code/codeBlob.hpp" #include "opto/machnode.hpp" @@ -330,5 +329,3 @@ static void print_named_counters(); }; - -#endif // SHARE_VM_OPTO_RUNTIME_HPP diff --git a/src/hotspot/share/opto/stringopts.hpp b/src/hotspot/share/opto/stringopts.hpp --- a/src/hotspot/share/opto/stringopts.hpp +++ b/src/hotspot/share/opto/stringopts.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_STRINGOPTS_HPP -#define SHARE_VM_OPTO_STRINGOPTS_HPP +#pragma once #include "opto/node.hpp" #include "opto/phaseX.hpp" @@ -114,5 +113,3 @@ public: PhaseStringOpts(PhaseGVN* gvn, Unique_Node_List* worklist); }; - -#endif // SHARE_VM_OPTO_STRINGOPTS_HPP diff --git a/src/hotspot/share/opto/subnode.hpp b/src/hotspot/share/opto/subnode.hpp --- a/src/hotspot/share/opto/subnode.hpp +++ b/src/hotspot/share/opto/subnode.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_SUBNODE_HPP -#define SHARE_VM_OPTO_SUBNODE_HPP +#pragma once #include "opto/node.hpp" #include "opto/opcodes.hpp" @@ -501,5 +500,3 @@ const Type *bottom_type() const { return TypeInt::SHORT; } virtual uint ideal_reg() const { return Op_RegI; } }; - -#endif // SHARE_VM_OPTO_SUBNODE_HPP diff --git a/src/hotspot/share/opto/superword.hpp b/src/hotspot/share/opto/superword.hpp --- a/src/hotspot/share/opto/superword.hpp +++ b/src/hotspot/share/opto/superword.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_OPTO_SUPERWORD_HPP -#define SHARE_VM_OPTO_SUPERWORD_HPP +#pragma once #include "opto/loopnode.hpp" #include "opto/node.hpp" @@ -694,5 +693,3 @@ } _tracer;//TRacer; #endif }; - -#endif // SHARE_VM_OPTO_SUPERWORD_HPP diff --git a/src/hotspot/share/opto/type.hpp b/src/hotspot/share/opto/type.hpp --- a/src/hotspot/share/opto/type.hpp +++ b/src/hotspot/share/opto/type.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_OPTO_TYPE_HPP -#define SHARE_VM_OPTO_TYPE_HPP +#pragma once #include "opto/adlcVMDeps.hpp" #include "runtime/handles.hpp" @@ -1844,5 +1843,3 @@ #define ConvX2UL(x) ConvI2UL(x) #endif - -#endif // SHARE_VM_OPTO_TYPE_HPP diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp --- a/src/hotspot/share/opto/vectornode.hpp +++ b/src/hotspot/share/opto/vectornode.hpp @@ -21,8 +21,7 @@ * questions. */ -#ifndef SHARE_VM_OPTO_VECTORNODE_HPP -#define SHARE_VM_OPTO_VECTORNODE_HPP +#pragma once #include "opto/matcher.hpp" #include "opto/memnode.hpp" @@ -858,5 +857,3 @@ virtual uint ideal_reg() const { return Op_RegI; } virtual const Type *Value(PhaseGVN *phase) const { return TypeInt::INT; } }; - -#endif // SHARE_VM_OPTO_VECTORNODE_HPP diff --git a/src/hotspot/share/prims/cdsoffsets.hpp b/src/hotspot/share/prims/cdsoffsets.hpp --- a/src/hotspot/share/prims/cdsoffsets.hpp +++ b/src/hotspot/share/prims/cdsoffsets.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_PRIMS_CDSOFFSETS_HPP -#define SHARE_PRIMS_CDSOFFSETS_HPP +#pragma once class CDSOffsets: public CHeapObj { private: @@ -41,5 +40,3 @@ static int find_offset(const char* name); }; - -#endif // SHARE_PRIMS_CDSOFFSETS_HPP diff --git a/src/hotspot/share/prims/forte.hpp b/src/hotspot/share/prims/forte.hpp --- a/src/hotspot/share/prims/forte.hpp +++ b/src/hotspot/share/prims/forte.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_FORTE_HPP -#define SHARE_VM_PRIMS_FORTE_HPP +#pragma once // Interface to Forte support. @@ -33,5 +32,3 @@ NOT_JVMTI_RETURN; // register internal VM stub }; - -#endif // SHARE_VM_PRIMS_FORTE_HPP diff --git a/src/hotspot/share/prims/jniCheck.hpp b/src/hotspot/share/prims/jniCheck.hpp --- a/src/hotspot/share/prims/jniCheck.hpp +++ b/src/hotspot/share/prims/jniCheck.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JNICHECK_HPP -#define SHARE_VM_PRIMS_JNICHECK_HPP +#pragma once #include "runtime/thread.hpp" @@ -55,5 +54,3 @@ static void validate_call_class(JavaThread* thr, jclass clazz, jmethodID method_id); static Method* validate_jmethod_id(JavaThread* thr, jmethodID method_id); }; - -#endif // SHARE_VM_PRIMS_JNICHECK_HPP diff --git a/src/hotspot/share/prims/jniExport.hpp b/src/hotspot/share/prims/jniExport.hpp --- a/src/hotspot/share/prims/jniExport.hpp +++ b/src/hotspot/share/prims/jniExport.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JNI_EXPORT_HPP -#define SHARE_VM_PRIMS_JNI_EXPORT_HPP +#pragma once #include "jni.h" #include "prims/jvmtiExport.hpp" @@ -38,5 +37,3 @@ return false; } }; - -#endif // SHARE_VM_PRIMS_JNI_EXPORT_HPP diff --git a/src/hotspot/share/prims/jniFastGetField.hpp b/src/hotspot/share/prims/jniFastGetField.hpp --- a/src/hotspot/share/prims/jniFastGetField.hpp +++ b/src/hotspot/share/prims/jniFastGetField.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JNIFASTGETFIELD_HPP -#define SHARE_VM_PRIMS_JNIFASTGETFIELD_HPP +#pragma once #include "memory/allocation.hpp" #include "prims/jvm_misc.hpp" @@ -98,5 +97,3 @@ // for example, for debugging purpose, in which case we need the mapping also. static address find_slowcase_pc(address pc); }; - -#endif // SHARE_VM_PRIMS_JNIFASTGETFIELD_HPP diff --git a/src/hotspot/share/prims/jvm_misc.hpp b/src/hotspot/share/prims/jvm_misc.hpp --- a/src/hotspot/share/prims/jvm_misc.hpp +++ b/src/hotspot/share/prims/jvm_misc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVM_MISC_HPP -#define SHARE_VM_PRIMS_JVM_MISC_HPP +#pragma once #include "jni.h" #include "runtime/handles.hpp" @@ -77,5 +76,3 @@ address jni_GetLongField_addr(); address jni_GetFloatField_addr(); address jni_GetDoubleField_addr(); - -#endif // SHARE_VM_PRIMS_JVM_MISC_HPP diff --git a/src/hotspot/share/prims/jvmtiAgentThread.hpp b/src/hotspot/share/prims/jvmtiAgentThread.hpp --- a/src/hotspot/share/prims/jvmtiAgentThread.hpp +++ b/src/hotspot/share/prims/jvmtiAgentThread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIAGENTTHREAD_HPP -#define SHARE_VM_PRIMS_JVMTIAGENTTHREAD_HPP +#pragma once #include "jvmtifiles/jvmtiEnv.hpp" @@ -47,5 +46,3 @@ static void start_function_wrapper(JavaThread *thread, TRAPS); void call_start_function(); }; - -#endif // SHARE_VM_PRIMS_JVMTIAGENTTHREAD_HPP diff --git a/src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp b/src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp --- a/src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp +++ b/src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTICLASSFILERECONSTITUTER_HPP -#define SHARE_VM_PRIMS_JVMTICLASSFILERECONSTITUTER_HPP +#pragma once #include "jvmtifiles/jvmtiEnv.hpp" @@ -142,5 +141,3 @@ static void copy_bytecodes(const methodHandle& method, unsigned char* bytecodes); }; - -#endif // SHARE_VM_PRIMS_JVMTICLASSFILERECONSTITUTER_HPP diff --git a/src/hotspot/share/prims/jvmtiCodeBlobEvents.hpp b/src/hotspot/share/prims/jvmtiCodeBlobEvents.hpp --- a/src/hotspot/share/prims/jvmtiCodeBlobEvents.hpp +++ b/src/hotspot/share/prims/jvmtiCodeBlobEvents.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP -#define SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP +#pragma once #include "jvmtifiles/jvmti.h" @@ -52,5 +51,3 @@ static void build_jvmti_addr_location_map(nmethod *nm, jvmtiAddrLocationMap** map, jint *map_length); }; - -#endif // SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP diff --git a/src/hotspot/share/prims/jvmtiEnter.inline.hpp b/src/hotspot/share/prims/jvmtiEnter.inline.hpp --- a/src/hotspot/share/prims/jvmtiEnter.inline.hpp +++ b/src/hotspot/share/prims/jvmtiEnter.inline.hpp @@ -22,13 +22,10 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIENTER_INLINE_HPP -#define SHARE_VM_PRIMS_JVMTIENTER_INLINE_HPP +#pragma once #include "classfile/systemDictionary.hpp" #include "jvmtifiles/jvmtiEnv.hpp" #include "memory/resourceArea.hpp" #include "prims/jvmtiImpl.hpp" #include "runtime/interfaceSupport.inline.hpp" - -#endif // SHARE_VM_PRIMS_JVMTIENTER_INLINE_HPP diff --git a/src/hotspot/share/prims/jvmtiEnvBase.hpp b/src/hotspot/share/prims/jvmtiEnvBase.hpp --- a/src/hotspot/share/prims/jvmtiEnvBase.hpp +++ b/src/hotspot/share/prims/jvmtiEnvBase.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIENVBASE_HPP -#define SHARE_VM_PRIMS_JVMTIENVBASE_HPP +#pragma once #include "classfile/classLoader.hpp" #include "prims/jvmtiEnvThreadState.hpp" @@ -643,5 +642,3 @@ public: jvmtiError get_all_modules(JvmtiEnv* env, jint* module_count_ptr, jobject** modules_ptr); }; - -#endif // SHARE_VM_PRIMS_JVMTIENVBASE_HPP diff --git a/src/hotspot/share/prims/jvmtiEnvThreadState.hpp b/src/hotspot/share/prims/jvmtiEnvThreadState.hpp --- a/src/hotspot/share/prims/jvmtiEnvThreadState.hpp +++ b/src/hotspot/share/prims/jvmtiEnvThreadState.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIENVTHREADSTATE_HPP -#define SHARE_VM_PRIMS_JVMTIENVTHREADSTATE_HPP +#pragma once #include "jvmtifiles/jvmti.h" #include "memory/allocation.hpp" @@ -181,5 +180,3 @@ void clear_to_frame_pop(int frame_number); }; - -#endif // SHARE_VM_PRIMS_JVMTIENVTHREADSTATE_HPP diff --git a/src/hotspot/share/prims/jvmtiEventController.hpp b/src/hotspot/share/prims/jvmtiEventController.hpp --- a/src/hotspot/share/prims/jvmtiEventController.hpp +++ b/src/hotspot/share/prims/jvmtiEventController.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_HPP -#define SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_HPP +#pragma once #include "jvmtifiles/jvmti.h" #include "memory/allocation.hpp" @@ -240,5 +239,3 @@ static void vm_init(); static void vm_death(); }; - -#endif // SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_HPP diff --git a/src/hotspot/share/prims/jvmtiEventController.inline.hpp b/src/hotspot/share/prims/jvmtiEventController.inline.hpp --- a/src/hotspot/share/prims/jvmtiEventController.inline.hpp +++ b/src/hotspot/share/prims/jvmtiEventController.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_INLINE_HPP -#define SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_INLINE_HPP +#pragma once #include "prims/jvmtiEventController.hpp" #include "prims/jvmtiImpl.hpp" @@ -106,5 +105,3 @@ inline bool JvmtiEventController::is_enabled(jvmtiEvent event_type) { return _universal_global_event_enabled.is_enabled(event_type); } - -#endif // SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_INLINE_HPP diff --git a/src/hotspot/share/prims/jvmtiExport.hpp b/src/hotspot/share/prims/jvmtiExport.hpp --- a/src/hotspot/share/prims/jvmtiExport.hpp +++ b/src/hotspot/share/prims/jvmtiExport.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIEXPORT_HPP -#define SHARE_VM_PRIMS_JVMTIEXPORT_HPP +#pragma once #include "jvmtifiles/jvmti.h" #include "memory/allocation.hpp" @@ -600,5 +599,3 @@ } } }; - -#endif // SHARE_VM_PRIMS_JVMTIEXPORT_HPP diff --git a/src/hotspot/share/prims/jvmtiExtensions.hpp b/src/hotspot/share/prims/jvmtiExtensions.hpp --- a/src/hotspot/share/prims/jvmtiExtensions.hpp +++ b/src/hotspot/share/prims/jvmtiExtensions.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP -#define SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP +#pragma once #include "jvmtifiles/jvmti.h" #include "jvmtifiles/jvmtiEnv.hpp" @@ -57,5 +56,3 @@ static jvmtiError set_event_callback(JvmtiEnv* env, jint extension_event_index, jvmtiExtensionEvent callback); }; - -#endif // SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP diff --git a/src/hotspot/share/prims/jvmtiGetLoadedClasses.hpp b/src/hotspot/share/prims/jvmtiGetLoadedClasses.hpp --- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.hpp +++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIGETLOADEDCLASSES_HPP -#define SHARE_VM_PRIMS_JVMTIGETLOADEDCLASSES_HPP +#pragma once #include "jvmtifiles/jvmtiEnv.hpp" @@ -33,5 +32,3 @@ static jvmtiError getClassLoaderClasses(JvmtiEnv *env, jobject initiatingLoader, jint* classCountPtr, jclass** classesPtr); }; - -#endif // SHARE_VM_PRIMS_JVMTIGETLOADEDCLASSES_HPP diff --git a/src/hotspot/share/prims/jvmtiHpp.xsl b/src/hotspot/share/prims/jvmtiHpp.xsl --- a/src/hotspot/share/prims/jvmtiHpp.xsl +++ b/src/hotspot/share/prims/jvmtiHpp.xsl @@ -38,8 +38,7 @@ -#ifndef GENERATED_JVMTIFILES_JVMTIENV_HPP -#define GENERATED_JVMTIFILES_JVMTIENV_HPP +#pragma once #include "prims/jvmtiEnvBase.hpp" #include "prims/jvmtiImpl.hpp" @@ -67,7 +66,6 @@ }; -#endif // GENERATED_JVMTIFILES_JVMTIENV_HPP diff --git a/src/hotspot/share/prims/jvmtiImpl.hpp b/src/hotspot/share/prims/jvmtiImpl.hpp --- a/src/hotspot/share/prims/jvmtiImpl.hpp +++ b/src/hotspot/share/prims/jvmtiImpl.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIIMPL_HPP -#define SHARE_VM_PRIMS_JVMTIIMPL_HPP +#pragma once #include "classfile/systemDictionary.hpp" #include "jvmtifiles/jvmti.h" @@ -531,5 +530,3 @@ // Utility macro that checks for NULL pointers: #define NULL_CHECK(X, Y) if ((X) == NULL) { return (Y); } - -#endif // SHARE_VM_PRIMS_JVMTIIMPL_HPP diff --git a/src/hotspot/share/prims/jvmtiManageCapabilities.hpp b/src/hotspot/share/prims/jvmtiManageCapabilities.hpp --- a/src/hotspot/share/prims/jvmtiManageCapabilities.hpp +++ b/src/hotspot/share/prims/jvmtiManageCapabilities.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIMANAGECAPABILITIES_HPP -#define SHARE_VM_PRIMS_JVMTIMANAGECAPABILITIES_HPP +#pragma once #include "jvmtifiles/jvmti.h" #include "memory/allocation.hpp" @@ -81,5 +80,3 @@ static void print(const jvmtiCapabilities* caps); #endif }; - -#endif // SHARE_VM_PRIMS_JVMTIMANAGECAPABILITIES_HPP diff --git a/src/hotspot/share/prims/jvmtiRawMonitor.hpp b/src/hotspot/share/prims/jvmtiRawMonitor.hpp --- a/src/hotspot/share/prims/jvmtiRawMonitor.hpp +++ b/src/hotspot/share/prims/jvmtiRawMonitor.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP -#define SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP +#pragma once #include "runtime/objectMonitor.hpp" #include "utilities/growableArray.hpp" @@ -103,5 +102,3 @@ static void transition_raw_monitors(); }; - -#endif // SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiRedefineClasses.hpp --- a/src/hotspot/share/prims/jvmtiRedefineClasses.hpp +++ b/src/hotspot/share/prims/jvmtiRedefineClasses.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIREDEFINECLASSES_HPP -#define SHARE_VM_PRIMS_JVMTIREDEFINECLASSES_HPP +#pragma once #include "jvmtifiles/jvmtiEnv.hpp" #include "memory/oopFactory.hpp" @@ -552,4 +551,3 @@ // Error printing void print_on_error(outputStream* st) const; }; -#endif // SHARE_VM_PRIMS_JVMTIREDEFINECLASSES_HPP diff --git a/src/hotspot/share/prims/jvmtiTagMap.hpp b/src/hotspot/share/prims/jvmtiTagMap.hpp --- a/src/hotspot/share/prims/jvmtiTagMap.hpp +++ b/src/hotspot/share/prims/jvmtiTagMap.hpp @@ -24,8 +24,7 @@ // JvmtiTagMap -#ifndef SHARE_VM_PRIMS_JVMTITAGMAP_HPP -#define SHARE_VM_PRIMS_JVMTITAGMAP_HPP +#pragma once #include "gc/shared/collectedHeap.hpp" #include "jvmtifiles/jvmti.h" @@ -124,5 +123,3 @@ static void weak_oops_do( BoolObjectClosure* is_alive, OopClosure* f) NOT_JVMTI_RETURN; }; - -#endif // SHARE_VM_PRIMS_JVMTITAGMAP_HPP diff --git a/src/hotspot/share/prims/jvmtiThreadState.hpp b/src/hotspot/share/prims/jvmtiThreadState.hpp --- a/src/hotspot/share/prims/jvmtiThreadState.hpp +++ b/src/hotspot/share/prims/jvmtiThreadState.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTITHREADSTATE_HPP -#define SHARE_VM_PRIMS_JVMTITHREADSTATE_HPP +#pragma once #include "jvmtifiles/jvmti.h" #include "memory/allocation.hpp" @@ -412,5 +411,3 @@ _state->clear_class_versions_map(); } }; - -#endif // SHARE_VM_PRIMS_JVMTITHREADSTATE_HPP diff --git a/src/hotspot/share/prims/jvmtiThreadState.inline.hpp b/src/hotspot/share/prims/jvmtiThreadState.inline.hpp --- a/src/hotspot/share/prims/jvmtiThreadState.inline.hpp +++ b/src/hotspot/share/prims/jvmtiThreadState.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTITHREADSTATE_INLINE_HPP -#define SHARE_VM_PRIMS_JVMTITHREADSTATE_INLINE_HPP +#pragma once #include "prims/jvmtiEnvThreadState.hpp" #include "prims/jvmtiThreadState.hpp" @@ -94,5 +93,3 @@ } return state; } - -#endif // SHARE_VM_PRIMS_JVMTITHREADSTATE_INLINE_HPP diff --git a/src/hotspot/share/prims/jvmtiTrace.hpp b/src/hotspot/share/prims/jvmtiTrace.hpp --- a/src/hotspot/share/prims/jvmtiTrace.hpp +++ b/src/hotspot/share/prims/jvmtiTrace.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTITRACE_HPP -#define SHARE_VM_PRIMS_JVMTITRACE_HPP +#pragma once #include "classfile/systemDictionary.hpp" #include "jvmtifiles/jvmti.h" @@ -108,5 +107,3 @@ }; #endif /*JVMTI_TRACE */ - -#endif // SHARE_VM_PRIMS_JVMTITRACE_HPP diff --git a/src/hotspot/share/prims/jvmtiUtil.hpp b/src/hotspot/share/prims/jvmtiUtil.hpp --- a/src/hotspot/share/prims/jvmtiUtil.hpp +++ b/src/hotspot/share/prims/jvmtiUtil.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_JVMTIUTIL_HPP -#define SHARE_VM_PRIMS_JVMTIUTIL_HPP +#pragma once #include "jvmtifiles/jvmti.h" #include "memory/resourceArea.hpp" @@ -91,5 +90,3 @@ SafeResourceMark() : ResourceMark(safe_resource_area()) {} }; - -#endif // SHARE_VM_PRIMS_JVMTIUTIL_HPP diff --git a/src/hotspot/share/prims/methodComparator.hpp b/src/hotspot/share/prims/methodComparator.hpp --- a/src/hotspot/share/prims/methodComparator.hpp +++ b/src/hotspot/share/prims/methodComparator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_METHODCOMPARATOR_HPP -#define SHARE_VM_PRIMS_METHODCOMPARATOR_HPP +#pragma once #include "interpreter/bytecodeStream.hpp" #include "oops/constantPool.hpp" @@ -51,5 +50,3 @@ static bool methods_EMCP(Method* old_method, Method* new_method); }; - -#endif // SHARE_VM_PRIMS_METHODCOMPARATOR_HPP diff --git a/src/hotspot/share/prims/methodHandles.hpp b/src/hotspot/share/prims/methodHandles.hpp --- a/src/hotspot/share/prims/methodHandles.hpp +++ b/src/hotspot/share/prims/methodHandles.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_METHODHANDLES_HPP -#define SHARE_VM_PRIMS_METHODHANDLES_HPP +#pragma once #include "classfile/javaClasses.hpp" #include "classfile/vmSymbols.hpp" @@ -214,5 +213,3 @@ void generate(); }; - -#endif // SHARE_VM_PRIMS_METHODHANDLES_HPP diff --git a/src/hotspot/share/prims/nativeLookup.hpp b/src/hotspot/share/prims/nativeLookup.hpp --- a/src/hotspot/share/prims/nativeLookup.hpp +++ b/src/hotspot/share/prims/nativeLookup.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_NATIVELOOKUP_HPP -#define SHARE_VM_PRIMS_NATIVELOOKUP_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/handles.hpp" @@ -52,5 +51,3 @@ // Lookup native functions in base library. static address base_library_lookup(const char* class_name, const char* method_name, const char* signature); }; - -#endif // SHARE_VM_PRIMS_NATIVELOOKUP_HPP diff --git a/src/hotspot/share/prims/resolvedMethodTable.hpp b/src/hotspot/share/prims/resolvedMethodTable.hpp --- a/src/hotspot/share/prims/resolvedMethodTable.hpp +++ b/src/hotspot/share/prims/resolvedMethodTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_RESOLVEDMETHOD_HPP -#define SHARE_VM_PRIMS_RESOLVEDMETHOD_HPP +#pragma once #include "oops/symbol.hpp" #include "oops/weakHandle.hpp" @@ -109,5 +108,3 @@ #endif void verify(); }; - -#endif // SHARE_VM_PRIMS_RESOLVEDMETHOD_HPP diff --git a/src/hotspot/share/prims/stackwalk.hpp b/src/hotspot/share/prims/stackwalk.hpp --- a/src/hotspot/share/prims/stackwalk.hpp +++ b/src/hotspot/share/prims/stackwalk.hpp @@ -23,8 +23,7 @@ */ -#ifndef SHARE_VM_PRIMS_STACKWALK_HPP -#define SHARE_VM_PRIMS_STACKWALK_HPP +#pragma once #include "oops/oop.hpp" #include "runtime/vframe.hpp" @@ -157,4 +156,3 @@ int frame_count, int start_index, objArrayHandle frames_array, TRAPS); }; -#endif // SHARE_VM_PRIMS_STACKWALK_HPP diff --git a/src/hotspot/share/prims/unsafe.hpp b/src/hotspot/share/prims/unsafe.hpp --- a/src/hotspot/share/prims/unsafe.hpp +++ b/src/hotspot/share/prims/unsafe.hpp @@ -23,8 +23,7 @@ */ -#ifndef SHARE_VM_PRIMS_UNSAFE_HPP -#define SHARE_VM_PRIMS_UNSAFE_HPP +#pragma once #include "jni.h" @@ -35,5 +34,3 @@ jlong Unsafe_field_offset_to_byte_offset(jlong field_offset); jlong Unsafe_field_offset_from_byte_offset(jlong byte_offset); - -#endif // SHARE_VM_PRIMS_UNSAFE_HPP diff --git a/src/hotspot/share/prims/wbtestmethods/parserTests.hpp b/src/hotspot/share/prims/wbtestmethods/parserTests.hpp --- a/src/hotspot/share/prims/wbtestmethods/parserTests.hpp +++ b/src/hotspot/share/prims/wbtestmethods/parserTests.hpp @@ -21,12 +21,9 @@ * questions. */ -#ifndef SHARE_VM_PRIMS_WBTESTMETHODS_PARSERTESTS_H -#define SHARE_VM_PRIMS_WBTESTMETHODS_PARSERTESTS_H +#pragma once #include "jni.h" #include "prims/whitebox.hpp" WB_METHOD_DECLARE(jobjectArray) WB_ParseCommandLine(JNIEnv* env, jobject o, jstring args, jchar delim, jobjectArray arguments); - -#endif //SHARE_VM_PRIMS_WBTESTMETHODS_PARSERTESTS_H diff --git a/src/hotspot/share/prims/whitebox.hpp b/src/hotspot/share/prims/whitebox.hpp --- a/src/hotspot/share/prims/whitebox.hpp +++ b/src/hotspot/share/prims/whitebox.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_WHITEBOX_HPP -#define SHARE_VM_PRIMS_WHITEBOX_HPP +#pragma once #include "jni.h" @@ -69,5 +68,3 @@ static void register_extended(JNIEnv* env, jclass wbclass, JavaThread* thread); static bool compile_method(Method* method, int comp_level, int bci, Thread* THREAD); }; - -#endif // SHARE_VM_PRIMS_WHITEBOX_HPP diff --git a/src/hotspot/share/prims/whitebox.inline.hpp b/src/hotspot/share/prims/whitebox.inline.hpp --- a/src/hotspot/share/prims/whitebox.inline.hpp +++ b/src/hotspot/share/prims/whitebox.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_PRIMS_WHITEBOX_INLINE_HPP -#define SHARE_VM_PRIMS_WHITEBOX_INLINE_HPP +#pragma once #include "prims/whitebox.hpp" #include "runtime/interfaceSupport.inline.hpp" @@ -34,5 +33,3 @@ ClearPendingJniExcCheck _clearCheck(env); #define WB_END JNI_END - -#endif // SHARE_VM_PRIMS_WHITEBOX_INLINE_HPP diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp --- a/src/hotspot/share/runtime/arguments.hpp +++ b/src/hotspot/share/runtime/arguments.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_ARGUMENTS_HPP -#define SHARE_VM_RUNTIME_ARGUMENTS_HPP +#pragma once #include "logging/logLevel.hpp" #include "logging/logTag.hpp" @@ -664,5 +663,3 @@ FLAG_SET_DEFAULT(opt, false); \ } \ } while(0) - -#endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP diff --git a/src/hotspot/share/runtime/atomic.hpp b/src/hotspot/share/runtime/atomic.hpp --- a/src/hotspot/share/runtime/atomic.hpp +++ b/src/hotspot/share/runtime/atomic.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_ATOMIC_HPP -#define SHARE_VM_RUNTIME_ATOMIC_HPP +#pragma once #include "memory/allocation.hpp" #include "metaprogramming/conditional.hpp" @@ -872,5 +871,3 @@ inline D Atomic::xchg(T exchange_value, volatile D* dest, atomic_memory_order order) { return XchgImpl()(exchange_value, dest, order); } - -#endif // SHARE_VM_RUNTIME_ATOMIC_HPP diff --git a/src/hotspot/share/runtime/basicLock.hpp b/src/hotspot/share/runtime/basicLock.hpp --- a/src/hotspot/share/runtime/basicLock.hpp +++ b/src/hotspot/share/runtime/basicLock.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_BASICLOCK_HPP -#define SHARE_VM_RUNTIME_BASICLOCK_HPP +#pragma once #include "oops/markOop.hpp" #include "runtime/handles.hpp" @@ -76,6 +75,3 @@ static int obj_offset_in_bytes() { return offset_of(BasicObjectLock, _obj); } static int lock_offset_in_bytes() { return offset_of(BasicObjectLock, _lock); } }; - - -#endif // SHARE_VM_RUNTIME_BASICLOCK_HPP diff --git a/src/hotspot/share/runtime/biasedLocking.hpp b/src/hotspot/share/runtime/biasedLocking.hpp --- a/src/hotspot/share/runtime/biasedLocking.hpp +++ b/src/hotspot/share/runtime/biasedLocking.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_BIASEDLOCKING_HPP -#define SHARE_VM_RUNTIME_BIASEDLOCKING_HPP +#pragma once #include "runtime/handles.hpp" #include "utilities/growableArray.hpp" @@ -191,5 +190,3 @@ static void preserve_marks(); static void restore_marks(); }; - -#endif // SHARE_VM_RUNTIME_BIASEDLOCKING_HPP diff --git a/src/hotspot/share/runtime/compilationPolicy.hpp b/src/hotspot/share/runtime/compilationPolicy.hpp --- a/src/hotspot/share/runtime/compilationPolicy.hpp +++ b/src/hotspot/share/runtime/compilationPolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_COMPILATIONPOLICY_HPP -#define SHARE_VM_RUNTIME_COMPILATIONPOLICY_HPP +#pragma once #include "code/nmethod.hpp" #include "compiler/compileBroker.hpp" @@ -150,5 +149,3 @@ }; #endif - -#endif // SHARE_VM_RUNTIME_COMPILATIONPOLICY_HPP diff --git a/src/hotspot/share/runtime/deoptimization.hpp b/src/hotspot/share/runtime/deoptimization.hpp --- a/src/hotspot/share/runtime/deoptimization.hpp +++ b/src/hotspot/share/runtime/deoptimization.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_DEOPTIMIZATION_HPP -#define SHARE_VM_RUNTIME_DEOPTIMIZATION_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/frame.hpp" @@ -467,5 +466,3 @@ ~DeoptimizationMarker() { _is_active = false; } static bool is_active() { return _is_active; } }; - -#endif // SHARE_VM_RUNTIME_DEOPTIMIZATION_HPP diff --git a/src/hotspot/share/runtime/extendedPC.hpp b/src/hotspot/share/runtime/extendedPC.hpp --- a/src/hotspot/share/runtime/extendedPC.hpp +++ b/src/hotspot/share/runtime/extendedPC.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_EXTENDEDPC_HPP -#define SHARE_VM_RUNTIME_EXTENDEDPC_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -39,5 +38,3 @@ ExtendedPC(address pc) { _pc = pc; } ExtendedPC() { _pc = NULL; } }; - -#endif // SHARE_VM_RUNTIME_EXTENDEDPC_HPP diff --git a/src/hotspot/share/runtime/fieldDescriptor.hpp b/src/hotspot/share/runtime/fieldDescriptor.hpp --- a/src/hotspot/share/runtime/fieldDescriptor.hpp +++ b/src/hotspot/share/runtime/fieldDescriptor.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_FIELDDESCRIPTOR_HPP -#define SHARE_VM_RUNTIME_FIELDDESCRIPTOR_HPP +#pragma once #include "oops/constantPool.hpp" #include "oops/fieldInfo.hpp" @@ -116,5 +115,3 @@ void print_on_for(outputStream* st, oop obj) PRODUCT_RETURN; void verify() const PRODUCT_RETURN; }; - -#endif // SHARE_VM_RUNTIME_FIELDDESCRIPTOR_HPP diff --git a/src/hotspot/share/runtime/fieldDescriptor.inline.hpp b/src/hotspot/share/runtime/fieldDescriptor.inline.hpp --- a/src/hotspot/share/runtime/fieldDescriptor.inline.hpp +++ b/src/hotspot/share/runtime/fieldDescriptor.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_FIELDDESCRIPTOR_INLINE_HPP -#define SHARE_VM_RUNTIME_FIELDDESCRIPTOR_INLINE_HPP +#pragma once #include "runtime/handles.inline.hpp" @@ -78,5 +77,3 @@ inline BasicType fieldDescriptor::field_type() const { return FieldType::basic_type(signature()); } - -#endif // SHARE_VM_RUNTIME_FIELDDESCRIPTOR_INLINE_HPP diff --git a/src/hotspot/share/runtime/fieldType.hpp b/src/hotspot/share/runtime/fieldType.hpp --- a/src/hotspot/share/runtime/fieldType.hpp +++ b/src/hotspot/share/runtime/fieldType.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_FIELDTYPE_HPP -#define SHARE_VM_RUNTIME_FIELDTYPE_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/symbol.hpp" @@ -71,5 +70,3 @@ // Parse field and extract array information. Works for T_ARRAY only. static BasicType get_array_info(Symbol* signature, FieldArrayInfo& ai, TRAPS); }; - -#endif // SHARE_VM_RUNTIME_FIELDTYPE_HPP diff --git a/src/hotspot/share/runtime/flags/flagSetting.hpp b/src/hotspot/share/runtime/flags/flagSetting.hpp --- a/src/hotspot/share/runtime/flags/flagSetting.hpp +++ b/src/hotspot/share/runtime/flags/flagSetting.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_FLAGS_FLAGSETTING_HPP -#define SHARE_VM_RUNTIME_FLAGS_FLAGSETTING_HPP +#pragma once #include "memory/allocation.hpp" @@ -67,5 +66,3 @@ }; #define FLAG_GUARD(f) FlagGuard f ## _guard(&f) - -#endif // SHARE_VM_RUNTIME_FLAGS_FLAGSETTING_HPP diff --git a/src/hotspot/share/runtime/flags/jvmFlag.hpp b/src/hotspot/share/runtime/flags/jvmFlag.hpp --- a/src/hotspot/share/runtime/flags/jvmFlag.hpp +++ b/src/hotspot/share/runtime/flags/jvmFlag.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_FLAGS_JVMFLAG_HPP -#define SHARE_VM_RUNTIME_FLAGS_JVMFLAG_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" @@ -278,5 +277,3 @@ static void verify() PRODUCT_RETURN; }; - -#endif // SHARE_VM_RUNTIME_FLAGS_JVMFLAG_HPP diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp --- a/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp +++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTLIST_HPP -#define SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTLIST_HPP +#pragma once #include "runtime/flags/jvmFlag.hpp" #include "utilities/growableArray.hpp" @@ -97,5 +96,3 @@ static bool validated_after_ergo() { return _validating_type >= JVMFlagConstraint::AfterErgo; }; static bool check_constraints(JVMFlagConstraint::ConstraintType type); }; - -#endif /* SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTLIST_HPP */ diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp --- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp +++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSCOMPILER_HPP -#define SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSCOMPILER_HPP +#pragma once #include "runtime/flags/jvmFlag.hpp" @@ -70,5 +69,3 @@ #endif JVMFlag::Error RTMTotalCountIncrRateConstraintFunc(int value, bool verbose); - -#endif /* SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSCOMPILER_HPP */ diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp --- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp +++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSRUNTIME_HPP -#define SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSRUNTIME_HPP +#pragma once #include "runtime/flags/jvmFlag.hpp" @@ -45,6 +44,3 @@ JVMFlag::Error PerfDataSamplingIntervalFunc(intx value, bool verbose); JVMFlag::Error ThreadLocalHandshakesConstraintFunc(bool value, bool verbose); - - -#endif /* SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSRUNTIME_HPP */ diff --git a/src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp b/src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp --- a/src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp +++ b/src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_JVMFLAGRANGELIST_HPP -#define SHARE_VM_RUNTIME_JVMFLAGRANGELIST_HPP +#pragma once #include "runtime/flags/jvmFlag.hpp" #include "utilities/growableArray.hpp" @@ -69,5 +68,3 @@ // Check the final values of all flags for ranges. static bool check_ranges(); }; - -#endif // SHARE_VM_RUNTIME_JVMFLAGRANGELIST_HPP diff --git a/src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp b/src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp --- a/src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp +++ b/src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_JVMFLAGWRITEABLE_HPP -#define SHARE_VM_RUNTIME_JVMFLAGWRITEABLE_HPP +#pragma once #include "utilities/growableArray.hpp" @@ -63,5 +62,3 @@ static void add(JVMFlagWriteable* range) { _controls->append(range); } static void mark_startup(void); }; - -#endif // SHARE_VM_RUNTIME_JVMFLAGWRITEABLE_HPP diff --git a/src/hotspot/share/runtime/frame.hpp b/src/hotspot/share/runtime/frame.hpp --- a/src/hotspot/share/runtime/frame.hpp +++ b/src/hotspot/share/runtime/frame.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_FRAME_HPP -#define SHARE_VM_RUNTIME_FRAME_HPP +#pragma once #include "oops/method.hpp" #include "runtime/basicLock.hpp" @@ -469,5 +468,3 @@ frame *current() { return &_fr; } RegisterMap* register_map() { return &_reg_map; } }; - -#endif // SHARE_VM_RUNTIME_FRAME_HPP diff --git a/src/hotspot/share/runtime/frame.inline.hpp b/src/hotspot/share/runtime/frame.inline.hpp --- a/src/hotspot/share/runtime/frame.inline.hpp +++ b/src/hotspot/share/runtime/frame.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_FRAME_INLINE_HPP -#define SHARE_VM_RUNTIME_FRAME_INLINE_HPP +#pragma once #include "code/compiledMethod.inline.hpp" #include "interpreter/bytecodeInterpreter.hpp" @@ -66,5 +65,3 @@ inline bool StackFrameStream::is_done() { return (_is_done) ? true : (_is_done = _fr.is_first_frame(), false); } - -#endif // SHARE_VM_RUNTIME_FRAME_INLINE_HPP diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp --- a/src/hotspot/share/runtime/globals.hpp +++ b/src/hotspot/share/runtime/globals.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_GLOBALS_HPP -#define SHARE_VM_RUNTIME_GLOBALS_HPP +#pragma once #include "gc/shared/gc_globals.hpp" #include "utilities/align.hpp" @@ -2748,5 +2747,3 @@ // Extensions #include "runtime/globals_ext.hpp" - -#endif // SHARE_VM_RUNTIME_GLOBALS_HPP diff --git a/src/hotspot/share/runtime/globals_ext.hpp b/src/hotspot/share/runtime/globals_ext.hpp --- a/src/hotspot/share/runtime/globals_ext.hpp +++ b/src/hotspot/share/runtime/globals_ext.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_GLOBALS_EXT_HPP -#define SHARE_VM_RUNTIME_GLOBALS_EXT_HPP +#pragma once #include "runtime/flags/jvmFlag.hpp" @@ -68,5 +67,3 @@ buf[0] = '\0'; return JVMFlag::NONE; } - -#endif // SHARE_VM_RUNTIME_GLOBALS_EXT_HPP diff --git a/src/hotspot/share/runtime/globals_extension.hpp b/src/hotspot/share/runtime/globals_extension.hpp --- a/src/hotspot/share/runtime/globals_extension.hpp +++ b/src/hotspot/share/runtime/globals_extension.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_GLOBALS_EXTENSION_HPP -#define SHARE_VM_RUNTIME_GLOBALS_EXTENSION_HPP +#pragma once #include "runtime/globals.hpp" #include "utilities/macros.hpp" @@ -333,5 +332,3 @@ static void setOnCmdLine(JVMFlagsWithType flag); }; - -#endif // SHARE_VM_RUNTIME_GLOBALS_EXTENSION_HPP diff --git a/src/hotspot/share/runtime/handles.hpp b/src/hotspot/share/runtime/handles.hpp --- a/src/hotspot/share/runtime/handles.hpp +++ b/src/hotspot/share/runtime/handles.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_HANDLES_HPP -#define SHARE_VM_RUNTIME_HANDLES_HPP +#pragma once #include "memory/arena.hpp" #include "oops/oop.hpp" @@ -309,5 +308,3 @@ inline HandleMarkCleaner(Thread* thread); inline ~HandleMarkCleaner(); }; - -#endif // SHARE_VM_RUNTIME_HANDLES_HPP diff --git a/src/hotspot/share/runtime/handles.inline.hpp b/src/hotspot/share/runtime/handles.inline.hpp --- a/src/hotspot/share/runtime/handles.inline.hpp +++ b/src/hotspot/share/runtime/handles.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_HANDLES_INLINE_HPP -#define SHARE_VM_RUNTIME_HANDLES_INLINE_HPP +#pragma once #include "runtime/handles.hpp" #include "runtime/thread.inline.hpp" @@ -112,5 +111,3 @@ inline HandleMarkCleaner::~HandleMarkCleaner() { _thread->last_handle_mark()->pop_and_restore(); } - -#endif // SHARE_VM_RUNTIME_HANDLES_INLINE_HPP diff --git a/src/hotspot/share/runtime/handshake.hpp b/src/hotspot/share/runtime/handshake.hpp --- a/src/hotspot/share/runtime/handshake.hpp +++ b/src/hotspot/share/runtime/handshake.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_HANDSHAKE_HPP -#define SHARE_VM_RUNTIME_HANDSHAKE_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/flags/flagSetting.hpp" @@ -80,5 +79,3 @@ void process_by_vmthread(JavaThread* target); }; - -#endif // SHARE_VM_RUNTIME_HANDSHAKE_HPP diff --git a/src/hotspot/share/runtime/icache.hpp b/src/hotspot/share/runtime/icache.hpp --- a/src/hotspot/share/runtime/icache.hpp +++ b/src/hotspot/share/runtime/icache.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_ICACHE_HPP -#define SHARE_VM_RUNTIME_ICACHE_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/stubCodeGenerator.hpp" @@ -119,5 +118,3 @@ void generate_icache_flush(ICache::flush_icache_stub_t* flush_icache_stub); }; - -#endif // SHARE_VM_RUNTIME_ICACHE_HPP diff --git a/src/hotspot/share/runtime/init.hpp b/src/hotspot/share/runtime/init.hpp --- a/src/hotspot/share/runtime/init.hpp +++ b/src/hotspot/share/runtime/init.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_INIT_HPP -#define SHARE_VM_RUNTIME_INIT_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -41,5 +40,3 @@ bool is_init_completed(); // returns true when bootstrapping has completed void set_init_completed(); // set basic init to completed - -#endif // SHARE_VM_RUNTIME_INIT_HPP diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/src/hotspot/share/runtime/interfaceSupport.inline.hpp --- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp +++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_INTERFACESUPPORT_INLINE_HPP -#define SHARE_VM_RUNTIME_INTERFACESUPPORT_INLINE_HPP +#pragma once #include "runtime/handles.inline.hpp" #include "runtime/mutexLocker.hpp" @@ -567,5 +566,3 @@ #define JVM_END } } - -#endif // SHARE_VM_RUNTIME_INTERFACESUPPORT_INLINE_HPP diff --git a/src/hotspot/share/runtime/java.hpp b/src/hotspot/share/runtime/java.hpp --- a/src/hotspot/share/runtime/java.hpp +++ b/src/hotspot/share/runtime/java.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_JAVA_HPP -#define SHARE_VM_RUNTIME_JAVA_HPP +#pragma once #include "runtime/os.hpp" @@ -156,5 +155,3 @@ } }; - -#endif // SHARE_VM_RUNTIME_JAVA_HPP diff --git a/src/hotspot/share/runtime/javaCalls.hpp b/src/hotspot/share/runtime/javaCalls.hpp --- a/src/hotspot/share/runtime/javaCalls.hpp +++ b/src/hotspot/share/runtime/javaCalls.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_JAVACALLS_HPP -#define SHARE_VM_RUNTIME_JAVACALLS_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/method.hpp" @@ -267,5 +266,3 @@ // Low-level interface static void call(JavaValue* result, const methodHandle& method, JavaCallArguments* args, TRAPS); }; - -#endif // SHARE_VM_RUNTIME_JAVACALLS_HPP diff --git a/src/hotspot/share/runtime/javaFrameAnchor.hpp b/src/hotspot/share/runtime/javaFrameAnchor.hpp --- a/src/hotspot/share/runtime/javaFrameAnchor.hpp +++ b/src/hotspot/share/runtime/javaFrameAnchor.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_JAVAFRAMEANCHOR_HPP -#define SHARE_VM_RUNTIME_JAVAFRAMEANCHOR_HPP +#pragma once #include "runtime/orderAccess.hpp" #include "utilities/globalDefinitions.hpp" @@ -93,5 +92,3 @@ static ByteSize last_Java_pc_offset() { return byte_offset_of(JavaFrameAnchor, _last_Java_pc); } }; - -#endif // SHARE_VM_RUNTIME_JAVAFRAMEANCHOR_HPP diff --git a/src/hotspot/share/runtime/jfieldIDWorkaround.hpp b/src/hotspot/share/runtime/jfieldIDWorkaround.hpp --- a/src/hotspot/share/runtime/jfieldIDWorkaround.hpp +++ b/src/hotspot/share/runtime/jfieldIDWorkaround.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_JFIELDIDWORKAROUND_HPP -#define SHARE_VM_RUNTIME_JFIELDIDWORKAROUND_HPP +#pragma once class jfieldIDWorkaround: AllStatic { // This workaround is because JVMTI doesn't have distinct entry points @@ -160,5 +159,3 @@ } } }; - -#endif // SHARE_VM_RUNTIME_JFIELDIDWORKAROUND_HPP diff --git a/src/hotspot/share/runtime/jniHandles.hpp b/src/hotspot/share/runtime/jniHandles.hpp --- a/src/hotspot/share/runtime/jniHandles.hpp +++ b/src/hotspot/share/runtime/jniHandles.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_JNIHANDLES_HPP -#define SHARE_VM_RUNTIME_JNIHANDLES_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/handles.hpp" @@ -205,5 +204,3 @@ static void print_statistics(); #endif }; - -#endif // SHARE_VM_RUNTIME_JNIHANDLES_HPP diff --git a/src/hotspot/share/runtime/jniHandles.inline.hpp b/src/hotspot/share/runtime/jniHandles.inline.hpp --- a/src/hotspot/share/runtime/jniHandles.inline.hpp +++ b/src/hotspot/share/runtime/jniHandles.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_RUNTIME_JNIHANDLES_INLINE_HPP -#define SHARE_RUNTIME_JNIHANDLES_INLINE_HPP +#pragma once #include "oops/access.inline.hpp" #include "oops/oop.hpp" @@ -100,6 +99,3 @@ NativeAccess<>::oop_store(jobject_ptr(handle), (oop)NULL); } } - -#endif // SHARE_RUNTIME_JNIHANDLES_INLINE_HPP - diff --git a/src/hotspot/share/runtime/jniPeriodicChecker.hpp b/src/hotspot/share/runtime/jniPeriodicChecker.hpp --- a/src/hotspot/share/runtime/jniPeriodicChecker.hpp +++ b/src/hotspot/share/runtime/jniPeriodicChecker.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_JNIPERIODICCHECKER_HPP -#define SHARE_VM_RUNTIME_JNIPERIODICCHECKER_HPP +#pragma once class JniPeriodicCheckerTask; @@ -53,5 +52,3 @@ }; void jniPeriodicChecker_exit(); - -#endif // SHARE_VM_RUNTIME_JNIPERIODICCHECKER_HPP diff --git a/src/hotspot/share/runtime/memprofiler.hpp b/src/hotspot/share/runtime/memprofiler.hpp --- a/src/hotspot/share/runtime/memprofiler.hpp +++ b/src/hotspot/share/runtime/memprofiler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_MEMPROFILER_HPP -#define SHARE_VM_RUNTIME_MEMPROFILER_HPP +#pragma once // Prints periodic memory usage trace of HotSpot VM @@ -43,5 +42,3 @@ // Tester static bool is_active() PRODUCT_RETURN0; }; - -#endif // SHARE_VM_RUNTIME_MEMPROFILER_HPP diff --git a/src/hotspot/share/runtime/monitorChunk.hpp b/src/hotspot/share/runtime/monitorChunk.hpp --- a/src/hotspot/share/runtime/monitorChunk.hpp +++ b/src/hotspot/share/runtime/monitorChunk.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_MONITORCHUNK_HPP -#define SHARE_VM_RUNTIME_MONITORCHUNK_HPP +#pragma once #include "runtime/synchronizer.hpp" @@ -61,5 +60,3 @@ // Tells whether the addr point into the monitors. bool contains(void* addr) const { return (addr >= (void*) monitors()) && (addr < (void*) (monitors() + number_of_monitors())); } }; - -#endif // SHARE_VM_RUNTIME_MONITORCHUNK_HPP diff --git a/src/hotspot/share/runtime/mutex.hpp b/src/hotspot/share/runtime/mutex.hpp --- a/src/hotspot/share/runtime/mutex.hpp +++ b/src/hotspot/share/runtime/mutex.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_MUTEX_HPP -#define SHARE_VM_RUNTIME_MUTEX_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/os.hpp" @@ -319,5 +318,3 @@ SafepointCheckRequired safepoint_check_required = _safepoint_check_always) : Mutex(rank, name, allow_vm_block, safepoint_check_required) {}; }; - -#endif // SHARE_VM_RUNTIME_MUTEX_HPP diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp --- a/src/hotspot/share/runtime/mutexLocker.hpp +++ b/src/hotspot/share/runtime/mutexLocker.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_MUTEXLOCKER_HPP -#define SHARE_VM_RUNTIME_MUTEXLOCKER_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/flags/flagSetting.hpp" @@ -351,5 +350,3 @@ } } }; - -#endif // SHARE_VM_RUNTIME_MUTEXLOCKER_HPP diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp --- a/src/hotspot/share/runtime/objectMonitor.hpp +++ b/src/hotspot/share/runtime/objectMonitor.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_OBJECTMONITOR_HPP -#define SHARE_VM_RUNTIME_OBJECTMONITOR_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/padded.hpp" @@ -314,5 +313,3 @@ void ExitEpilog(Thread * Self, ObjectWaiter * Wakee); bool ExitSuspendEquivalent(JavaThread * Self); }; - -#endif // SHARE_VM_RUNTIME_OBJECTMONITOR_HPP diff --git a/src/hotspot/share/runtime/objectMonitor.inline.hpp b/src/hotspot/share/runtime/objectMonitor.inline.hpp --- a/src/hotspot/share/runtime/objectMonitor.inline.hpp +++ b/src/hotspot/share/runtime/objectMonitor.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_OBJECTMONITOR_INLINE_HPP -#define SHARE_VM_RUNTIME_OBJECTMONITOR_INLINE_HPP +#pragma once inline intptr_t ObjectMonitor::is_entered(TRAPS) const { if (THREAD == _owner || THREAD->is_lock_owned((address) _owner)) { @@ -108,6 +107,3 @@ _owner = owner; _recursions = 0; } - - -#endif // SHARE_VM_RUNTIME_OBJECTMONITOR_INLINE_HPP diff --git a/src/hotspot/share/runtime/orderAccess.hpp b/src/hotspot/share/runtime/orderAccess.hpp --- a/src/hotspot/share/runtime/orderAccess.hpp +++ b/src/hotspot/share/runtime/orderAccess.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_ORDERACCESS_HPP -#define SHARE_VM_RUNTIME_ORDERACCESS_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/atomic.hpp" @@ -346,4 +345,3 @@ inline void OrderAccess::release_store_fence(volatile D* p, T v) { StoreImpl >()(v, p); } -#endif // SHARE_VM_RUNTIME_ORDERACCESS_HPP diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp --- a/src/hotspot/share/runtime/os.hpp +++ b/src/hotspot/share/runtime/os.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_OS_HPP -#define SHARE_VM_RUNTIME_OS_HPP +#pragma once #include "jvm.h" #include "jvmtifiles/jvmti.h" @@ -994,5 +993,3 @@ // It'd also be eligible for inlining on many platforms. extern "C" int SpinPause(); - -#endif // SHARE_VM_RUNTIME_OS_HPP diff --git a/src/hotspot/share/runtime/os.inline.hpp b/src/hotspot/share/runtime/os.inline.hpp --- a/src/hotspot/share/runtime/os.inline.hpp +++ b/src/hotspot/share/runtime/os.inline.hpp @@ -22,11 +22,8 @@ * */ -#ifndef SHARE_VM_RUNTIME_OS_INLINE_HPP -#define SHARE_VM_RUNTIME_OS_INLINE_HPP +#pragma once #include "runtime/os.hpp" #include OS_HEADER_INLINE(os) - -#endif // SHARE_VM_RUNTIME_OS_INLINE_HPP diff --git a/src/hotspot/share/runtime/osThread.hpp b/src/hotspot/share/runtime/osThread.hpp --- a/src/hotspot/share/runtime/osThread.hpp +++ b/src/hotspot/share/runtime/osThread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_OSTHREAD_HPP -#define SHARE_VM_RUNTIME_OSTHREAD_HPP +#pragma once #include "runtime/frame.hpp" #include "runtime/handles.hpp" @@ -146,5 +145,3 @@ _osthread->set_state(_old_state); } }; - -#endif // SHARE_VM_RUNTIME_OSTHREAD_HPP diff --git a/src/hotspot/share/runtime/os_ext.hpp b/src/hotspot/share/runtime/os_ext.hpp --- a/src/hotspot/share/runtime/os_ext.hpp +++ b/src/hotspot/share/runtime/os_ext.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_OS_EXT_HPP -#define SHARE_VM_RUNTIME_OS_EXT_HPP +#pragma once #define EMIT_RANGES_FOR_GLOBALS_EXT // NOP #define EMIT_CONSTRAINTS_FOR_GLOBALS_EXT // NOP @@ -34,5 +33,3 @@ // See os.hpp/cpp and init.cpp. private: - -#endif // SHARE_VM_RUNTIME_OS_EXT_HPP diff --git a/src/hotspot/share/runtime/os_perf.hpp b/src/hotspot/share/runtime/os_perf.hpp --- a/src/hotspot/share/runtime/os_perf.hpp +++ b/src/hotspot/share/runtime/os_perf.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_OS_PERF_HPP -#define SHARE_VM_RUNTIME_OS_PERF_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/macros.hpp" @@ -286,5 +285,3 @@ ~NetworkPerformanceInterface(); int network_utilization(NetworkInterface** network_interfaces) const; }; - -#endif // SHARE_VM_RUNTIME_OS_PERF_HPP diff --git a/src/hotspot/share/runtime/park.hpp b/src/hotspot/share/runtime/park.hpp --- a/src/hotspot/share/runtime/park.hpp +++ b/src/hotspot/share/runtime/park.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_PARK_HPP -#define SHARE_VM_RUNTIME_PARK_HPP +#pragma once #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -162,5 +161,3 @@ static ParkEvent * Allocate (Thread * t) ; static void Release (ParkEvent * e) ; } ; - -#endif // SHARE_VM_RUNTIME_PARK_HPP diff --git a/src/hotspot/share/runtime/perfData.hpp b/src/hotspot/share/runtime/perfData.hpp --- a/src/hotspot/share/runtime/perfData.hpp +++ b/src/hotspot/share/runtime/perfData.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_PERFDATA_HPP -#define SHARE_VM_RUNTIME_PERFDATA_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/perfMemory.hpp" @@ -969,5 +968,3 @@ _eventp->inc(); } }; - -#endif // SHARE_VM_RUNTIME_PERFDATA_HPP diff --git a/src/hotspot/share/runtime/perfData.inline.hpp b/src/hotspot/share/runtime/perfData.inline.hpp --- a/src/hotspot/share/runtime/perfData.inline.hpp +++ b/src/hotspot/share/runtime/perfData.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_PERFDATA_INLINE_HPP -#define SHARE_VM_RUNTIME_PERFDATA_INLINE_HPP +#pragma once #include "runtime/perfData.hpp" #include "utilities/globalDefinitions.hpp" @@ -64,5 +63,3 @@ return false; } } - -#endif // SHARE_VM_RUNTIME_PERFDATA_INLINE_HPP diff --git a/src/hotspot/share/runtime/perfMemory.hpp b/src/hotspot/share/runtime/perfMemory.hpp --- a/src/hotspot/share/runtime/perfMemory.hpp +++ b/src/hotspot/share/runtime/perfMemory.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_PERFMEMORY_HPP -#define SHARE_VM_RUNTIME_PERFMEMORY_HPP +#pragma once #include "utilities/exceptions.hpp" @@ -166,5 +165,3 @@ void perfMemory_init(); void perfMemory_exit(); - -#endif // SHARE_VM_RUNTIME_PERFMEMORY_HPP diff --git a/src/hotspot/share/runtime/prefetch.hpp b/src/hotspot/share/runtime/prefetch.hpp --- a/src/hotspot/share/runtime/prefetch.hpp +++ b/src/hotspot/share/runtime/prefetch.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_PREFETCH_HPP -#define SHARE_VM_RUNTIME_PREFETCH_HPP +#pragma once #include "memory/allocation.hpp" @@ -47,5 +46,3 @@ // Prefetch anticipating write; must not fault, semantically a no-op static void write(void* loc, intx interval); }; - -#endif // SHARE_VM_RUNTIME_PREFETCH_HPP diff --git a/src/hotspot/share/runtime/prefetch.inline.hpp b/src/hotspot/share/runtime/prefetch.inline.hpp --- a/src/hotspot/share/runtime/prefetch.inline.hpp +++ b/src/hotspot/share/runtime/prefetch.inline.hpp @@ -22,11 +22,8 @@ * */ -#ifndef SHARE_VM_RUNTIME_PREFETCH_INLINE_HPP -#define SHARE_VM_RUNTIME_PREFETCH_INLINE_HPP +#pragma once #include "runtime/prefetch.hpp" #include "utilities/macros.hpp" #include OS_CPU_HEADER_INLINE(prefetch) - -#endif // SHARE_VM_RUNTIME_PREFETCH_INLINE_HPP diff --git a/src/hotspot/share/runtime/reflection.hpp b/src/hotspot/share/runtime/reflection.hpp --- a/src/hotspot/share/runtime/reflection.hpp +++ b/src/hotspot/share/runtime/reflection.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_REFLECTION_HPP -#define SHARE_VM_RUNTIME_REFLECTION_HPP +#pragma once #include "oops/oop.hpp" #include "runtime/fieldDescriptor.hpp" @@ -130,5 +129,3 @@ static oop invoke_constructor(oop method_mirror, objArrayHandle args, TRAPS); }; - -#endif // SHARE_VM_RUNTIME_REFLECTION_HPP diff --git a/src/hotspot/share/runtime/reflectionUtils.hpp b/src/hotspot/share/runtime/reflectionUtils.hpp --- a/src/hotspot/share/runtime/reflectionUtils.hpp +++ b/src/hotspot/share/runtime/reflectionUtils.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_REFLECTIONUTILS_HPP -#define SHARE_VM_RUNTIME_REFLECTIONUTILS_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/instanceKlass.hpp" @@ -231,5 +230,3 @@ } } }; - -#endif // SHARE_VM_RUNTIME_REFLECTIONUTILS_HPP diff --git a/src/hotspot/share/runtime/registerMap.hpp b/src/hotspot/share/runtime/registerMap.hpp --- a/src/hotspot/share/runtime/registerMap.hpp +++ b/src/hotspot/share/runtime/registerMap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_REGISTERMAP_HPP -#define SHARE_VM_RUNTIME_REGISTERMAP_HPP +#pragma once #include "code/vmreg.hpp" #include "utilities/globalDefinitions.hpp" @@ -124,5 +123,3 @@ #include CPU_HEADER(registerMap) }; - -#endif // SHARE_VM_RUNTIME_REGISTERMAP_HPP diff --git a/src/hotspot/share/runtime/relocator.hpp b/src/hotspot/share/runtime/relocator.hpp --- a/src/hotspot/share/runtime/relocator.hpp +++ b/src/hotspot/share/runtime/relocator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_RELOCATOR_HPP -#define SHARE_VM_RUNTIME_RELOCATOR_HPP +#pragma once #include "interpreter/bytecodes.hpp" #include "oops/method.hpp" @@ -124,5 +123,3 @@ _listener->relocated(bci, delta, new_code_length); } }; - -#endif // SHARE_VM_RUNTIME_RELOCATOR_HPP diff --git a/src/hotspot/share/runtime/rframe.hpp b/src/hotspot/share/runtime/rframe.hpp --- a/src/hotspot/share/runtime/rframe.hpp +++ b/src/hotspot/share/runtime/rframe.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_RFRAME_HPP -#define SHARE_VM_RUNTIME_RFRAME_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/frame.hpp" @@ -121,5 +120,3 @@ public: void print(); }; - -#endif // SHARE_VM_RUNTIME_RFRAME_HPP diff --git a/src/hotspot/share/runtime/rtmLocking.hpp b/src/hotspot/share/runtime/rtmLocking.hpp --- a/src/hotspot/share/runtime/rtmLocking.hpp +++ b/src/hotspot/share/runtime/rtmLocking.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_RTMLOCKING_HPP -#define SHARE_VM_RUNTIME_RTMLOCKING_HPP +#pragma once // Generate RTM (Restricted Transactional Memory) locking code for all inflated // locks when "UseRTMLocking" option is on with normal locking mechanism as fall back @@ -109,5 +108,3 @@ void print_on(outputStream* st); void print() { print_on(tty); } }; - -#endif // SHARE_VM_RUNTIME_RTMLOCKING_HPP diff --git a/src/hotspot/share/runtime/safepoint.hpp b/src/hotspot/share/runtime/safepoint.hpp --- a/src/hotspot/share/runtime/safepoint.hpp +++ b/src/hotspot/share/runtime/safepoint.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_SAFEPOINT_HPP -#define SHARE_VM_RUNTIME_SAFEPOINT_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/mutexLocker.hpp" @@ -250,7 +249,3 @@ static void create(JavaThread *thread); static void destroy(JavaThread *thread); }; - - - -#endif // SHARE_VM_RUNTIME_SAFEPOINT_HPP diff --git a/src/hotspot/share/runtime/safepointMechanism.hpp b/src/hotspot/share/runtime/safepointMechanism.hpp --- a/src/hotspot/share/runtime/safepointMechanism.hpp +++ b/src/hotspot/share/runtime/safepointMechanism.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_SAFEPOINTMECHANISM_HPP -#define SHARE_VM_RUNTIME_SAFEPOINTMECHANISM_HPP +#pragma once #include "runtime/globals.hpp" #include "utilities/globalDefinitions.hpp" @@ -89,5 +88,3 @@ static void initialize(); static void initialize_header(JavaThread* thread); }; - -#endif // SHARE_VM_RUNTIME_SAFEPOINTMECHANISM_HPP diff --git a/src/hotspot/share/runtime/safepointMechanism.inline.hpp b/src/hotspot/share/runtime/safepointMechanism.inline.hpp --- a/src/hotspot/share/runtime/safepointMechanism.inline.hpp +++ b/src/hotspot/share/runtime/safepointMechanism.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_SAFEPOINTMECHANISM_INLINE_HPP -#define SHARE_VM_RUNTIME_SAFEPOINTMECHANISM_INLINE_HPP +#pragma once #include "runtime/safepointMechanism.hpp" #include "runtime/safepoint.hpp" @@ -94,5 +93,3 @@ void SafepointMechanism::disarm_local_poll_release(JavaThread* thread) { thread->set_polling_page_release(poll_disarmed_value()); } - -#endif // SHARE_VM_RUNTIME_SAFEPOINTMECHANISM_INLINE_HPP diff --git a/src/hotspot/share/runtime/safepointVerifiers.hpp b/src/hotspot/share/runtime/safepointVerifiers.hpp --- a/src/hotspot/share/runtime/safepointVerifiers.hpp +++ b/src/hotspot/share/runtime/safepointVerifiers.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_SAFEPOINTVERIFIERS_HPP -#define SHARE_VM_RUNTIME_SAFEPOINTVERIFIERS_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/thread.hpp" @@ -171,5 +170,3 @@ ~NoAllocVerifier() {} #endif }; - -#endif // SHARE_VM_RUNTIME_SAFEPOINTVERIFIERS_HPP diff --git a/src/hotspot/share/runtime/semaphore.hpp b/src/hotspot/share/runtime/semaphore.hpp --- a/src/hotspot/share/runtime/semaphore.hpp +++ b/src/hotspot/share/runtime/semaphore.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_SEMAPHORE_HPP -#define SHARE_VM_RUNTIME_SEMAPHORE_HPP +#pragma once #include "memory/allocation.hpp" @@ -59,5 +58,3 @@ void wait_with_safepoint_check(JavaThread* thread); }; - -#endif // SHARE_VM_RUNTIME_SEMAPHORE_HPP diff --git a/src/hotspot/share/runtime/semaphore.inline.hpp b/src/hotspot/share/runtime/semaphore.inline.hpp --- a/src/hotspot/share/runtime/semaphore.inline.hpp +++ b/src/hotspot/share/runtime/semaphore.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_SEMAPHORE_INLINE_HPP -#define SHARE_VM_RUNTIME_SEMAPHORE_INLINE_HPP +#pragma once #include "runtime/interfaceSupport.inline.hpp" #include "runtime/semaphore.hpp" @@ -37,5 +36,3 @@ // Wait for value _impl.wait(); } - -#endif // SHARE_VM_RUNTIME_SEMAPHORE_INLINE_HPP diff --git a/src/hotspot/share/runtime/serviceThread.hpp b/src/hotspot/share/runtime/serviceThread.hpp --- a/src/hotspot/share/runtime/serviceThread.hpp +++ b/src/hotspot/share/runtime/serviceThread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_SERVICETHREAD_HPP -#define SHARE_VM_RUNTIME_SERVICETHREAD_HPP +#pragma once #include "runtime/thread.hpp" @@ -47,5 +46,3 @@ // Returns true if the passed thread is the service thread. static bool is_service_thread(Thread* thread); }; - -#endif // SHARE_VM_RUNTIME_SERVICETHREAD_HPP diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp --- a/src/hotspot/share/runtime/sharedRuntime.hpp +++ b/src/hotspot/share/runtime/sharedRuntime.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_SHAREDRUNTIME_HPP -#define SHARE_VM_RUNTIME_SHAREDRUNTIME_HPP +#pragma once #include "interpreter/bytecodeHistogram.hpp" #include "interpreter/bytecodeTracer.hpp" @@ -724,5 +723,3 @@ #endif // PRODUCT }; - -#endif // SHARE_VM_RUNTIME_SHAREDRUNTIME_HPP diff --git a/src/hotspot/share/runtime/sharedRuntimeMath.hpp b/src/hotspot/share/runtime/sharedRuntimeMath.hpp --- a/src/hotspot/share/runtime/sharedRuntimeMath.hpp +++ b/src/hotspot/share/runtime/sharedRuntimeMath.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_SHAREDRUNTIMEMATH_HPP -#define SHARE_VM_RUNTIME_SHAREDRUNTIMEMATH_HPP +#pragma once #include @@ -126,5 +125,3 @@ set_high(&x, (hx&0x800fffff)|(k<<20)); return x*twom54; } - -#endif // SHARE_VM_RUNTIME_SHAREDRUNTIMEMATH_HPP diff --git a/src/hotspot/share/runtime/signature.hpp b/src/hotspot/share/runtime/signature.hpp --- a/src/hotspot/share/runtime/signature.hpp +++ b/src/hotspot/share/runtime/signature.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_SIGNATURE_HPP -#define SHARE_VM_RUNTIME_SIGNATURE_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/method.hpp" @@ -427,5 +426,3 @@ static ssize_t is_valid_type(const char*, ssize_t); static bool invalid_name_char(char); }; - -#endif // SHARE_VM_RUNTIME_SIGNATURE_HPP diff --git a/src/hotspot/share/runtime/stackValue.hpp b/src/hotspot/share/runtime/stackValue.hpp --- a/src/hotspot/share/runtime/stackValue.hpp +++ b/src/hotspot/share/runtime/stackValue.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_STACKVALUE_HPP -#define SHARE_VM_RUNTIME_STACKVALUE_HPP +#pragma once #include "code/location.hpp" #include "runtime/handles.hpp" @@ -116,5 +115,3 @@ void print_on(outputStream* st) const; #endif }; - -#endif // SHARE_VM_RUNTIME_STACKVALUE_HPP diff --git a/src/hotspot/share/runtime/stackValueCollection.hpp b/src/hotspot/share/runtime/stackValueCollection.hpp --- a/src/hotspot/share/runtime/stackValueCollection.hpp +++ b/src/hotspot/share/runtime/stackValueCollection.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_STACKVALUECOLLECTION_HPP -#define SHARE_VM_RUNTIME_STACKVALUECOLLECTION_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/stackValue.hpp" @@ -58,5 +57,3 @@ void print(); }; - -#endif // SHARE_VM_RUNTIME_STACKVALUECOLLECTION_HPP diff --git a/src/hotspot/share/runtime/statSampler.hpp b/src/hotspot/share/runtime/statSampler.hpp --- a/src/hotspot/share/runtime/statSampler.hpp +++ b/src/hotspot/share/runtime/statSampler.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_STATSAMPLER_HPP -#define SHARE_VM_RUNTIME_STATSAMPLER_HPP +#pragma once #include "runtime/perfData.hpp" #include "runtime/task.hpp" @@ -66,5 +65,3 @@ }; void statSampler_exit(); - -#endif // SHARE_VM_RUNTIME_STATSAMPLER_HPP diff --git a/src/hotspot/share/runtime/stubCodeGenerator.hpp b/src/hotspot/share/runtime/stubCodeGenerator.hpp --- a/src/hotspot/share/runtime/stubCodeGenerator.hpp +++ b/src/hotspot/share/runtime/stubCodeGenerator.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_STUBCODEGENERATOR_HPP -#define SHARE_VM_RUNTIME_STUBCODEGENERATOR_HPP +#pragma once #include "asm/assembler.hpp" #include "memory/allocation.hpp" @@ -127,5 +126,3 @@ ~StubCodeMark(); }; - -#endif // SHARE_VM_RUNTIME_STUBCODEGENERATOR_HPP diff --git a/src/hotspot/share/runtime/stubRoutines.hpp b/src/hotspot/share/runtime/stubRoutines.hpp --- a/src/hotspot/share/runtime/stubRoutines.hpp +++ b/src/hotspot/share/runtime/stubRoutines.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_STUBROUTINES_HPP -#define SHARE_VM_RUNTIME_STUBROUTINES_HPP +#pragma once #include "code/codeBlob.hpp" #include "memory/allocation.hpp" @@ -474,4 +473,3 @@ inline bool CanUseSafeFetchN() { return StubRoutines::SafeFetchN_stub() ? true : false; } -#endif // SHARE_VM_RUNTIME_STUBROUTINES_HPP diff --git a/src/hotspot/share/runtime/sweeper.hpp b/src/hotspot/share/runtime/sweeper.hpp --- a/src/hotspot/share/runtime/sweeper.hpp +++ b/src/hotspot/share/runtime/sweeper.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_SWEEPER_HPP -#define SHARE_VM_RUNTIME_SWEEPER_HPP +#pragma once class WhiteBox; @@ -127,5 +126,3 @@ static void print(outputStream* out); // Printing/debugging static void print() { print(tty); } }; - -#endif // SHARE_VM_RUNTIME_SWEEPER_HPP diff --git a/src/hotspot/share/runtime/synchronizer.hpp b/src/hotspot/share/runtime/synchronizer.hpp --- a/src/hotspot/share/runtime/synchronizer.hpp +++ b/src/hotspot/share/runtime/synchronizer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_SYNCHRONIZER_HPP -#define SHARE_VM_RUNTIME_SYNCHRONIZER_HPP +#pragma once #include "memory/padded.hpp" #include "oops/markOop.hpp" @@ -205,5 +204,3 @@ intptr_t complete_exit(TRAPS) { return ObjectSynchronizer::complete_exit(_obj, THREAD); } void reenter(intptr_t recursion, TRAPS) { ObjectSynchronizer::reenter(_obj, recursion, CHECK); } }; - -#endif // SHARE_VM_RUNTIME_SYNCHRONIZER_HPP diff --git a/src/hotspot/share/runtime/task.hpp b/src/hotspot/share/runtime/task.hpp --- a/src/hotspot/share/runtime/task.hpp +++ b/src/hotspot/share/runtime/task.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_TASK_HPP -#define SHARE_VM_RUNTIME_TASK_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/timer.hpp" @@ -106,5 +105,3 @@ // The task to perform at each period virtual void task() = 0; }; - -#endif // SHARE_VM_RUNTIME_TASK_HPP diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp --- a/src/hotspot/share/runtime/thread.hpp +++ b/src/hotspot/share/runtime/thread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_THREAD_HPP -#define SHARE_VM_RUNTIME_THREAD_HPP +#pragma once #include "jni.h" #include "code/compiledMethod.hpp" @@ -2327,6 +2326,3 @@ _thread = NULL; } }; - - -#endif // SHARE_VM_RUNTIME_THREAD_HPP diff --git a/src/hotspot/share/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp --- a/src/hotspot/share/runtime/thread.inline.hpp +++ b/src/hotspot/share/runtime/thread.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_THREAD_INLINE_HPP -#define SHARE_VM_RUNTIME_THREAD_INLINE_HPP +#pragma once #include "runtime/atomic.hpp" #include "runtime/globals.hpp" @@ -232,5 +231,3 @@ // use release-store so the setting of _terminated is seen more quickly OrderAccess::release_store((volatile jint *) &_terminated, (jint) _thread_terminated); } - -#endif // SHARE_VM_RUNTIME_THREAD_INLINE_HPP diff --git a/src/hotspot/share/runtime/threadCritical.hpp b/src/hotspot/share/runtime/threadCritical.hpp --- a/src/hotspot/share/runtime/threadCritical.hpp +++ b/src/hotspot/share/runtime/threadCritical.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_THREADCRITICAL_HPP -#define SHARE_VM_RUNTIME_THREADCRITICAL_HPP +#pragma once #include "memory/allocation.hpp" @@ -51,5 +50,3 @@ ThreadCritical(); ~ThreadCritical(); }; - -#endif // SHARE_VM_RUNTIME_THREADCRITICAL_HPP diff --git a/src/hotspot/share/runtime/threadHeapSampler.hpp b/src/hotspot/share/runtime/threadHeapSampler.hpp --- a/src/hotspot/share/runtime/threadHeapSampler.hpp +++ b/src/hotspot/share/runtime/threadHeapSampler.hpp @@ -23,8 +23,7 @@ * */ -#ifndef RUNTIME_THREADHEAPSAMPLER_HPP -#define RUNTIME_THREADHEAPSAMPLER_HPP +#pragma once #include "memory/allocation.hpp" @@ -65,5 +64,3 @@ static void set_sampling_interval(int sampling_interval); static int get_sampling_interval(); }; - -#endif // SHARE_RUNTIME_THREADHEAPSAMPLER_HPP diff --git a/src/hotspot/share/runtime/threadLocalStorage.hpp b/src/hotspot/share/runtime/threadLocalStorage.hpp --- a/src/hotspot/share/runtime/threadLocalStorage.hpp +++ b/src/hotspot/share/runtime/threadLocalStorage.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP -#define SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP +#pragma once #include "memory/allocation.hpp" @@ -46,5 +45,3 @@ static void init(); static bool is_initialized(); // can't use TLS prior to initialization }; - -#endif // SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP diff --git a/src/hotspot/share/runtime/threadSMR.hpp b/src/hotspot/share/runtime/threadSMR.hpp --- a/src/hotspot/share/runtime/threadSMR.hpp +++ b/src/hotspot/share/runtime/threadSMR.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_THREADSMR_HPP -#define SHARE_VM_RUNTIME_THREADSMR_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/timer.hpp" @@ -371,5 +370,3 @@ _index = 0; } }; - -#endif // SHARE_VM_RUNTIME_THREADSMR_HPP diff --git a/src/hotspot/share/runtime/threadSMR.inline.hpp b/src/hotspot/share/runtime/threadSMR.inline.hpp --- a/src/hotspot/share/runtime/threadSMR.inline.hpp +++ b/src/hotspot/share/runtime/threadSMR.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_THREADSMR_INLINE_HPP -#define SHARE_VM_RUNTIME_THREADSMR_INLINE_HPP +#pragma once #include "runtime/atomic.hpp" #include "runtime/prefetch.inline.hpp" @@ -91,5 +90,3 @@ ThreadsSMRSupport::add_tlh_times(millis); ThreadsSMRSupport::update_tlh_time_max(millis); } - -#endif // SHARE_VM_RUNTIME_THREADSMR_INLINE_HPP diff --git a/src/hotspot/share/runtime/threadStatisticalInfo.hpp b/src/hotspot/share/runtime/threadStatisticalInfo.hpp --- a/src/hotspot/share/runtime/threadStatisticalInfo.hpp +++ b/src/hotspot/share/runtime/threadStatisticalInfo.hpp @@ -23,8 +23,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_THREADSTATISTICS_HPP -#define SHARE_VM_RUNTIME_THREADSTATISTICS_HPP +#pragma once #include "jni.h" #include "runtime/os.hpp" @@ -44,5 +43,3 @@ void incr_define_class_count() { _define_class_count += 1; } uint64_t getElapsedTime() const { return os::javaTimeMillis() - getStartTime(); } }; - -#endif // SHARE_VM_RUNTIME_THREADSTATISTICS_HPP diff --git a/src/hotspot/share/runtime/tieredThresholdPolicy.hpp b/src/hotspot/share/runtime/tieredThresholdPolicy.hpp --- a/src/hotspot/share/runtime/tieredThresholdPolicy.hpp +++ b/src/hotspot/share/runtime/tieredThresholdPolicy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_TIEREDTHRESHOLDPOLICY_HPP -#define SHARE_VM_RUNTIME_TIEREDTHRESHOLDPOLICY_HPP +#pragma once #include "code/nmethod.hpp" #include "oops/methodData.hpp" @@ -273,5 +272,3 @@ }; #endif // TIERED - -#endif // SHARE_VM_RUNTIME_TIEREDTHRESHOLDPOLICY_HPP diff --git a/src/hotspot/share/runtime/timer.hpp b/src/hotspot/share/runtime/timer.hpp --- a/src/hotspot/share/runtime/timer.hpp +++ b/src/hotspot/share/runtime/timer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_TIMER_HPP -#define SHARE_VM_RUNTIME_TIMER_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -95,5 +94,3 @@ static double counter_to_millis(jlong counter); static jlong millis_to_counter(jlong millis); }; - -#endif // SHARE_VM_RUNTIME_TIMER_HPP diff --git a/src/hotspot/share/runtime/timerTrace.hpp b/src/hotspot/share/runtime/timerTrace.hpp --- a/src/hotspot/share/runtime/timerTrace.hpp +++ b/src/hotspot/share/runtime/timerTrace.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_TIMERTRACE_HPP -#define SHARE_VM_RUNTIME_TIMERTRACE_HPP +#pragma once #include "logging/log.hpp" #include "utilities/globalDefinitions.hpp" @@ -75,6 +74,3 @@ void suspend() { if (_active) _t.stop(); } void resume() { if (_active) _t.start(); } }; - - -#endif // SHARE_VM_RUNTIME_TIMERTRACE_HPP diff --git a/src/hotspot/share/runtime/unhandledOops.hpp b/src/hotspot/share/runtime/unhandledOops.hpp --- a/src/hotspot/share/runtime/unhandledOops.hpp +++ b/src/hotspot/share/runtime/unhandledOops.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_UNHANDLEDOOPS_HPP -#define SHARE_VM_RUNTIME_UNHANDLEDOOPS_HPP +#pragma once #ifdef CHECK_UNHANDLED_OOPS @@ -85,5 +84,3 @@ const intptr_t BAD_OOP_ADDR = 0xfffffff1; #endif // _LP64 #endif // CHECK_UNHANDLED_OOPS - -#endif // SHARE_VM_RUNTIME_UNHANDLEDOOPS_HPP diff --git a/src/hotspot/share/runtime/vframe.hpp b/src/hotspot/share/runtime/vframe.hpp --- a/src/hotspot/share/runtime/vframe.hpp +++ b/src/hotspot/share/runtime/vframe.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_VFRAME_HPP -#define SHARE_VM_RUNTIME_VFRAME_HPP +#pragma once #include "code/debugInfo.hpp" #include "code/debugInfoRec.hpp" @@ -353,5 +352,3 @@ // top_frame may not be at safepoint, start with sender vframeStream(JavaThread* thread, frame top_frame, bool stop_at_java_call_stub = false); }; - -#endif // SHARE_VM_RUNTIME_VFRAME_HPP diff --git a/src/hotspot/share/runtime/vframe.inline.hpp b/src/hotspot/share/runtime/vframe.inline.hpp --- a/src/hotspot/share/runtime/vframe.inline.hpp +++ b/src/hotspot/share/runtime/vframe.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_VFRAME_INLINE_HPP -#define SHARE_VM_RUNTIME_VFRAME_INLINE_HPP +#pragma once #include "runtime/frame.inline.hpp" #include "runtime/vframe.hpp" @@ -227,5 +226,3 @@ _method = method; _bci = bci; } - -#endif // SHARE_VM_RUNTIME_VFRAME_INLINE_HPP diff --git a/src/hotspot/share/runtime/vframeArray.hpp b/src/hotspot/share/runtime/vframeArray.hpp --- a/src/hotspot/share/runtime/vframeArray.hpp +++ b/src/hotspot/share/runtime/vframeArray.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_VFRAMEARRAY_HPP -#define SHARE_VM_RUNTIME_VFRAMEARRAY_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/arrayOop.hpp" @@ -227,5 +226,3 @@ #endif }; - -#endif // SHARE_VM_RUNTIME_VFRAMEARRAY_HPP diff --git a/src/hotspot/share/runtime/vframe_hp.hpp b/src/hotspot/share/runtime/vframe_hp.hpp --- a/src/hotspot/share/runtime/vframe_hp.hpp +++ b/src/hotspot/share/runtime/vframe_hp.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_VFRAME_HP_HPP -#define SHARE_VM_RUNTIME_VFRAME_HP_HPP +#pragma once #include "runtime/vframe.hpp" @@ -161,5 +160,3 @@ int _index; }; - -#endif // SHARE_VM_RUNTIME_VFRAME_HP_HPP diff --git a/src/hotspot/share/runtime/vmOperations.hpp b/src/hotspot/share/runtime/vmOperations.hpp --- a/src/hotspot/share/runtime/vmOperations.hpp +++ b/src/hotspot/share/runtime/vmOperations.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_VMOPERATIONS_HPP -#define SHARE_VM_RUNTIME_VMOPERATIONS_HPP +#pragma once #include "classfile/javaClasses.hpp" #include "memory/allocation.hpp" @@ -517,5 +516,3 @@ void doit(); }; #endif // INCLUDE_SERVICES - -#endif // SHARE_VM_RUNTIME_VMOPERATIONS_HPP diff --git a/src/hotspot/share/runtime/vmStructs.hpp b/src/hotspot/share/runtime/vmStructs.hpp --- a/src/hotspot/share/runtime/vmStructs.hpp +++ b/src/hotspot/share/runtime/vmStructs.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_VMSTRUCTS_HPP -#define SHARE_VM_RUNTIME_VMSTRUCTS_HPP +#pragma once #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -298,5 +297,3 @@ // This macro generates the sentinel value indicating the end of the list #define GENERATE_VM_ADDRESS_LAST_ENTRY() \ { NULL, NULL } - -#endif // SHARE_VM_RUNTIME_VMSTRUCTS_HPP diff --git a/src/hotspot/share/runtime/vmThread.hpp b/src/hotspot/share/runtime/vmThread.hpp --- a/src/hotspot/share/runtime/vmThread.hpp +++ b/src/hotspot/share/runtime/vmThread.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_VMTHREAD_HPP -#define SHARE_VM_RUNTIME_VMTHREAD_HPP +#pragma once #include "runtime/perfData.hpp" #include "runtime/thread.hpp" @@ -185,5 +184,3 @@ // Pointer to single-instance of VM thread static VMThread* _vm_thread; }; - -#endif // SHARE_VM_RUNTIME_VMTHREAD_HPP diff --git a/src/hotspot/share/runtime/vm_version.hpp b/src/hotspot/share/runtime/vm_version.hpp --- a/src/hotspot/share/runtime/vm_version.hpp +++ b/src/hotspot/share/runtime/vm_version.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_RUNTIME_VM_VERSION_HPP -#define SHARE_VM_RUNTIME_VM_VERSION_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/ostream.hpp" @@ -152,5 +151,3 @@ }; #include CPU_HEADER(vm_version) - -#endif // SHARE_VM_RUNTIME_VM_VERSION_HPP diff --git a/src/hotspot/share/services/allocationSite.hpp b/src/hotspot/share/services/allocationSite.hpp --- a/src/hotspot/share/services/allocationSite.hpp +++ b/src/hotspot/share/services/allocationSite.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_ALLOCATION_SITE_HPP -#define SHARE_VM_SERVICES_ALLOCATION_SITE_HPP +#pragma once #include "utilities/nativeCallStack.hpp" @@ -52,5 +51,3 @@ E* data() { return &e; } const E* peek() const { return &e; } }; - -#endif // SHARE_VM_SERVICES_ALLOCATION_SITE_HPP diff --git a/src/hotspot/share/services/attachListener.hpp b/src/hotspot/share/services/attachListener.hpp --- a/src/hotspot/share/services/attachListener.hpp +++ b/src/hotspot/share/services/attachListener.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_ATTACHLISTENER_HPP -#define SHARE_VM_SERVICES_ATTACHLISTENER_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -159,5 +158,3 @@ virtual void complete(jint result, bufferedStream* result_stream) = 0; }; #endif // INCLUDE_SERVICES - -#endif // SHARE_VM_SERVICES_ATTACHLISTENER_HPP diff --git a/src/hotspot/share/services/classLoadingService.hpp b/src/hotspot/share/services/classLoadingService.hpp --- a/src/hotspot/share/services/classLoadingService.hpp +++ b/src/hotspot/share/services/classLoadingService.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_CLASSLOADINGSERVICE_HPP -#define SHARE_VM_SERVICES_CLASSLOADINGSERVICE_HPP +#pragma once #include "logging/log.hpp" #include "runtime/handles.hpp" @@ -116,5 +115,3 @@ #endif // INCLUDE_MANAGEMENT } }; - -#endif // SHARE_VM_SERVICES_CLASSLOADINGSERVICE_HPP diff --git a/src/hotspot/share/services/diagnosticArgument.hpp b/src/hotspot/share/services/diagnosticArgument.hpp --- a/src/hotspot/share/services/diagnosticArgument.hpp +++ b/src/hotspot/share/services/diagnosticArgument.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_DIAGNOSTICARGUMENT_HPP -#define SHARE_VM_SERVICES_DIAGNOSTICARGUMENT_HPP +#pragma once #include "classfile/vmSymbols.hpp" #include "memory/allocation.hpp" @@ -133,5 +132,3 @@ void destroy_value(); void value_as_str(char *buf, size_t len) const { to_string(_value, buf, len);} }; - -#endif /* SHARE_VM_SERVICES_DIAGNOSTICARGUMENT_HPP */ diff --git a/src/hotspot/share/services/diagnosticCommand.hpp b/src/hotspot/share/services/diagnosticCommand.hpp --- a/src/hotspot/share/services/diagnosticCommand.hpp +++ b/src/hotspot/share/services/diagnosticCommand.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_DIAGNOSTICCOMMAND_HPP -#define SHARE_VM_SERVICES_DIAGNOSTICCOMMAND_HPP +#pragma once #include "classfile/stringTable.hpp" #include "classfile/symbolTable.hpp" @@ -887,5 +886,3 @@ virtual void execute(DCmdSource source, TRAPS); }; #endif // INCLUDE_JVMTI - -#endif // SHARE_VM_SERVICES_DIAGNOSTICCOMMAND_HPP diff --git a/src/hotspot/share/services/diagnosticFramework.hpp b/src/hotspot/share/services/diagnosticFramework.hpp --- a/src/hotspot/share/services/diagnosticFramework.hpp +++ b/src/hotspot/share/services/diagnosticFramework.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_DIAGNOSTICFRAMEWORK_HPP -#define SHARE_VM_SERVICES_DIAGNOSTICFRAMEWORK_HPP +#pragma once #include "classfile/vmSymbols.hpp" #include "memory/allocation.hpp" @@ -438,5 +437,3 @@ friend class Management; }; - -#endif // SHARE_VM_SERVICES_DIAGNOSTICFRAMEWORK_HPP diff --git a/src/hotspot/share/services/dtraceAttacher.hpp b/src/hotspot/share/services/dtraceAttacher.hpp --- a/src/hotspot/share/services/dtraceAttacher.hpp +++ b/src/hotspot/share/services/dtraceAttacher.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_DTRACEATTACHER_HPP -#define SHARE_VM_SERVICES_DTRACEATTACHER_HPP +#pragma once #define DTRACE_ALLOC_PROBES 0x1 #define DTRACE_METHOD_PROBES 0x2 @@ -47,5 +46,3 @@ // set DTraceMonitorProbes flag static void set_monitor_dprobes(bool value); }; - -#endif // SHARE_VM_SERVICES_DTRACEATTACHER_HPP diff --git a/src/hotspot/share/services/gcNotifier.hpp b/src/hotspot/share/services/gcNotifier.hpp --- a/src/hotspot/share/services/gcNotifier.hpp +++ b/src/hotspot/share/services/gcNotifier.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_GCNOTIFIER_HPP -#define SHARE_VM_SERVICES_GCNOTIFIER_HPP +#pragma once #include "memory/allocation.hpp" #include "services/memoryPool.hpp" @@ -66,5 +65,3 @@ static bool has_event(); static void sendNotification(TRAPS); }; - -#endif // SHARE_VM_SERVICES_GCNOTIFIER_HPP diff --git a/src/hotspot/share/services/heapDumper.hpp b/src/hotspot/share/services/heapDumper.hpp --- a/src/hotspot/share/services/heapDumper.hpp +++ b/src/hotspot/share/services/heapDumper.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_HEAPDUMPER_HPP -#define SHARE_VM_SERVICES_HEAPDUMPER_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oop.hpp" @@ -80,5 +79,3 @@ static void dump_heap_from_oome() NOT_SERVICES_RETURN; }; - -#endif // SHARE_VM_SERVICES_HEAPDUMPER_HPP diff --git a/src/hotspot/share/services/lowMemoryDetector.hpp b/src/hotspot/share/services/lowMemoryDetector.hpp --- a/src/hotspot/share/services/lowMemoryDetector.hpp +++ b/src/hotspot/share/services/lowMemoryDetector.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_LOWMEMORYDETECTOR_HPP -#define SHARE_VM_SERVICES_LOWMEMORYDETECTOR_HPP +#pragma once #include "memory/allocation.hpp" #include "services/memoryPool.hpp" @@ -289,5 +288,3 @@ LowMemoryDetector::enable(); } }; - -#endif // SHARE_VM_SERVICES_LOWMEMORYDETECTOR_HPP diff --git a/src/hotspot/share/services/mallocSiteTable.hpp b/src/hotspot/share/services/mallocSiteTable.hpp --- a/src/hotspot/share/services/mallocSiteTable.hpp +++ b/src/hotspot/share/services/mallocSiteTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_MALLOC_SITE_TABLE_HPP -#define SHARE_VM_SERVICES_MALLOC_SITE_TABLE_HPP +#pragma once #if INCLUDE_NMT @@ -271,4 +270,3 @@ }; #endif // INCLUDE_NMT -#endif // SHARE_VM_SERVICES_MALLOC_SITE_TABLE_HPP diff --git a/src/hotspot/share/services/mallocTracker.hpp b/src/hotspot/share/services/mallocTracker.hpp --- a/src/hotspot/share/services/mallocTracker.hpp +++ b/src/hotspot/share/services/mallocTracker.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_MALLOC_TRACKER_HPP -#define SHARE_VM_SERVICES_MALLOC_TRACKER_HPP +#pragma once #if INCLUDE_NMT @@ -373,6 +372,3 @@ }; #endif // INCLUDE_NMT - - -#endif //SHARE_VM_SERVICES_MALLOC_TRACKER_HPP diff --git a/src/hotspot/share/services/mallocTracker.inline.hpp b/src/hotspot/share/services/mallocTracker.inline.hpp --- a/src/hotspot/share/services/mallocTracker.inline.hpp +++ b/src/hotspot/share/services/mallocTracker.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_MALLOC_TRACKER_INLINE_HPP -#define SHARE_VM_SERVICES_MALLOC_TRACKER_INLINE_HPP +#pragma once #include "services/mallocTracker.hpp" #include "services/memTracker.hpp" @@ -31,6 +30,3 @@ inline void* MallocTracker::get_base(void* memblock){ return get_base(memblock, MemTracker::tracking_level()); } - -#endif // SHARE_VM_SERVICES_MALLOC_TRACKER_INLINE_HPP - diff --git a/src/hotspot/share/services/management.hpp b/src/hotspot/share/services/management.hpp --- a/src/hotspot/share/services/management.hpp +++ b/src/hotspot/share/services/management.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_MANAGEMENT_HPP -#define SHARE_VM_SERVICES_MANAGEMENT_HPP +#pragma once #include "jmm.h" #include "memory/allocation.hpp" @@ -133,5 +132,3 @@ { Management::record_vm_startup_time(_begin_time, _timer.milliseconds()); } }; - -#endif // SHARE_VM_SERVICES_MANAGEMENT_HPP diff --git a/src/hotspot/share/services/memBaseline.hpp b/src/hotspot/share/services/memBaseline.hpp --- a/src/hotspot/share/services/memBaseline.hpp +++ b/src/hotspot/share/services/memBaseline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_MEM_BASELINE_HPP -#define SHARE_VM_SERVICES_MEM_BASELINE_HPP +#pragma once #if INCLUDE_NMT @@ -215,5 +214,3 @@ }; #endif // INCLUDE_NMT - -#endif // SHARE_VM_SERVICES_MEM_BASELINE_HPP diff --git a/src/hotspot/share/services/memReporter.hpp b/src/hotspot/share/services/memReporter.hpp --- a/src/hotspot/share/services/memReporter.hpp +++ b/src/hotspot/share/services/memReporter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_MEM_REPORTER_HPP -#define SHARE_VM_SERVICES_MEM_REPORTER_HPP +#pragma once #if INCLUDE_NMT @@ -234,6 +233,3 @@ }; #endif // INCLUDE_NMT - -#endif - diff --git a/src/hotspot/share/services/memTracker.hpp b/src/hotspot/share/services/memTracker.hpp --- a/src/hotspot/share/services/memTracker.hpp +++ b/src/hotspot/share/services/memTracker.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_MEM_TRACKER_HPP -#define SHARE_VM_SERVICES_MEM_TRACKER_HPP +#pragma once #include "services/nmtCommon.hpp" #include "utilities/nativeCallStack.hpp" @@ -320,5 +319,3 @@ }; #endif // INCLUDE_NMT - -#endif // SHARE_VM_SERVICES_MEM_TRACKER_HPP diff --git a/src/hotspot/share/services/memoryManager.hpp b/src/hotspot/share/services/memoryManager.hpp --- a/src/hotspot/share/services/memoryManager.hpp +++ b/src/hotspot/share/services/memoryManager.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_MEMORYMANAGER_HPP -#define SHARE_VM_SERVICES_MEMORYMANAGER_HPP +#pragma once #include "gc/shared/gcCause.hpp" #include "memory/allocation.hpp" @@ -181,5 +180,3 @@ void set_notification_enabled(bool enabled) { _notification_enabled = enabled; } bool is_notification_enabled() { return _notification_enabled; } }; - -#endif // SHARE_VM_SERVICES_MEMORYMANAGER_HPP diff --git a/src/hotspot/share/services/memoryPool.hpp b/src/hotspot/share/services/memoryPool.hpp --- a/src/hotspot/share/services/memoryPool.hpp +++ b/src/hotspot/share/services/memoryPool.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_MEMORYPOOL_HPP -#define SHARE_VM_SERVICES_MEMORYPOOL_HPP +#pragma once #include "memory/heap.hpp" #include "oops/oop.hpp" @@ -171,5 +170,3 @@ MemoryUsage get_memory_usage(); size_t used_in_bytes(); }; - -#endif // SHARE_VM_SERVICES_MEMORYPOOL_HPP diff --git a/src/hotspot/share/services/memoryService.hpp b/src/hotspot/share/services/memoryService.hpp --- a/src/hotspot/share/services/memoryService.hpp +++ b/src/hotspot/share/services/memoryService.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_MEMORYSERVICE_HPP -#define SHARE_VM_SERVICES_MEMORYSERVICE_HPP +#pragma once #include "gc/shared/gcCause.hpp" #include "logging/log.hpp" @@ -152,5 +151,3 @@ ~TraceMemoryManagerStats(); }; - -#endif // SHARE_VM_SERVICES_MEMORYSERVICE_HPP diff --git a/src/hotspot/share/services/memoryUsage.hpp b/src/hotspot/share/services/memoryUsage.hpp --- a/src/hotspot/share/services/memoryUsage.hpp +++ b/src/hotspot/share/services/memoryUsage.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_MEMORYUSAGE_HPP -#define SHARE_VM_SERVICES_MEMORYUSAGE_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -82,5 +81,3 @@ jlong committed_as_jlong() const { return convert_to_jlong(_committed); } jlong max_size_as_jlong() const { return convert_to_jlong(_maxSize); } }; - -#endif // SHARE_VM_SERVICES_MEMORYUSAGE_HPP diff --git a/src/hotspot/share/services/nmtCommon.hpp b/src/hotspot/share/services/nmtCommon.hpp --- a/src/hotspot/share/services/nmtCommon.hpp +++ b/src/hotspot/share/services/nmtCommon.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_NMT_COMMON_HPP -#define SHARE_VM_SERVICES_NMT_COMMON_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/align.hpp" @@ -76,6 +75,3 @@ private: static const char* _memory_type_names[mt_number_of_types]; }; - - -#endif diff --git a/src/hotspot/share/services/nmtDCmd.hpp b/src/hotspot/share/services/nmtDCmd.hpp --- a/src/hotspot/share/services/nmtDCmd.hpp +++ b/src/hotspot/share/services/nmtDCmd.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_NMT_DCMD_HPP -#define SHARE_VM_SERVICES_NMT_DCMD_HPP +#pragma once #if INCLUDE_NMT @@ -74,5 +73,3 @@ }; #endif // INCLUDE_NMT - -#endif // SHARE_VM_SERVICES_NMT_DCMD_HPP diff --git a/src/hotspot/share/services/runtimeService.hpp b/src/hotspot/share/services/runtimeService.hpp --- a/src/hotspot/share/services/runtimeService.hpp +++ b/src/hotspot/share/services/runtimeService.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_RUNTIMESERVICE_HPP -#define SHARE_VM_SERVICES_RUNTIMESERVICE_HPP +#pragma once #include "runtime/perfData.hpp" #include "runtime/timer.hpp" @@ -57,5 +56,3 @@ static void record_application_start() NOT_MANAGEMENT_RETURN; }; - -#endif // SHARE_VM_SERVICES_RUNTIMESERVICE_HPP diff --git a/src/hotspot/share/services/threadService.hpp b/src/hotspot/share/services/threadService.hpp --- a/src/hotspot/share/services/threadService.hpp +++ b/src/hotspot/share/services/threadService.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_THREADSERVICE_HPP -#define SHARE_VM_SERVICES_THREADSERVICE_HPP +#pragma once #include "classfile/javaClasses.hpp" #include "runtime/handles.hpp" @@ -609,5 +608,3 @@ } } }; - -#endif // SHARE_VM_SERVICES_THREADSERVICE_HPP diff --git a/src/hotspot/share/services/virtualMemoryTracker.hpp b/src/hotspot/share/services/virtualMemoryTracker.hpp --- a/src/hotspot/share/services/virtualMemoryTracker.hpp +++ b/src/hotspot/share/services/virtualMemoryTracker.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_VIRTUAL_MEMORY_TRACKER_HPP -#define SHARE_VM_SERVICES_VIRTUAL_MEMORY_TRACKER_HPP +#pragma once #if INCLUDE_NMT @@ -444,5 +443,3 @@ }; #endif // INCLUDE_NMT - -#endif // SHARE_VM_SERVICES_VIRTUAL_MEMORY_TRACKER_HPP diff --git a/src/hotspot/share/services/writeableFlags.hpp b/src/hotspot/share/services/writeableFlags.hpp --- a/src/hotspot/share/services/writeableFlags.hpp +++ b/src/hotspot/share/services/writeableFlags.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_SERVICES_WRITEABLEFLAG_HPP -#define SHARE_VM_SERVICES_WRITEABLEFLAG_HPP +#pragma once #include "runtime/flags/jvmFlag.hpp" #include "runtime/globals.hpp" @@ -88,5 +87,3 @@ */ static JVMFlag::Error set_flag(const char* flag_name, jvalue flag_value, JVMFlag::Flags origin, FormatBuffer<80>& err_msg); }; - -#endif /* SHARE_VM_SERVICES_WRITEABLEFLAG_HPP */ diff --git a/src/hotspot/share/utilities/accessFlags.hpp b/src/hotspot/share/utilities/accessFlags.hpp --- a/src/hotspot/share/utilities/accessFlags.hpp +++ b/src/hotspot/share/utilities/accessFlags.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_ACCESSFLAGS_HPP -#define SHARE_VM_UTILITIES_ACCESSFLAGS_HPP +#pragma once #include "jvm.h" #include "utilities/debug.hpp" @@ -281,5 +280,3 @@ af._flags = flags; return af; } - -#endif // SHARE_VM_UTILITIES_ACCESSFLAGS_HPP diff --git a/src/hotspot/share/utilities/align.hpp b/src/hotspot/share/utilities/align.hpp --- a/src/hotspot/share/utilities/align.hpp +++ b/src/hotspot/share/utilities/align.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_ALIGN_HPP -#define SHARE_VM_UTILITIES_ALIGN_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -148,5 +147,3 @@ return align_down(page_address, page_size); } } - -#endif // SHARE_VM_UTILITIES_ALIGN_HPP diff --git a/src/hotspot/share/utilities/bitMap.hpp b/src/hotspot/share/utilities/bitMap.hpp --- a/src/hotspot/share/utilities/bitMap.hpp +++ b/src/hotspot/share/utilities/bitMap.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_BITMAP_HPP -#define SHARE_VM_UTILITIES_BITMAP_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/align.hpp" @@ -451,5 +450,3 @@ // return of false indicates that the bitmap iteration should terminate. virtual bool do_bit(BitMap::idx_t offset) = 0; }; - -#endif // SHARE_VM_UTILITIES_BITMAP_HPP diff --git a/src/hotspot/share/utilities/bitMap.inline.hpp b/src/hotspot/share/utilities/bitMap.inline.hpp --- a/src/hotspot/share/utilities/bitMap.inline.hpp +++ b/src/hotspot/share/utilities/bitMap.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_BITMAP_INLINE_HPP -#define SHARE_VM_UTILITIES_BITMAP_INLINE_HPP +#pragma once #include "runtime/atomic.hpp" #include "utilities/bitMap.hpp" @@ -286,5 +285,3 @@ } _map.at_put(bit, value); } - -#endif // SHARE_VM_UTILITIES_BITMAP_INLINE_HPP diff --git a/src/hotspot/share/utilities/breakpoint.hpp b/src/hotspot/share/utilities/breakpoint.hpp --- a/src/hotspot/share/utilities/breakpoint.hpp +++ b/src/hotspot/share/utilities/breakpoint.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_BREAKPOINT_HPP -#define SHARE_VM_UTILITIES_BREAKPOINT_HPP +#pragma once // Provide BREAKPOINT macro for requesting stop in the debugger. @@ -42,5 +41,3 @@ extern "C" void breakpoint(); #define BREAKPOINT ::breakpoint() #endif - -#endif // SHARE_VM_UTILITIES_BREAKPOINT_HPP diff --git a/src/hotspot/share/utilities/bytes.hpp b/src/hotspot/share/utilities/bytes.hpp --- a/src/hotspot/share/utilities/bytes.hpp +++ b/src/hotspot/share/utilities/bytes.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_BYTES_HPP -#define SHARE_VM_UTILITIES_BYTES_HPP +#pragma once #include "utilities/macros.hpp" @@ -49,5 +48,3 @@ }; #include CPU_HEADER(bytes) - -#endif // SHARE_VM_UTILITIES_BYTES_HPP diff --git a/src/hotspot/share/utilities/chunkedList.hpp b/src/hotspot/share/utilities/chunkedList.hpp --- a/src/hotspot/share/utilities/chunkedList.hpp +++ b/src/hotspot/share/utilities/chunkedList.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_CHUNKED_LIST_HPP -#define SHARE_VM_UTILITIES_CHUNKED_LIST_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/debug.hpp" @@ -77,5 +76,3 @@ return _values[i]; } }; - -#endif // SHARE_VM_UTILITIES_CHUNKED_LIST_HPP diff --git a/src/hotspot/share/utilities/compilerWarnings.hpp b/src/hotspot/share/utilities/compilerWarnings.hpp --- a/src/hotspot/share/utilities/compilerWarnings.hpp +++ b/src/hotspot/share/utilities/compilerWarnings.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_COMPILERWARNINGS_HPP -#define SHARE_VM_UTILITIES_COMPILERWARNINGS_HPP +#pragma once // Macros related to control of compiler warnings. @@ -83,5 +82,3 @@ #ifndef PRAGMA_DIAG_POP #define PRAGMA_DIAG_POP #endif - -#endif // SHARE_VM_UTILITIES_COMPILERWARNINGS_HPP diff --git a/src/hotspot/share/utilities/concurrentHashTable.hpp b/src/hotspot/share/utilities/concurrentHashTable.hpp --- a/src/hotspot/share/utilities/concurrentHashTable.hpp +++ b/src/hotspot/share/utilities/concurrentHashTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_UTILITIES_CONCURRENT_HASH_TABLE_HPP -#define SHARE_UTILITIES_CONCURRENT_HASH_TABLE_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalCounter.hpp" @@ -540,5 +539,3 @@ class BulkDeleteTask; class GrowTask; }; - -#endif // include guard diff --git a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp --- a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp +++ b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_UTILITIES_CONCURRENT_HASH_TABLE_INLINE_HPP -#define SHARE_UTILITIES_CONCURRENT_HASH_TABLE_INLINE_HPP +#pragma once #include "memory/allocation.inline.hpp" #include "runtime/atomic.hpp" @@ -1350,5 +1349,3 @@ unlock_resize_lock(thread); return true; } - -#endif // include guard diff --git a/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp b/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp --- a/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp +++ b/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_UTILITIES_CONCURRENT_HASH_TABLE_TASKS_INLINE_HPP -#define SHARE_UTILITIES_CONCURRENT_HASH_TABLE_TASKS_INLINE_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/concurrentHashTable.inline.hpp" @@ -198,5 +197,3 @@ this->thread_do_not_own_resize_lock(thread); } }; - -#endif // include guard diff --git a/src/hotspot/share/utilities/constantTag.hpp b/src/hotspot/share/utilities/constantTag.hpp --- a/src/hotspot/share/utilities/constantTag.hpp +++ b/src/hotspot/share/utilities/constantTag.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_CONSTANTTAG_HPP -#define SHARE_VM_UTILITIES_CONSTANTTAG_HPP +#pragma once #include "jvm.h" #include "utilities/globalDefinitions.hpp" @@ -140,5 +139,3 @@ void print_on(outputStream* st) const PRODUCT_RETURN; }; - -#endif // SHARE_VM_UTILITIES_CONSTANTTAG_HPP diff --git a/src/hotspot/share/utilities/copy.hpp b/src/hotspot/share/utilities/copy.hpp --- a/src/hotspot/share/utilities/copy.hpp +++ b/src/hotspot/share/utilities/copy.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_COPY_HPP -#define SHARE_VM_UTILITIES_COPY_HPP +#pragma once #include "runtime/stubRoutines.hpp" #include "utilities/align.hpp" @@ -345,5 +344,3 @@ #include CPU_HEADER(copy) }; - -#endif // SHARE_VM_UTILITIES_COPY_HPP diff --git a/src/hotspot/share/utilities/count_trailing_zeros.hpp b/src/hotspot/share/utilities/count_trailing_zeros.hpp --- a/src/hotspot/share/utilities/count_trailing_zeros.hpp +++ b/src/hotspot/share/utilities/count_trailing_zeros.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_COUNTTRAILINGZEROS_HPP -#define SHARE_VM_UTILITIES_COUNTTRAILINGZEROS_HPP +#pragma once #include "utilities/debug.hpp" #include "utilities/globalDefinitions.hpp" @@ -104,5 +103,3 @@ #error Unknown TARGET_COMPILER #endif // Toolchain dispatch - -#endif // include guard diff --git a/src/hotspot/share/utilities/debug.hpp b/src/hotspot/share/utilities/debug.hpp --- a/src/hotspot/share/utilities/debug.hpp +++ b/src/hotspot/share/utilities/debug.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_DEBUG_HPP -#define SHARE_VM_UTILITIES_DEBUG_HPP +#pragma once #include "utilities/breakpoint.hpp" #include "utilities/compilerWarnings.hpp" @@ -204,5 +203,3 @@ // out of memory reporting void report_java_out_of_memory(const char* message); - -#endif // SHARE_VM_UTILITIES_DEBUG_HPP diff --git a/src/hotspot/share/utilities/decoder.hpp b/src/hotspot/share/utilities/decoder.hpp --- a/src/hotspot/share/utilities/decoder.hpp +++ b/src/hotspot/share/utilities/decoder.hpp @@ -23,8 +23,7 @@ */ -#ifndef SHARE_VM_UTILITIES_DECODER_HPP -#define SHARE_VM_UTILITIES_DECODER_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/mutex.hpp" @@ -145,5 +144,3 @@ return _decoder; } }; - -#endif // SHARE_VM_UTILITIES_DECODER_HPP diff --git a/src/hotspot/share/utilities/decoder_elf.hpp b/src/hotspot/share/utilities/decoder_elf.hpp --- a/src/hotspot/share/utilities/decoder_elf.hpp +++ b/src/hotspot/share/utilities/decoder_elf.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_DECODER_ELF_HPP -#define SHARE_VM_UTILITIES_DECODER_ELF_HPP +#pragma once #if !defined(_WINDOWS) && !defined(__APPLE__) @@ -54,4 +53,3 @@ }; #endif // !_WINDOWS && !__APPLE__ -#endif // SHARE_VM_UTILITIES_DECODER_ELF_HPP diff --git a/src/hotspot/share/utilities/defaultStream.hpp b/src/hotspot/share/utilities/defaultStream.hpp --- a/src/hotspot/share/utilities/defaultStream.hpp +++ b/src/hotspot/share/utilities/defaultStream.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_DEFAULTSTREAM_HPP -#define SHARE_VM_UTILITIES_DEFAULTSTREAM_HPP +#pragma once #include "utilities/xmlstream.hpp" @@ -95,5 +94,3 @@ static defaultStream* instance; // sole instance }; - -#endif // SHARE_VM_UTILITIES_DEFAULTSTREAM_HPP diff --git a/src/hotspot/share/utilities/dtrace.hpp b/src/hotspot/share/utilities/dtrace.hpp --- a/src/hotspot/share/utilities/dtrace.hpp +++ b/src/hotspot/share/utilities/dtrace.hpp @@ -23,8 +23,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_DTRACE_HPP -#define SHARE_VM_UTILITIES_DTRACE_HPP +#pragma once #if defined(DTRACE_ENABLED) @@ -60,5 +59,3 @@ #include "dtrace_disabled.hpp" #endif /* defined(DTRACE_ENABLED) */ - -#endif // SHARE_VM_UTILITIES_DTRACE_HPP diff --git a/src/hotspot/share/utilities/dtrace_disabled.hpp b/src/hotspot/share/utilities/dtrace_disabled.hpp --- a/src/hotspot/share/utilities/dtrace_disabled.hpp +++ b/src/hotspot/share/utilities/dtrace_disabled.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_DTRACE_USDT2_DISABLED_HPP -#define SHARE_VM_UTILITIES_DTRACE_USDT2_DISABLED_HPP +#pragma once /* This file contains dummy provider probes needed when compiling a hotspot * that does not support dtrace probes. This could be because we're building @@ -1093,5 +1092,3 @@ #else /* !defined(DTRACE_ENABLED) */ #error This file should only be included when dtrace is not enabled #endif /* !defined(DTRACE_ENABLED) */ - -#endif // SHARE_VM_UTILITIES_DTRACE_USDT2_DISABLED_HPP diff --git a/src/hotspot/share/utilities/elfFile.hpp b/src/hotspot/share/utilities/elfFile.hpp --- a/src/hotspot/share/utilities/elfFile.hpp +++ b/src/hotspot/share/utilities/elfFile.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_ELF_FILE_HPP -#define SHARE_VM_UTILITIES_ELF_FILE_HPP +#pragma once #if !defined(_WINDOWS) && !defined(__APPLE__) && !defined(_AIX) @@ -213,5 +212,3 @@ }; #endif // !_WINDOWS && !__APPLE__ - -#endif // SHARE_VM_UTILITIES_ELF_FILE_HPP diff --git a/src/hotspot/share/utilities/elfFuncDescTable.hpp b/src/hotspot/share/utilities/elfFuncDescTable.hpp --- a/src/hotspot/share/utilities/elfFuncDescTable.hpp +++ b/src/hotspot/share/utilities/elfFuncDescTable.hpp @@ -23,8 +23,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_ELF_FUNC_DESC_TABLE_HPP -#define SHARE_VM_UTILITIES_ELF_FUNC_DESC_TABLE_HPP +#pragma once #if !defined(_WINDOWS) && !defined(__APPLE__) @@ -144,5 +143,3 @@ }; #endif // !_WINDOWS && !__APPLE__ - -#endif // SHARE_VM_UTILITIES_ELF_FUNC_DESC_TABLE_HPP diff --git a/src/hotspot/share/utilities/elfStringTable.hpp b/src/hotspot/share/utilities/elfStringTable.hpp --- a/src/hotspot/share/utilities/elfStringTable.hpp +++ b/src/hotspot/share/utilities/elfStringTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_ELF_STRING_TABLE_HPP -#define SHARE_VM_UTILITIES_ELF_STRING_TABLE_HPP +#pragma once #if !defined(_WINDOWS) && !defined(__APPLE__) @@ -70,5 +69,3 @@ }; #endif // !_WINDOWS && !__APPLE__ - -#endif // SHARE_VM_UTILITIES_ELF_STRING_TABLE_HPP diff --git a/src/hotspot/share/utilities/elfSymbolTable.hpp b/src/hotspot/share/utilities/elfSymbolTable.hpp --- a/src/hotspot/share/utilities/elfSymbolTable.hpp +++ b/src/hotspot/share/utilities/elfSymbolTable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_ELF_SYMBOL_TABLE_HPP -#define SHARE_VM_UTILITIES_ELF_SYMBOL_TABLE_HPP +#pragma once #if !defined(_WINDOWS) && !defined(__APPLE__) @@ -66,5 +65,3 @@ }; #endif // !_WINDOWS and !__APPLE__ - -#endif // SHARE_VM_UTILITIES_ELF_SYMBOL_TABLE_HPP diff --git a/src/hotspot/share/utilities/events.hpp b/src/hotspot/share/utilities/events.hpp --- a/src/hotspot/share/utilities/events.hpp +++ b/src/hotspot/share/utilities/events.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_EVENTS_HPP -#define SHARE_VM_UTILITIES_EVENTS_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/mutexLocker.hpp" @@ -300,5 +299,3 @@ // log an end event ~EventMark(); }; - -#endif // SHARE_VM_UTILITIES_EVENTS_HPP diff --git a/src/hotspot/share/utilities/exceptions.hpp b/src/hotspot/share/utilities/exceptions.hpp --- a/src/hotspot/share/utilities/exceptions.hpp +++ b/src/hotspot/share/utilities/exceptions.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_EXCEPTIONS_HPP -#define SHARE_VM_UTILITIES_EXCEPTIONS_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oopsHierarchy.hpp" @@ -332,5 +331,3 @@ // exceptions. #define EXCEPTION_MARK Thread* THREAD = NULL; ExceptionMark __em(THREAD); - -#endif // SHARE_VM_UTILITIES_EXCEPTIONS_HPP diff --git a/src/hotspot/share/utilities/fakeRttiSupport.hpp b/src/hotspot/share/utilities/fakeRttiSupport.hpp --- a/src/hotspot/share/utilities/fakeRttiSupport.hpp +++ b/src/hotspot/share/utilities/fakeRttiSupport.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_FAKERTTISUPPORT_HPP -#define SHARE_VM_UTILITIES_FAKERTTISUPPORT_HPP +#pragma once #include "utilities/globalDefinitions.hpp" #include "utilities/debug.hpp" @@ -97,5 +96,3 @@ return tag; } }; - -#endif // include guard diff --git a/src/hotspot/share/utilities/formatBuffer.hpp b/src/hotspot/share/utilities/formatBuffer.hpp --- a/src/hotspot/share/utilities/formatBuffer.hpp +++ b/src/hotspot/share/utilities/formatBuffer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_FORMATBUFFER_HPP -#define SHARE_VM_UTILITIES_FORMATBUFFER_HPP +#pragma once #include "jvm.h" #include "utilities/globalDefinitions.hpp" @@ -115,5 +114,3 @@ // Used to format messages. typedef FormatBuffer<> err_msg; - -#endif // SHARE_VM_UTILITIES_FORMATBUFFER_HPP diff --git a/src/hotspot/share/utilities/globalCounter.hpp b/src/hotspot/share/utilities/globalCounter.hpp --- a/src/hotspot/share/utilities/globalCounter.hpp +++ b/src/hotspot/share/utilities/globalCounter.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_UTILITIES_GLOBAL_COUNTER_HPP -#define SHARE_UTILITIES_GLOBAL_COUNTER_HPP +#pragma once #include "memory/allocation.hpp" #include "memory/padded.hpp" @@ -85,5 +84,3 @@ // A scoped object for a read-side critical-section. class CriticalSection; }; - -#endif // include guard diff --git a/src/hotspot/share/utilities/globalCounter.inline.hpp b/src/hotspot/share/utilities/globalCounter.inline.hpp --- a/src/hotspot/share/utilities/globalCounter.inline.hpp +++ b/src/hotspot/share/utilities/globalCounter.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_UTILITIES_GLOBAL_COUNTER_INLINE_HPP -#define SHARE_UTILITIES_GLOBAL_COUNTER_INLINE_HPP +#pragma once #include "runtime/atomic.hpp" #include "runtime/orderAccess.hpp" @@ -67,5 +66,3 @@ GlobalCounter::critical_section_end(_thread, _context); } }; - -#endif // include guard diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp --- a/src/hotspot/share/utilities/globalDefinitions.hpp +++ b/src/hotspot/share/utilities/globalDefinitions.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP -#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP +#pragma once #include "utilities/compilerWarnings.hpp" #include "utilities/debug.hpp" @@ -1094,6 +1093,3 @@ template bool primitive_equals(const K& k0, const K& k1) { return k0 == k1; } - - -#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP diff --git a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp --- a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp +++ b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_GCC_HPP -#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_GCC_HPP +#pragma once #include "jni.h" @@ -270,5 +269,3 @@ // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53017 // #define ATTRIBUTE_ALIGNED(x) __attribute__((aligned(x+0))) - -#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_GCC_HPP diff --git a/src/hotspot/share/utilities/globalDefinitions_solstudio.hpp b/src/hotspot/share/utilities/globalDefinitions_solstudio.hpp --- a/src/hotspot/share/utilities/globalDefinitions_solstudio.hpp +++ b/src/hotspot/share/utilities/globalDefinitions_solstudio.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SOLSTUDIO_HPP -#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SOLSTUDIO_HPP +#pragma once #include "jni.h" @@ -255,5 +254,3 @@ // Alignment #define ATTRIBUTE_ALIGNED(x) __attribute__((aligned(x))) - -#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SOLSTUDIO_HPP diff --git a/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp --- a/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp +++ b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_VISCPP_HPP -#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_VISCPP_HPP +#pragma once #include "jni.h" @@ -166,5 +165,3 @@ // Alignment #define ATTRIBUTE_ALIGNED(x) __declspec(align(x)) - -#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_VISCPP_HPP diff --git a/src/hotspot/share/utilities/globalDefinitions_xlc.hpp b/src/hotspot/share/utilities/globalDefinitions_xlc.hpp --- a/src/hotspot/share/utilities/globalDefinitions_xlc.hpp +++ b/src/hotspot/share/utilities/globalDefinitions_xlc.hpp @@ -23,8 +23,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_XLC_HPP -#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_XLC_HPP +#pragma once #include "jni.h" @@ -161,5 +160,3 @@ #define NOINLINE __attribute__((__noinline__)) #define ALWAYSINLINE inline __attribute__((__always_inline__)) - -#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_XLC_HPP diff --git a/src/hotspot/share/utilities/growableArray.hpp b/src/hotspot/share/utilities/growableArray.hpp --- a/src/hotspot/share/utilities/growableArray.hpp +++ b/src/hotspot/share/utilities/growableArray.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_GROWABLEARRAY_HPP -#define SHARE_VM_UTILITIES_GROWABLEARRAY_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oop.hpp" @@ -583,5 +582,3 @@ typedef GrowableArray intArray; typedef GrowableArray intStack; typedef GrowableArray boolArray; - -#endif // SHARE_VM_UTILITIES_GROWABLEARRAY_HPP diff --git a/src/hotspot/share/utilities/hashtable.hpp b/src/hotspot/share/utilities/hashtable.hpp --- a/src/hotspot/share/utilities/hashtable.hpp +++ b/src/hotspot/share/utilities/hashtable.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_HASHTABLE_HPP -#define SHARE_VM_UTILITIES_HASHTABLE_HPP +#pragma once #include "memory/allocation.hpp" #include "oops/oop.hpp" @@ -314,6 +313,3 @@ return NULL; } }; - - -#endif // SHARE_VM_UTILITIES_HASHTABLE_HPP diff --git a/src/hotspot/share/utilities/hashtable.inline.hpp b/src/hotspot/share/utilities/hashtable.inline.hpp --- a/src/hotspot/share/utilities/hashtable.inline.hpp +++ b/src/hotspot/share/utilities/hashtable.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_HASHTABLE_INLINE_HPP -#define SHARE_VM_UTILITIES_HASHTABLE_INLINE_HPP +#pragma once #include "memory/allocation.inline.hpp" #include "runtime/orderAccess.hpp" @@ -115,5 +114,3 @@ _free_list = entry; --_number_of_entries; } - -#endif // SHARE_VM_UTILITIES_HASHTABLE_INLINE_HPP diff --git a/src/hotspot/share/utilities/histogram.hpp b/src/hotspot/share/utilities/histogram.hpp --- a/src/hotspot/share/utilities/histogram.hpp +++ b/src/hotspot/share/utilities/histogram.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_HISTOGRAM_HPP -#define SHARE_VM_UTILITIES_HISTOGRAM_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/os.hpp" @@ -96,5 +95,3 @@ }; #endif - -#endif // SHARE_VM_UTILITIES_HISTOGRAM_HPP diff --git a/src/hotspot/share/utilities/intHisto.hpp b/src/hotspot/share/utilities/intHisto.hpp --- a/src/hotspot/share/utilities/intHisto.hpp +++ b/src/hotspot/share/utilities/intHisto.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_INTHISTO_HPP -#define SHARE_VM_UTILITIES_INTHISTO_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/growableArray.hpp" @@ -74,5 +73,3 @@ // Print the histogram on the given output stream. void print_on(outputStream* st) const; }; - -#endif // SHARE_VM_UTILITIES_INTHISTO_HPP diff --git a/src/hotspot/share/utilities/json.hpp b/src/hotspot/share/utilities/json.hpp --- a/src/hotspot/share/utilities/json.hpp +++ b/src/hotspot/share/utilities/json.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_JSON_HPP -#define SHARE_VM_UTILITIES_JSON_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -108,5 +107,3 @@ const char* strerror(JSON_ERROR e); }; - -#endif // SHARE_VM_UTILITIES_JSON_HPP diff --git a/src/hotspot/share/utilities/linkedlist.hpp b/src/hotspot/share/utilities/linkedlist.hpp --- a/src/hotspot/share/utilities/linkedlist.hpp +++ b/src/hotspot/share/utilities/linkedlist.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_LINKED_LIST_HPP -#define SHARE_VM_UTILITIES_LINKED_LIST_HPP +#pragma once #include "memory/allocation.hpp" @@ -417,5 +416,3 @@ return e; } }; - -#endif diff --git a/src/hotspot/share/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp --- a/src/hotspot/share/utilities/macros.hpp +++ b/src/hotspot/share/utilities/macros.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_MACROS_HPP -#define SHARE_VM_UTILITIES_MACROS_HPP +#pragma once // Use this to mark code that needs to be cleaned up (for development only) #define NEEDS_CLEANUP @@ -639,5 +638,3 @@ #define NOT_CDS_JAVA_HEAP_RETURN {} #define NOT_CDS_JAVA_HEAP_RETURN_(code) { return code; } #endif - -#endif // SHARE_VM_UTILITIES_MACROS_HPP diff --git a/src/hotspot/share/utilities/nativeCallStack.hpp b/src/hotspot/share/utilities/nativeCallStack.hpp --- a/src/hotspot/share/utilities/nativeCallStack.hpp +++ b/src/hotspot/share/utilities/nativeCallStack.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_NATIVE_CALL_STACK_HPP -#define SHARE_VM_UTILITIES_NATIVE_CALL_STACK_HPP +#pragma once #include "memory/allocation.hpp" #include "services/nmtCommon.hpp" @@ -97,5 +96,3 @@ void print_on(outputStream* out) const; void print_on(outputStream* out, int indent) const; }; - -#endif diff --git a/src/hotspot/share/utilities/numberSeq.hpp b/src/hotspot/share/utilities/numberSeq.hpp --- a/src/hotspot/share/utilities/numberSeq.hpp +++ b/src/hotspot/share/utilities/numberSeq.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_NUMBERSEQ_HPP -#define SHARE_VM_UTILITIES_NUMBERSEQ_HPP +#pragma once #include "memory/allocation.hpp" @@ -130,5 +129,3 @@ // Debugging/Printing virtual void dump_on(outputStream* s); }; - -#endif // SHARE_VM_UTILITIES_NUMBERSEQ_HPP diff --git a/src/hotspot/share/utilities/ostream.hpp b/src/hotspot/share/utilities/ostream.hpp --- a/src/hotspot/share/utilities/ostream.hpp +++ b/src/hotspot/share/utilities/ostream.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_OSTREAM_HPP -#define SHARE_VM_UTILITIES_OSTREAM_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/timer.hpp" @@ -293,5 +292,3 @@ }; #endif - -#endif // SHARE_VM_UTILITIES_OSTREAM_HPP diff --git a/src/hotspot/share/utilities/pair.hpp b/src/hotspot/share/utilities/pair.hpp --- a/src/hotspot/share/utilities/pair.hpp +++ b/src/hotspot/share/utilities/pair.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_PAIR_HPP -#define SHARE_VM_UTILITIES_PAIR_HPP +#pragma once #include "memory/allocation.hpp" @@ -36,6 +35,3 @@ Pair() {} Pair(T t, V v) : first(t), second(v) {} }; - - -#endif // SHARE_VM_UTILITIES_PAIR_HPP diff --git a/src/hotspot/share/utilities/preserveException.hpp b/src/hotspot/share/utilities/preserveException.hpp --- a/src/hotspot/share/utilities/preserveException.hpp +++ b/src/hotspot/share/utilities/preserveException.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_PRESERVEEXCEPTION_HPP -#define SHARE_VM_UTILITIES_PRESERVEEXCEPTION_HPP +#pragma once #include "runtime/handles.hpp" #include "runtime/thread.hpp" @@ -89,5 +88,3 @@ // use global exception mark when allowing pending exception to be set and // saving and restoring them #define PRESERVE_EXCEPTION_MARK Thread* THREAD; PreserveExceptionMark __em(THREAD); - -#endif // SHARE_VM_UTILITIES_PRESERVEEXCEPTION_HPP diff --git a/src/hotspot/share/utilities/quickSort.hpp b/src/hotspot/share/utilities/quickSort.hpp --- a/src/hotspot/share/utilities/quickSort.hpp +++ b/src/hotspot/share/utilities/quickSort.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_QUICKSORT_HPP -#define SHARE_VM_UTILITIES_QUICKSORT_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/globals.hpp" @@ -125,6 +124,3 @@ } } }; - - -#endif //SHARE_VM_UTILITIES_QUICKSORT_HPP diff --git a/src/hotspot/share/utilities/resourceHash.hpp b/src/hotspot/share/utilities/resourceHash.hpp --- a/src/hotspot/share/utilities/resourceHash.hpp +++ b/src/hotspot/share/utilities/resourceHash.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_RESOURCEHASH_HPP -#define SHARE_VM_UTILITIES_RESOURCEHASH_HPP +#pragma once #include "memory/allocation.hpp" @@ -165,6 +164,3 @@ return sizeof(Node); } }; - - -#endif // SHARE_VM_UTILITIES_RESOURCEHASH_HPP diff --git a/src/hotspot/share/utilities/singleWriterSynchronizer.hpp b/src/hotspot/share/utilities/singleWriterSynchronizer.hpp --- a/src/hotspot/share/utilities/singleWriterSynchronizer.hpp +++ b/src/hotspot/share/utilities/singleWriterSynchronizer.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_UTILITIES_SINGLEWRITERSYNCHRONIZER_HPP -#define SHARE_UTILITIES_SINGLEWRITERSYNCHRONIZER_HPP +#pragma once #include "memory/allocation.hpp" #include "runtime/atomic.hpp" @@ -118,5 +117,3 @@ _synchronizer->exit(_enter_value); } }; - -#endif // SHARE_UTILITIES_SINGLEWRITERSYNCHRONIZER_HPP diff --git a/src/hotspot/share/utilities/sizes.hpp b/src/hotspot/share/utilities/sizes.hpp --- a/src/hotspot/share/utilities/sizes.hpp +++ b/src/hotspot/share/utilities/sizes.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_SIZES_HPP -#define SHARE_VM_UTILITIES_SIZES_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -147,5 +146,3 @@ // Use the following #define to get C++ field member offsets #define byte_offset_of(klass,field) in_ByteSize((int)offset_of(klass, field)) - -#endif // SHARE_VM_UTILITIES_SIZES_HPP diff --git a/src/hotspot/share/utilities/spinYield.hpp b/src/hotspot/share/utilities/spinYield.hpp --- a/src/hotspot/share/utilities/spinYield.hpp +++ b/src/hotspot/share/utilities/spinYield.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_UTILITIES_SPINYIELD_HPP -#define SHARE_UTILITIES_SPINYIELD_HPP +#pragma once #include "memory/allocation.hpp" #include "utilities/globalDefinitions.hpp" @@ -70,5 +69,3 @@ // Write information about the wait duration to s. void report(outputStream* s) const; }; - -#endif // SHARE_UTILITIES_SPINYIELD_HPP diff --git a/src/hotspot/share/utilities/stack.hpp b/src/hotspot/share/utilities/stack.hpp --- a/src/hotspot/share/utilities/stack.hpp +++ b/src/hotspot/share/utilities/stack.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_STACK_HPP -#define SHARE_VM_UTILITIES_STACK_HPP +#pragma once #include "memory/allocation.hpp" @@ -210,5 +209,3 @@ #ifdef __GNUC__ #undef inline #endif // __GNUC__ - -#endif // SHARE_VM_UTILITIES_STACK_HPP diff --git a/src/hotspot/share/utilities/stack.inline.hpp b/src/hotspot/share/utilities/stack.inline.hpp --- a/src/hotspot/share/utilities/stack.inline.hpp +++ b/src/hotspot/share/utilities/stack.inline.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_STACK_INLINE_HPP -#define SHARE_VM_UTILITIES_STACK_INLINE_HPP +#pragma once #include "memory/allocation.inline.hpp" #include "utilities/align.hpp" @@ -272,5 +271,3 @@ } return _cur_seg + --_cur_seg_size; } - -#endif // SHARE_VM_UTILITIES_STACK_INLINE_HPP diff --git a/src/hotspot/share/utilities/stringUtils.hpp b/src/hotspot/share/utilities/stringUtils.hpp --- a/src/hotspot/share/utilities/stringUtils.hpp +++ b/src/hotspot/share/utilities/stringUtils.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_STRINGUTILS_HPP -#define SHARE_VM_UTILITIES_STRINGUTILS_HPP +#pragma once #include "memory/allocation.hpp" @@ -41,5 +40,3 @@ // Compute string similarity based on Dice's coefficient static double similarity(const char* str1, size_t len1, const char* str2, size_t len2); }; - -#endif // SHARE_VM_UTILITIES_STRINGUTILS_HPP diff --git a/src/hotspot/share/utilities/ticks.hpp b/src/hotspot/share/utilities/ticks.hpp --- a/src/hotspot/share/utilities/ticks.hpp +++ b/src/hotspot/share/utilities/ticks.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_TICKS_HPP -#define SHARE_VM_UTILITIES_TICKS_HPP +#pragma once #include "jni.h" #include "memory/allocation.hpp" @@ -245,5 +244,3 @@ typedef TimeInstant Ticks; typedef TimeInterval Tickspan; #endif - -#endif // SHARE_VM_UTILITIES_TICKS_HPP diff --git a/src/hotspot/share/utilities/utf8.hpp b/src/hotspot/share/utilities/utf8.hpp --- a/src/hotspot/share/utilities/utf8.hpp +++ b/src/hotspot/share/utilities/utf8.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_UTF8_HPP -#define SHARE_VM_UTILITIES_UTF8_HPP +#pragma once #include "memory/allocation.hpp" @@ -115,5 +114,3 @@ // converts a unicode string to quoted ascii template static void as_quoted_ascii(const T* base, int length, char* buf, int buflen); }; - -#endif // SHARE_VM_UTILITIES_UTF8_HPP diff --git a/src/hotspot/share/utilities/vmError.hpp b/src/hotspot/share/utilities/vmError.hpp --- a/src/hotspot/share/utilities/vmError.hpp +++ b/src/hotspot/share/utilities/vmError.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_VMERROR_HPP -#define SHARE_VM_UTILITIES_VMERROR_HPP +#pragma once #include "utilities/globalDefinitions.hpp" @@ -198,4 +197,3 @@ // for test purposes, which is not NULL and contains bits in every word static void* get_segfault_address(); }; -#endif // SHARE_VM_UTILITIES_VMERROR_HPP diff --git a/src/hotspot/share/utilities/xmlstream.hpp b/src/hotspot/share/utilities/xmlstream.hpp --- a/src/hotspot/share/utilities/xmlstream.hpp +++ b/src/hotspot/share/utilities/xmlstream.hpp @@ -22,8 +22,7 @@ * */ -#ifndef SHARE_VM_UTILITIES_XMLSTREAM_HPP -#define SHARE_VM_UTILITIES_XMLSTREAM_HPP +#pragma once #include "runtime/handles.hpp" #include "utilities/ostream.hpp" @@ -183,5 +182,3 @@ extern xmlStream* xtty; // Note: If ::xtty != NULL, ::tty == ::xtty->text(). - -#endif // SHARE_VM_UTILITIES_XMLSTREAM_HPP