8260471: Change SystemDictionary::X_klass calls to vmClasses::X_klass

Reviewed-by: lfoltan, hseigel, dholmes, stuefe
This commit is contained in:
Ioi Lam 2021-02-02 23:40:29 +00:00
parent 9af333923b
commit ffbcf1b0a7
191 changed files with 739 additions and 712 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -27,7 +27,7 @@
#include "classfile/compactHashtable.hpp"
#include "classfile/javaClasses.inline.hpp"
#include "classfile/stringTable.hpp"
#include "classfile/systemDictionary.hpp"
#include "classfile/vmClasses.hpp"
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/oopStorage.inline.hpp"
#include "gc/shared/oopStorageSet.hpp"
@ -542,7 +542,7 @@ static int literal_size(oop obj) {
// array is not shared anymore.
if (obj == NULL) {
return 0;
} else if (obj->klass() == SystemDictionary::String_klass()) {
} else if (obj->klass() == vmClasses::String_klass()) {
return (obj->size() + java_lang_String::value(obj)->size()) * HeapWordSize;
} else {
return obj->size();