mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-27 14:54:52 +02:00
6843629: Make current hotspot build part of jdk5 control build
Source changes for older compilers plus makefile changes. Reviewed-by: xlu
This commit is contained in:
parent
ab3b12bdbd
commit
ce423c9e98
28 changed files with 162 additions and 103 deletions
|
@ -470,7 +470,7 @@ class Dependencies: public ResourceObj {
|
|||
// super types can be context types for a relevant dependency, which the
|
||||
// new type could invalidate.
|
||||
class DepChange : public StackObj {
|
||||
private:
|
||||
public:
|
||||
enum ChangeType {
|
||||
NO_CHANGE = 0, // an uninvolved klass
|
||||
Change_new_type, // a newly loaded type
|
||||
|
@ -480,6 +480,7 @@ class DepChange : public StackObj {
|
|||
Start_Klass = CHANGE_LIMIT // internal indicator for ContextStream
|
||||
};
|
||||
|
||||
private:
|
||||
// each change set is rooted in exactly one new type (at present):
|
||||
KlassHandle _new_type;
|
||||
|
||||
|
@ -510,15 +511,15 @@ class DepChange : public StackObj {
|
|||
// }
|
||||
class ContextStream : public StackObj {
|
||||
private:
|
||||
DepChange& _changes;
|
||||
DepChange& _changes;
|
||||
friend class DepChange;
|
||||
|
||||
// iteration variables:
|
||||
ChangeType _change_type;
|
||||
klassOop _klass;
|
||||
objArrayOop _ti_base; // i.e., transitive_interfaces
|
||||
int _ti_index;
|
||||
int _ti_limit;
|
||||
ChangeType _change_type;
|
||||
klassOop _klass;
|
||||
objArrayOop _ti_base; // i.e., transitive_interfaces
|
||||
int _ti_index;
|
||||
int _ti_limit;
|
||||
|
||||
// start at the beginning:
|
||||
void start() {
|
||||
|
@ -530,11 +531,11 @@ class DepChange : public StackObj {
|
|||
_ti_limit = 0;
|
||||
}
|
||||
|
||||
public:
|
||||
ContextStream(DepChange& changes)
|
||||
: _changes(changes)
|
||||
{ start(); }
|
||||
|
||||
public:
|
||||
ContextStream(DepChange& changes, No_Safepoint_Verifier& nsv)
|
||||
: _changes(changes)
|
||||
// the nsv argument makes it safe to hold oops like _klass
|
||||
|
@ -542,6 +543,7 @@ class DepChange : public StackObj {
|
|||
|
||||
bool next();
|
||||
|
||||
ChangeType change_type() { return _change_type; }
|
||||
klassOop klass() { return _klass; }
|
||||
};
|
||||
friend class DepChange::ContextStream;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue