archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6777083: assert(target != __null,"must not be null")

Browse source 
Reviewed-by: iveresov, kvn
This commit is contained in:
Tom Rodriguez 2011-04-05 00:31:09 -07:00
parent 642c26950d
commit 1a5a2ecd25
3 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hotspot/src/cpu/x86/vm/assembler_x86.hpp
View file

@ -385,10 +385,18 @@ class OopAddress: public AddressLiteral {
};
class ExternalAddress: public AddressLiteral {
private:
static relocInfo::relocType reloc_for_target(address target) {
// Sometimes ExternalAddress is used for values which aren't
// exactly addresses, like the card table base.
// external_word_type can't be used for values in the first page
// so just skip the reloc in that case.
return external_word_Relocation::can_be_relocated(target) ? relocInfo::external_word_type : relocInfo::none;
}
public:
public:
ExternalAddress(address target) : AddressLiteral(target, relocInfo::external_word_type){}
ExternalAddress(address target) : AddressLiteral(target, reloc_for_target(target)) {}
};