--- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp Tue May 14 11:28:44 2019 -0400
+++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp Tue May 14 11:29:18 2019 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -357,7 +357,6 @@
}
};
-static unsigned int unused_hash = 0;
static const char value_name[] = "value";
static bool has_annotation(const InstanceKlass* ik, const Symbol* annotation_type, bool& value) {
assert(annotation_type != NULL, "invariant");
@@ -372,7 +371,7 @@
if (annotation_iterator.type() == annotation_type) {
// target annotation found
static const Symbol* value_symbol =
- SymbolTable::lookup_only(value_name, sizeof value_name - 1, unused_hash);
+ SymbolTable::probe(value_name, sizeof value_name - 1);
assert(value_symbol != NULL, "invariant");
const AnnotationElementIterator element_iterator = annotation_iterator.elements();
while (element_iterator.has_next()) {
@@ -412,7 +411,7 @@
}
static Symbol* jdk_jfr_module_symbol = NULL;
if (jdk_jfr_module_symbol == NULL) {
- jdk_jfr_module_symbol = SymbolTable::lookup_only(jdk_jfr_module_name, sizeof jdk_jfr_module_name - 1, unused_hash);
+ jdk_jfr_module_symbol = SymbolTable::probe(jdk_jfr_module_name, sizeof jdk_jfr_module_name - 1);
if (jdk_jfr_module_symbol == NULL) {
return false;
}
@@ -447,7 +446,7 @@
assert(!untypedEventHandler, "invariant");
static const Symbol* registered_symbol = NULL;
if (registered_symbol == NULL) {
- registered_symbol = SymbolTable::lookup_only(registered_constant, sizeof registered_constant - 1, unused_hash);
+ registered_symbol = SymbolTable::probe(registered_constant, sizeof registered_constant - 1);
if (registered_symbol == NULL) {
untypedEventHandler = true;
return false;
@@ -1167,7 +1166,7 @@
u2& added_cp_entries,
TRAPS) {
assert(utf8_constant != NULL, "invariant");
- TempNewSymbol utf8_sym = SymbolTable::new_symbol(utf8_constant, THREAD);
+ TempNewSymbol utf8_sym = SymbolTable::new_symbol(utf8_constant);
// lookup existing
const int utf8_orig_idx = utf8_info_index(ik, utf8_sym, THREAD);
if (utf8_orig_idx != invalid_cp_index) {