Skip to content

Commit a8179fc

Browse files
toxaarttoxaart
committed
Merge remote-tracking branch 'origin/master' into JDK-8359820-SIGILL-with-low-handshake-timeout-on-intel-sde
2 parents 7cc86ee + c9ecc82 commit a8179fc

File tree

466 files changed

+10460
-8222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

466 files changed

+10460
-8222
lines changed

‎src/demo/share/java2d/J2DBench/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131

3232

3333
ifndef SOURCE
34-
export SOURCE := 7
34+
export SOURCE := 8
3535
endif
3636
ifndef TARGET
37-
export TARGET := 7
37+
export TARGET := 8
3838
endif
3939
ifndef JAVAC
4040
export JAVAC := javac

‎src/demo/share/java2d/J2DBench/build.xml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
<property name="dist" location="dist"/>
4040
<property name="resources" location="resources"/>
4141

42-
<condition property="source" value="7">
42+
<condition property="source" value="8">
4343
<not>
4444
<isset property="source"/>
4545
</not>
4646
</condition>
47-
<condition property="target" value="7">
47+
<condition property="target" value="8">
4848
<not>
4949
<isset property="target"/>
5050
</not>
@@ -54,11 +54,6 @@
5454
<isset property="java"/>
5555
</not>
5656
</condition>
57-
<condition property="javac" value="javac">
58-
<not>
59-
<isset property="javac"/>
60-
</not>
61-
</condition>
6257

6358
<target name="init">
6459
<!-- Create the time stamp -->
@@ -70,7 +65,7 @@
7065
<target name="compile" depends="init"
7166
description="compile the source " >
7267
<!-- Compile the java code from ${src} into ${build} -->
73-
<javac debug="off" source="${source}" target="${target}" srcdir="${src}" destdir="${build}" fork="true" executable="${javac}"/>
68+
<javac debug="off" source="${source}" target="${target}" srcdir="${src}" destdir="${build}"/>
7469
</target>
7570

7671
<target name="run" depends="dist"

