stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6876037: CTW fails jdk7/hotspot/src/share/vm/opto/type.cpp:2055. assert(bits,"Use TypePtr for NULL")

Browse Source 
Add missing 0 value check in TypeRawPtr::add_offset().

Reviewed-by: never
This commit is contained in:
Vladimir Kozlov 2011-01-07 11:53:24 -08:00
parent afbf71368c
commit 5bce844ff6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hotspot/src/share/vm/opto/type.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -2187,8 +2187,11 @@ const TypePtr *TypeRawPtr::add_offset( intptr_t offset ) const {
case TypePtr::NotNull: case TypePtr::NotNull:
return this; return this;
case TypePtr::Null: case TypePtr::Null:
case TypePtr::Constant: case TypePtr::Constant: {
return make( _bits+offset ); address bits = _bits+offset;
if ( bits == 0 ) return TypePtr::NULL_PTR;
return make( bits );
}
default: ShouldNotReachHere(); default: ShouldNotReachHere();
} }
return NULL; // Lint noise return NULL; // Lint noise