Skip to content
This repository was archived by the owner on Aug 27, 2022. It is now read-only.
/ lanai Public archive

Commit cf9908b

Browse files
author
Harold Seigel
committedJan 5, 2021
8258937: Remove JVM IgnoreRewrites flag
Reviewed-by: coleenp
1 parent 4d3d599 commit cf9908b

File tree

2 files changed

+2
-29
lines changed

2 files changed

+2
-29
lines changed
 

‎src/hotspot/share/oops/generateOopMap.cpp

+2-25
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -2263,34 +2263,11 @@ void GenerateOopMap::rewrite_refval_conflicts()
22632263
return;
22642264

22652265
// Check if rewrites are allowed in this parse.
2266-
if (!allow_rewrites() && !IgnoreRewrites) {
2266+
if (!allow_rewrites()) {
22672267
fatal("Rewriting method not allowed at this stage");
22682268
}
22692269

22702270

2271-
// This following flag is to tempoary supress rewrites. The locals that might conflict will
2272-
// all be set to contain values. This is UNSAFE - however, until the rewriting has been completely
2273-
// tested it is nice to have.
2274-
if (IgnoreRewrites) {
2275-
if (Verbose) {
2276-
tty->print("rewrites suppressed for local no. ");
2277-
for (int l = 0; l < _max_locals; l++) {
2278-
if (_new_var_map[l] != l) {
2279-
tty->print("%d ", l);
2280-
vars()[l] = CellTypeState::value;
2281-
}
2282-
}
2283-
tty->cr();
2284-
}
2285-
2286-
// That was that...
2287-
_new_var_map = NULL;
2288-
_nof_refval_conflicts = 0;
2289-
_conflict = false;
2290-
2291-
return;
2292-
}
2293-
22942271
// Tracing flag
22952272
_did_rewriting = true;
22962273

‎src/hotspot/share/runtime/globals.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -674,10 +674,6 @@ const intx ObjectAlignmentInBytes = 8;
674674
"Tell whether the VM should register soft/weak/final/phantom " \
675675
"references") \
676676
\
677-
develop(bool, IgnoreRewrites, false, \
678-
"Suppress rewrites of bytecodes in the oopmap generator. " \
679-
"This is unsafe!") \
680-
\
681677
develop(bool, PrintCodeCacheExtension, false, \
682678
"Print extension of code cache") \
683679
\

0 commit comments

Comments
 (0)
This repository has been archived.