‎src/demo/share/jfc/J2Ddemo/java2d/RunWindow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ private static void invokeAndWait(Runnable run) {
362362
/**
363363
* This class contains initial values for instance variables of 'RunWindow' class,
364364
* and its instance is used in creation of 'RunWindow' object. Values parsed from
365-
* certain command line options of the demo or from the demo applet parameters are
365+
* certain command line options of the demo
366366
* set to the fields of this class instance. It is a part of the fix which changed
367367
* static variables for instance variables in certain demo classes.
368368
*

‎src/demo/share/jfc/J2Ddemo/java2d/Tools.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -406,13 +406,6 @@ public void run() {
406406
if (pDialogState) {
407407
printJob.print(aset);
408408
}
409-
} catch (@SuppressWarnings("removal") java.security.AccessControlException ace) {
410-
String errmsg = "Applet access control exception; to allow "
411-
+ "access to printer, set\n"
412-
+ "permission for \"queuePrintJob\" in "
413-
+ "RuntimePermission.";
414-
JOptionPane.showMessageDialog(this, errmsg, "Printer Access Error",
415-
JOptionPane.ERROR_MESSAGE);
416409
} catch (Exception ex) {
417410
Logger.getLogger(Tools.class.getName()).log(Level.SEVERE,
418411
null, ex);

‎src/demo/share/jfc/SwingSet2/SwingSet2.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void loadDemos() {
131131
private JEditorPane demoSrcPane = null;
132132

133133

134-
// contentPane cache, saved from the applet or application frame
134+
// contentPane cache, saved from the application frame
135135
Container contentPane = null;
136136

137137

@@ -177,7 +177,7 @@ public SwingSet2(GraphicsConfiguration gc) {
177177

178178

179179
/**
180-
* SwingSet2 Main. Called only if we're an application, not an applet.
180+
* SwingSet2 Main.
181181
*/
182182
public static void main(final String[] args) {
183183
// must run in EDT when constructing the GUI components
@@ -716,8 +716,7 @@ public ButtonGroup getToolBarGroup() {
716716
}
717717

718718
/**
719-
* Returns the content pane whether we're in an applet
720-
* or application
719+
* Returns the content pane
721720
*/
722721
public Container getContentPane() {
723722
if(contentPane == null) {

‎src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void CounterOverflowStub::emit_code(LIR_Assembler* ce) {
5656
__ mov_metadata(rscratch1, m);
5757
ce->store_parameter(rscratch1, 1);
5858
ce->store_parameter(_bci, 0);
59-
__ far_call(RuntimeAddress(Runtime1::entry_for(C1StubId::counter_overflow_id)));
59+
__ far_call(RuntimeAddress(Runtime1::entry_for(StubId::c1_counter_overflow_id)));
6060
ce->add_call_info_here(_info);
6161
ce->verify_oop_map(_info);
6262
__ b(_continuation);
@@ -65,7 +65,7 @@ void CounterOverflowStub::emit_code(LIR_Assembler* ce) {
6565
void RangeCheckStub::emit_code(LIR_Assembler* ce) {
6666
__ bind(_entry);
6767
if (_info->deoptimize_on_exception()) {
68-
address a = Runtime1::entry_for(C1StubId::predicate_failed_trap_id);
68+
address a = Runtime1::entry_for(StubId::c1_predicate_failed_trap_id);
6969
__ far_call(RuntimeAddress(a));
7070
ce->add_call_info_here(_info);
7171
ce->verify_oop_map(_info);
@@ -78,13 +78,13 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
7878
} else {
7979
__ mov(rscratch1, _index->as_jint());
8080
}
81-
C1StubId stub_id;
81+
StubId stub_id;
8282
if (_throw_index_out_of_bounds_exception) {
83-
stub_id = C1StubId::throw_index_exception_id;
83+
stub_id = StubId::c1_throw_index_exception_id;
8484
} else {
8585
assert(_array != LIR_Opr::nullOpr(), "sanity");
8686
__ mov(rscratch2, _array->as_pointer_register());
87-
stub_id = C1StubId::throw_range_check_failed_id;
87+
stub_id = StubId::c1_throw_range_check_failed_id;
8888
}
8989
__ lea(lr, RuntimeAddress(Runtime1::entry_for(stub_id)));
9090
__ blr(lr);
@@ -99,7 +99,7 @@ PredicateFailedStub::PredicateFailedStub(CodeEmitInfo* info) {
9999

100100
void PredicateFailedStub::emit_code(LIR_Assembler* ce) {
101101
__ bind(_entry);
102-
address a = Runtime1::entry_for(C1StubId::predicate_failed_trap_id);
102+
address a = Runtime1::entry_for(StubId::c1_predicate_failed_trap_id);
103103
__ far_call(RuntimeAddress(a));
104104
ce->add_call_info_here(_info);
105105
ce->verify_oop_map(_info);
@@ -111,7 +111,7 @@ void DivByZeroStub::emit_code(LIR_Assembler* ce) {
111111
ce->compilation()->implicit_exception_table()->append(_offset, __ offset());
112112
}
113113
__ bind(_entry);
114-
__ far_call(RuntimeAddress(Runtime1::entry_for(C1StubId::throw_div0_exception_id)));
114+
__ far_call(RuntimeAddress(Runtime1::entry_for(StubId::c1_throw_div0_exception_id)));
115115
ce->add_call_info_here(_info);
116116
ce->verify_oop_map(_info);
117117
#ifdef ASSERT
@@ -123,14 +123,14 @@ void DivByZeroStub::emit_code(LIR_Assembler* ce) {
123123

124124
// Implementation of NewInstanceStub
125125

126-
NewInstanceStub::NewInstanceStub(LIR_Opr klass_reg, LIR_Opr result, ciInstanceKlass* klass, CodeEmitInfo* info, C1StubId stub_id) {
126+
NewInstanceStub::NewInstanceStub(LIR_Opr klass_reg, LIR_Opr result, ciInstanceKlass* klass, CodeEmitInfo* info, StubId stub_id) {
127127
_result = result;
128128
_klass = klass;
129129
_klass_reg = klass_reg;
130130
_info = new CodeEmitInfo(info);
131-
assert(stub_id == C1StubId::new_instance_id ||
132-
stub_id == C1StubId::fast_new_instance_id ||
133-
stub_id == C1StubId::fast_new_instance_init_check_id,
131+
assert(stub_id == StubId::c1_new_instance_id ||
132+
stub_id == StubId::c1_fast_new_instance_id ||
133+
stub_id == StubId::c1_fast_new_instance_init_check_id,
134134
"need new_instance id");
135135
_stub_id = stub_id;
136136
}
@@ -166,7 +166,7 @@ void NewTypeArrayStub::emit_code(LIR_Assembler* ce) {
166166
__ bind(_entry);
167167
assert(_length->as_register() == r19, "length must in r19,");
168168
assert(_klass_reg->as_register() == r3, "klass_reg must in r3");
169-
__ far_call(RuntimeAddress(Runtime1::entry_for(C1StubId::new_type_array_id)));
169+
__ far_call(RuntimeAddress(Runtime1::entry_for(StubId::c1_new_type_array_id)));
170170
ce->add_call_info_here(_info);
171171
ce->verify_oop_map(_info);
172172
assert(_result->as_register() == r0, "result must in r0");
@@ -189,7 +189,7 @@ void NewObjectArrayStub::emit_code(LIR_Assembler* ce) {
189189
__ bind(_entry);
190190
assert(_length->as_register() == r19, "length must in r19,");
191191
assert(_klass_reg->as_register() == r3, "klass_reg must in r3");
192-
__ far_call(RuntimeAddress(Runtime1::entry_for(C1StubId::new_object_array_id)));
192+
__ far_call(RuntimeAddress(Runtime1::entry_for(StubId::c1_new_object_array_id)));
193193
ce->add_call_info_here(_info);
194194
ce->verify_oop_map(_info);
195195
assert(_result->as_register() == r0, "result must in r0");
@@ -201,11 +201,11 @@ void MonitorEnterStub::emit_code(LIR_Assembler* ce) {
201201
__ bind(_entry);
202202
ce->store_parameter(_obj_reg->as_register(), 1);
203203
ce->store_parameter(_lock_reg->as_register(), 0);
204-
C1StubId enter_id;
204+
StubId enter_id;
205205
if (ce->compilation()->has_fpu_code()) {
206-
enter_id = C1StubId::monitorenter_id;
206+
enter_id = StubId::c1_monitorenter_id;
207207
} else {
208-
enter_id = C1StubId::monitorenter_nofpu_id;
208+
enter_id = StubId::c1_monitorenter_nofpu_id;
209209
}
210210
__ far_call(RuntimeAddress(Runtime1::entry_for(enter_id)));
211211
ce->add_call_info_here(_info);
@@ -222,11 +222,11 @@ void MonitorExitStub::emit_code(LIR_Assembler* ce) {
222222
}
223223
ce->store_parameter(_lock_reg->as_register(), 0);
224224
// note: non-blocking leaf routine => no call info needed
225-
C1StubId exit_id;
225+
StubId exit_id;
226226
if (ce->compilation()->has_fpu_code()) {
227-
exit_id = C1StubId::monitorexit_id;
227+
exit_id = StubId::c1_monitorexit_id;
228228
} else {
229-
exit_id = C1StubId::monitorexit_nofpu_id;
229+
exit_id = StubId::c1_monitorexit_nofpu_id;
230230
}
231231
__ adr(lr, _continuation);
232232
__ far_jump(RuntimeAddress(Runtime1::entry_for(exit_id)));
@@ -254,7 +254,7 @@ void PatchingStub::emit_code(LIR_Assembler* ce) {
254254
void DeoptimizeStub::emit_code(LIR_Assembler* ce) {
255255
__ bind(_entry);
256256
ce->store_parameter(_trap_request, 0);
257-
__ far_call(RuntimeAddress(Runtime1::entry_for(C1StubId::deoptimize_id)));
257+
__ far_call(RuntimeAddress(Runtime1::entry_for(StubId::c1_deoptimize_id)));
258258
ce->add_call_info_here(_info);
259259
DEBUG_ONLY(__ should_not_reach_here());
260260
}
@@ -264,9 +264,9 @@ void ImplicitNullCheckStub::emit_code(LIR_Assembler* ce) {
264264
address a;
265265
if (_info->deoptimize_on_exception()) {
266266
// Deoptimize, do not throw the exception, because it is probably wrong to do it here.
267-
a = Runtime1::entry_for(C1StubId::predicate_failed_trap_id);
267+
a = Runtime1::entry_for(StubId::c1_predicate_failed_trap_id);
268268
} else {
269-
a = Runtime1::entry_for(C1StubId::throw_null_pointer_exception_id);
269+
a = Runtime1::entry_for(StubId::c1_throw_null_pointer_exception_id);
270270
}
271271

272272
ce->compilation()->implicit_exception_table()->append(_offset, __ offset());

‎src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -320,19 +320,19 @@ void LIR_Assembler::deoptimize_trap(CodeEmitInfo *info) {
320320

321321
switch (patching_id(info)) {
322322
case PatchingStub::access_field_id:
323-
target = Runtime1::entry_for(C1StubId::access_field_patching_id);
323+
target = Runtime1::entry_for(StubId::c1_access_field_patching_id);
324324
reloc_type = relocInfo::section_word_type;
325325
break;
326326
case PatchingStub::load_klass_id:
327-
target = Runtime1::entry_for(C1StubId::load_klass_patching_id);
327+
target = Runtime1::entry_for(StubId::c1_load_klass_patching_id);
328328
reloc_type = relocInfo::metadata_type;
329329
break;
330330
case PatchingStub::load_mirror_id:
331-
target = Runtime1::entry_for(C1StubId::load_mirror_patching_id);
331+
target = Runtime1::entry_for(StubId::c1_load_mirror_patching_id);
332332
reloc_type = relocInfo::oop_type;
333333
break;
334334
case PatchingStub::load_appendix_id:
335-
target = Runtime1::entry_for(C1StubId::load_appendix_patching_id);
335+
target = Runtime1::entry_for(StubId::c1_load_appendix_patching_id);
336336
reloc_type = relocInfo::oop_type;
337337
break;
338338
default: ShouldNotReachHere();
@@ -374,7 +374,7 @@ int LIR_Assembler::emit_exception_handler() {
374374
__ verify_not_null_oop(r0);
375375

376376
// search an exception handler (r0: exception oop, r3: throwing pc)
377-
__ far_call(RuntimeAddress(Runtime1::entry_for(C1StubId::handle_exception_from_callee_id)));
377+
__ far_call(RuntimeAddress(Runtime1::entry_for(StubId::c1_handle_exception_from_callee_id)));
378378
__ should_not_reach_here();
379379
guarantee(code_offset() - offset <= exception_handler_size(), "overflow");
380380
__ end_a_stub();
@@ -431,7 +431,7 @@ int LIR_Assembler::emit_unwind_handler() {
431431
// remove the activation and dispatch to the unwind handler
432432
__ block_comment("remove_frame and dispatch to the unwind handler");
433433
__ remove_frame(initial_frame_size_in_bytes());
434-
__ far_jump(RuntimeAddress(Runtime1::entry_for(C1StubId::unwind_exception_id)));
434+
__ far_jump(RuntimeAddress(Runtime1::entry_for(StubId::c1_unwind_exception_id)));
435435

436436
// Emit the slow path assembly
437437
if (stub != nullptr) {
@@ -874,19 +874,19 @@ void LIR_Assembler::klass2reg_with_patching(Register reg, CodeEmitInfo* info) {
874874

875875
switch (patching_id(info)) {
876876
case PatchingStub::access_field_id:
877-
target = Runtime1::entry_for(C1StubId::access_field_patching_id);
877+
target = Runtime1::entry_for(StubId::c1_access_field_patching_id);
878878
reloc_type = relocInfo::section_word_type;
879879
break;
880880
case PatchingStub::load_klass_id:
881-
target = Runtime1::entry_for(C1StubId::load_klass_patching_id);
881+
target = Runtime1::entry_for(StubId::c1_load_klass_patching_id);
882882
reloc_type = relocInfo::metadata_type;
883883
break;
884884
case PatchingStub::load_mirror_id:
885-
target = Runtime1::entry_for(C1StubId::load_mirror_patching_id);
885+
target = Runtime1::entry_for(StubId::c1_load_mirror_patching_id);
886886
reloc_type = relocInfo::oop_type;
887887
break;
888888
case PatchingStub::load_appendix_id:
889-
target = Runtime1::entry_for(C1StubId::load_appendix_patching_id);
889+
target = Runtime1::entry_for(StubId::c1_load_appendix_patching_id);
890890
reloc_type = relocInfo::oop_type;
891891
break;
892892
default: ShouldNotReachHere();
@@ -1358,7 +1358,7 @@ void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, L
13581358
__ br(Assembler::EQ, *success_target);
13591359

13601360
__ stp(klass_RInfo, k_RInfo, Address(__ pre(sp, -2 * wordSize)));
1361-
__ far_call(RuntimeAddress(Runtime1::entry_for(C1StubId::slow_subtype_check_id)));
1361+
__ far_call(RuntimeAddress(Runtime1::entry_for(StubId::c1_slow_subtype_check_id)));
13621362
__ ldr(klass_RInfo, Address(__ post(sp, 2 * wordSize)));
13631363
// result is a boolean
13641364
__ cbzw(klass_RInfo, *failure_target);
@@ -1369,7 +1369,7 @@ void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, L
13691369
__ check_klass_subtype_fast_path(klass_RInfo, k_RInfo, Rtmp1, success_target, failure_target, nullptr);
13701370
// call out-of-line instance of __ check_klass_subtype_slow_path(...):
13711371
__ stp(klass_RInfo, k_RInfo, Address(__ pre(sp, -2 * wordSize)));
1372-
__ far_call(RuntimeAddress(Runtime1::entry_for(C1StubId::slow_subtype_check_id)));
1372+
__ far_call(RuntimeAddress(Runtime1::entry_for(StubId::c1_slow_subtype_check_id)));
13731373
__ ldp(k_RInfo, klass_RInfo, Address(__ post(sp, 2 * wordSize)));
13741374
// result is a boolean
13751375
__ cbz(k_RInfo, *failure_target);
@@ -1447,7 +1447,7 @@ void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op) {
14471447
__ check_klass_subtype_fast_path(klass_RInfo, k_RInfo, Rtmp1, success_target, failure_target, nullptr);
14481448
// call out-of-line instance of __ check_klass_subtype_slow_path(...):
14491449
__ stp(klass_RInfo, k_RInfo, Address(__ pre(sp, -2 * wordSize)));
1450-
__ far_call(RuntimeAddress(Runtime1::entry_for(C1StubId::slow_subtype_check_id)));
1450+
__ far_call(RuntimeAddress(Runtime1::entry_for(StubId::c1_slow_subtype_check_id)));
14511451
__ ldp(k_RInfo, klass_RInfo, Address(__ post(sp, 2 * wordSize)));
14521452
// result is a boolean
14531453
__ cbzw(k_RInfo, *failure_target);
@@ -2033,7 +2033,7 @@ void LIR_Assembler::throw_op(LIR_Opr exceptionPC, LIR_Opr exceptionOop, CodeEmit
20332033
// exception object is not added to oop map by LinearScan
20342034
// (LinearScan assumes that no oops are in fixed registers)
20352035
info->add_register_oop(exceptionOop);
2036-
C1StubId unwind_id;
2036+
StubId unwind_id;
20372037

20382038
// get current pc information
20392039
// pc is only needed if the method has an exception handler, the unwind code does not need it.
@@ -2052,9 +2052,9 @@ void LIR_Assembler::throw_op(LIR_Opr exceptionPC, LIR_Opr exceptionOop, CodeEmit
20522052
__ verify_not_null_oop(r0);
20532053
// search an exception handler (r0: exception oop, r3: throwing pc)
20542054
if (compilation()->has_fpu_code()) {
2055-
unwind_id = C1StubId::handle_exception_id;
2055+
unwind_id = StubId::c1_handle_exception_id;
20562056
} else {
2057-
unwind_id = C1StubId::handle_exception_nofpu_id;
2057+
unwind_id = StubId::c1_handle_exception_nofpu_id;
20582058
}
20592059
__ far_call(RuntimeAddress(Runtime1::entry_for(unwind_id)));
20602060

@@ -2325,7 +2325,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
23252325
__ check_klass_subtype_fast_path(src, dst, tmp, &cont, &slow, nullptr);
23262326

23272327
__ PUSH(src, dst);
2328-
__ far_call(RuntimeAddress(Runtime1::entry_for(C1StubId::slow_subtype_check_id)));
2328+
__ far_call(RuntimeAddress(Runtime1::entry_for(StubId::c1_slow_subtype_check_id)));
23292329
__ POP(src, dst);
23302330

23312331
__ cbnz(src, cont);

‎src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,7 @@ void LIRGenerator::do_NewMultiArray(NewMultiArray* x) {
12451245
args->append(rank);
12461246
args->append(varargs);
12471247
LIR_Opr reg = result_register_for(x->type());
1248-
__ call_runtime(Runtime1::entry_for(C1StubId::new_multi_array_id),
1248+
__ call_runtime(Runtime1::entry_for(StubId::c1_new_multi_array_id),
12491249
LIR_OprFact::illegalOpr,
12501250
reg, args, info);
12511251

@@ -1276,14 +1276,14 @@ void LIRGenerator::do_CheckCast(CheckCast* x) {
12761276
CodeStub* stub;
12771277
if (x->is_incompatible_class_change_check()) {
12781278
assert(patching_info == nullptr, "can't patch this");
1279-
stub = new SimpleExceptionStub(C1StubId::throw_incompatible_class_change_error_id, LIR_OprFact::illegalOpr, info_for_exception);
1279+
stub = new SimpleExceptionStub(StubId::c1_throw_incompatible_class_change_error_id, LIR_OprFact::illegalOpr, info_for_exception);
12801280
} else if (x->is_invokespecial_receiver_check()) {
12811281
assert(patching_info == nullptr, "can't patch this");
12821282
stub = new DeoptimizeStub(info_for_exception,
12831283
Deoptimization::Reason_class_check,
12841284
Deoptimization::Action_none);
12851285
} else {
1286-
stub = new SimpleExceptionStub(C1StubId::throw_class_cast_exception_id, obj.result(), info_for_exception);
1286+
stub = new SimpleExceptionStub(StubId::c1_throw_class_cast_exception_id, obj.result(), info_for_exception);
12871287
}
12881288
LIR_Opr reg = rlock_result(x);
12891289
LIR_Opr tmp3 = LIR_OprFact::illegalOpr;
@@ -1318,7 +1318,7 @@ void LIRGenerator::do_InstanceOf(InstanceOf* x) {
13181318

13191319
// Intrinsic for Class::isInstance
13201320
address LIRGenerator::isInstance_entry() {
1321-
return Runtime1::entry_for(C1StubId::is_instance_of_id);
1321+
return Runtime1::entry_for(StubId::c1_is_instance_of_id);
13221322
}
13231323

13241324
void LIRGenerator::do_If(If* x) {

0 commit comments

Comments
 (0)